diff --git a/app/client/src/ee/widgets/index.ts b/app/client/src/ee/widgets/index.ts new file mode 100644 index 000000000000..43050daf947b --- /dev/null +++ b/app/client/src/ee/widgets/index.ts @@ -0,0 +1 @@ +export const EEWidgets = []; diff --git a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx index fcb93c9205a6..fa60262e0521 100644 --- a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx +++ b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx @@ -52,6 +52,7 @@ export type DropTargetComponentProps = PropsWithChildren<{ isMobile?: boolean; mobileBottomRow?: number; isListWidgetCanvas?: boolean; + showOnboardingText?: boolean; }>; const StyledDropTarget = styled.div` @@ -324,7 +325,10 @@ export function DropTargetComponent(props: DropTargetComponentProps) { }; const shouldOnboard = - !(childWidgets && childWidgets.length) && !isDragging && !props.parentId; + !(childWidgets && childWidgets.length) && + !isDragging && + // If the parentId is not set (true for main canvas), or the showOnboardingText is true (for module canvas) + (!props.parentId || props.showOnboardingText); // The drag layer is the one with the grid dots. // They need to show in certain scenarios diff --git a/app/client/src/layoutSystems/fixedlayout/canvas/FixedLayoutEditorCanvas.tsx b/app/client/src/layoutSystems/fixedlayout/canvas/FixedLayoutEditorCanvas.tsx index c7a381c5e1ae..726e9dcdaf46 100644 --- a/app/client/src/layoutSystems/fixedlayout/canvas/FixedLayoutEditorCanvas.tsx +++ b/app/client/src/layoutSystems/fixedlayout/canvas/FixedLayoutEditorCanvas.tsx @@ -38,6 +38,7 @@ export const FixedLayoutEditorCanvas = (props: BaseWidgetProps) => { parentId: props.parentId, snapColumnSpace: snapColumnSpace, widgetId: props.widgetId, + showOnboardingText: props.showOnboardingText, }), [ props.bottomRow, @@ -47,6 +48,7 @@ export const FixedLayoutEditorCanvas = (props: BaseWidgetProps) => { props.parentId, snapColumnSpace, props.widgetId, + props.showOnboardingText, ], ); const layoutSystemProps = { diff --git a/app/client/src/widgets/index.ts b/app/client/src/widgets/index.ts index 4a68c14c910d..cef46cdd13b9 100644 --- a/app/client/src/widgets/index.ts +++ b/app/client/src/widgets/index.ts @@ -91,6 +91,7 @@ import { WDSCustomWidget } from "modules/ui-builder/ui/wds/WDSCustomWidget"; import { EEWDSWidgets } from "ee/modules/ui-builder/ui/wds"; import { WDSDatePickerWidget } from "modules/ui-builder/ui/wds/WDSDatePickerWidget"; import { WDSMultiSelectWidget } from "modules/ui-builder/ui/wds/WDSMultiSelectWidget"; +import { EEWidgets } from "ee/widgets"; const LegacyWidgets = [ CanvasWidget, @@ -198,6 +199,7 @@ const Widgets = [ ...DeprecatedWidgets, ...LegacyWidgets, ...EEWDSWidgets, + ...EEWidgets, ] as (typeof BaseWidget)[]; export default Widgets;