Skip to content

Commit aa913aa

Browse files
raheeliftikhar5raheeliftikhar5
committedMar 11, 2025
fix inner grid usage in component playground
1 parent 1cbec0e commit aa913aa

File tree

13 files changed

+29
-28
lines changed

13 files changed

+29
-28
lines changed
 

‎client/packages/lowcoder-sdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-sdk",
3-
"version": "2.6.4",
3+
"version": "2.6.5",
44
"type": "module",
55
"files": [
66
"src",

‎client/packages/lowcoder/src/comps/comps/columnLayout/columnLayout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { EditorContext } from "comps/editorState";
4040

4141
import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUtils";
4242
import { DisabledContext } from "comps/generators/uiCompBuilder";
43-
import SliderControl from "@lowcoder-ee/comps/controls/sliderControl";
43+
import { SliderControl } from "@lowcoder-ee/comps/controls/sliderControl";
4444
import { getBackgroundStyle } from "@lowcoder-ee/util/styleUtils";
4545

4646
const ContainWrapper = styled.div<{

‎client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx

+17-17
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ const GridItemWrapper = React.memo(React.forwardRef(
326326
const editorState = useContext(EditorContext);
327327
const { children, ...divProps } = props;
328328
return (
329-
<ItemWrapper ref={ref} $disableInteract={editorState.disableInteract} {...divProps}>
329+
<ItemWrapper ref={ref} $disableInteract={editorState?.disableInteract} {...divProps}>
330330
{props.children}
331331
</ItemWrapper>
332332
);
@@ -350,9 +350,9 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
350350
const [currentRowHeight, setRowHeight] = useState(positionParams.rowHeight || DEFAULT_ROW_HEIGHT);
351351
const editorState = useContext(EditorContext);
352352
const { readOnly } = useContext(ExternalEditorContext);
353-
const appSettingsComp = editorState.getAppSettingsComp().getView();
353+
const appSettingsComp = editorState?.getAppSettingsComp().getView();
354354

355-
const maxWidth = useMemo(() => appSettingsComp.maxWidth, [appSettingsComp.maxWidth]);
355+
const maxWidth = useMemo(() => appSettingsComp?.maxWidth, [appSettingsComp?.maxWidth]);
356356

357357
// Falk: TODO: Here we can define the inner grid columns dynamically
358358
const defaultGrid = useMemo(() => {
@@ -372,10 +372,10 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
372372
getExtraLayout(
373373
props.items,
374374
props.layout,
375-
editorState.selectedCompNames,
375+
editorState?.selectedCompNames,
376376
props.dragSelectedComps
377377
),
378-
[props.items, props.layout, editorState.selectedCompNames, props.dragSelectedComps]
378+
[props.items, props.layout, editorState?.selectedCompNames, props.dragSelectedComps]
379379
);
380380

381381
const [containerSelectNames, setContainerSelectNames] = useState<Set<string>>(new Set([]));
@@ -392,8 +392,8 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
392392
}, [extraLayout, containerSelectNames]);
393393

394394
const canAddSelect = useMemo(
395-
() => _.size(containerSelectNames) === _.size(editorState.selectedCompNames),
396-
[containerSelectNames, editorState.selectedCompNames]
395+
() => _.size(containerSelectNames) === _.size(editorState?.selectedCompNames),
396+
[containerSelectNames, editorState?.selectedCompNames]
397397
);
398398

399399
const dispatchPositionParamsTimerRef = useRef(0);
@@ -446,9 +446,9 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
446446
);
447447
const setSelectedNames = useCallback(
448448
(names: Set<string>) => {
449-
editorState.setSelectedCompNames(names);
449+
editorState?.setSelectedCompNames(names);
450450
},
451-
[editorState.setSelectedCompNames]
451+
[editorState?.setSelectedCompNames]
452452
);
453453

454454
const { width, ref } = useResizeDetector({
@@ -502,7 +502,7 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
502502
style={props.style}
503503
scrollContainerRef={props.scrollContainerRef}
504504
width={width ?? 0}
505-
showGridLines={editorState.showGridLines() && (isDroppable || enableGridLines)}
505+
showGridLines={editorState?.showGridLines() && (isDroppable || enableGridLines)}
506506
isRowCountLocked={isRowCountLocked}
507507
isDraggable={isDraggable}
508508
isResizable={isResizable}
@@ -519,7 +519,7 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
519519
: defaultLayout(compType);
520520
return {
521521
size: compLayout ?? defaultSize,
522-
positionParams: editorState.canvasPositionParams(),
522+
positionParams: editorState?.canvasPositionParams(),
523523
};
524524
}
525525
}}
@@ -535,18 +535,18 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
535535
const items = _.pick(props.items, Object.keys(layoutItems));
536536
draggingUtils.setData("sourceDispatch", props.dispatch);
537537
draggingUtils.setData<Record<string, GridItem>>("items", items);
538-
editorState.setDragging(true);
538+
editorState?.setDragging(true);
539539
const names = Object.values(items).map((item) => item.name);
540-
editorState.setSelectedCompNames(new Set(names));
540+
editorState?.setSelectedCompNames(new Set(names));
541541
}}
542542
onFlyDrop={(layout, items) => {
543543
onFlyDrop(layout, items, props.dispatch);
544544
}}
545545
onResizeStart={(_a, _b, _c, _d, event) => {
546546
event.stopPropagation();
547-
editorState.setDragging(true);
547+
editorState?.setDragging(true);
548548
}}
549-
onResizeStop={() => editorState.setDragging(false)}
549+
onResizeStop={() => editorState?.setDragging(false)}
550550
margin={[0, 0]}
551551
containerPadding={props.containerPadding}
552552
fixedRowCount={props.emptyRows !== DEFAULT_ROW_COUNT}
@@ -560,12 +560,12 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
560560
minHeight={props.minHeight}
561561
bgColor={props.bgColor}
562562
radius={props.radius}
563-
hintPlaceholder={!editorState.isDragging && !readOnly && props.hintPlaceholder}
563+
hintPlaceholder={!editorState?.isDragging && !readOnly && props.hintPlaceholder}
564564
selectedSize={_.size(containerSelectNames)}
565565
clickItem={clickItem}
566566
isCanvas={props.isCanvas}
567567
showName={props.showName}
568-
disableDirectionKey={editorState.isDragging || readOnly}
568+
disableDirectionKey={editorState?.isDragging || readOnly}
569569
>
570570
{itemViews}
571571
</ReactGridLayout>

‎client/packages/lowcoder/src/comps/comps/listViewComp/listViewComp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { ListView } from "./listView";
3939
import { listPropertyView } from "./listViewPropertyView";
4040
import { getData } from "./listViewUtils";
4141
import { withMethodExposing } from "comps/generators/withMethodExposing";
42-
import SliderControl from "@lowcoder-ee/comps/controls/sliderControl";
42+
import { SliderControl } from "@lowcoder-ee/comps/controls/sliderControl";
4343

4444
const childrenMap = {
4545
noOfRows: withIsLoadingMethod(NumberOrJSONObjectArrayControl), // FIXME: migrate "noOfRows" to "data"

‎client/packages/lowcoder/src/comps/comps/pageLayoutComp/pageLayoutComp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { ContainerBodyChildComp } from "./containerBodyChildComp";
2828
import { trans } from "i18n";
2929
import { ControlNode } from "lowcoder-design";
3030
import { StringControl } from "comps/controls/codeControl";
31-
import SliderControl from "@lowcoder-ee/comps/controls/sliderControl";
31+
import { SliderControl } from "@lowcoder-ee/comps/controls/sliderControl";
3232
import { useMergeCompStyles } from "@lowcoder-ee/util/hooks";
3333

3434
const childrenMap = {

‎client/packages/lowcoder/src/comps/comps/responsiveLayout/responsiveLayout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import { EditorContext } from "comps/editorState";
4242

4343
import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUtils";
4444
import { DisabledContext } from "comps/generators/uiCompBuilder";
45-
import SliderControl from "@lowcoder-ee/comps/controls/sliderControl";
45+
import { SliderControl } from "@lowcoder-ee/comps/controls/sliderControl";
4646
import { getBackgroundStyle } from "@lowcoder-ee/util/styleUtils";
4747
import { useScreenInfo } from "../../hooks/screenInfoComp";
4848

‎client/packages/lowcoder/src/comps/comps/splitLayout/splitLayout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { NameGenerator } from "comps/utils";
2828
import { AutoHeightControl } from "comps/controls/autoHeightControl";
2929
import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
3030
import { NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing";
31-
import SliderControl from "@lowcoder-ee/comps/controls/sliderControl";
31+
import { SliderControl } from "@lowcoder-ee/comps/controls/sliderControl";
3232
import { getBackgroundStyle } from "@lowcoder-ee/util/styleUtils";
3333
import _ from "lodash";
3434

‎client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { checkIsMobile } from "util/commonUtils";
3535
import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
3636
import { BoolControl } from "comps/controls/boolControl";
3737
import { PositionControl } from "comps/controls/dropdownControl";
38-
import SliderControl from "@lowcoder-ee/comps/controls/sliderControl";
38+
import { SliderControl } from "@lowcoder-ee/comps/controls/sliderControl";
3939
import { getBackgroundStyle } from "@lowcoder-ee/util/styleUtils";
4040

4141
const EVENT_OPTIONS = [

‎client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerComp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { SimpleContainerComp } from "../containerBase/simpleContainerComp";
2727
import { ContainerBodyChildComp } from "./containerBodyChildComp";
2828
import { trans } from "i18n";
2929
import { ControlNode } from "lowcoder-design";
30-
import SliderControl from "@lowcoder-ee/comps/controls/sliderControl";
30+
import { SliderControl } from "@lowcoder-ee/comps/controls/sliderControl";
3131
import { useMergeCompStyles } from "@lowcoder-ee/util/hooks";
3232

3333
const childrenMap = {

‎client/packages/lowcoder/src/comps/controls/sliderControl.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ class SliderControl extends SimpleComp<number> {
3131
}
3232
}
3333

34-
export default SliderControl;
34+
export { SliderControl };

‎client/packages/lowcoder/src/comps/hooks/drawerComp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { useUserViewMode } from "util/hooks";
2525
import { isNumeric } from "util/stringUtils";
2626
import { NameConfig, withExposingConfigs } from "../generators/withExposing";
2727
import { title } from "process";
28-
import SliderControl from "../controls/sliderControl";
28+
import { SliderControl } from "../controls/sliderControl";
2929

3030
const EventOptions = [closeEvent] as const;
3131

‎client/packages/lowcoder/src/comps/hooks/modalComp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { isNumeric } from "util/stringUtils";
2222
import { NameConfig, withExposingConfigs } from "../generators/withExposing";
2323
import { BoolControl } from "comps/controls/boolControl";
2424
import { withDefault } from "comps/generators";
25-
import SliderControl from "../controls/sliderControl";
25+
import { SliderControl } from "../controls/sliderControl";
2626
import { getBackgroundStyle } from "@lowcoder-ee/util/styleUtils";
2727

2828
const EventOptions = [

‎client/packages/lowcoder/src/index.sdk.ts

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ export * from "comps/controls/stringSimpleControl";
105105
export * from "comps/controls/styleControl";
106106
export * from "comps/controls/styleControlConstants";
107107
export * from "comps/controls/slotControl";
108+
export * from "comps/controls/sliderControl";
108109

109110
// generators
110111
export * from "comps/generators/changeDataType";

0 commit comments

Comments
 (0)