diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx index 6721a8c022a3..efe835478809 100644 --- a/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx +++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx @@ -1,3 +1,5 @@ +import React from "react"; +import { deriveAlignedColumnHighlights } from "../../utils/layouts/highlights/alignedColumnHighlights"; import BaseLayoutComponent from "../BaseLayoutComponent"; import { type DeriveHighlightsFn, @@ -5,12 +7,12 @@ import { type LayoutProps, } from "layoutSystems/anvil/utils/anvilTypes"; import type { FlexLayoutProps } from "./FlexLayout"; -import { deriveColumnHighlights } from "layoutSystems/anvil/utils/layouts/highlights/columnHighlights"; +import { MainCanvasWrapper } from "./MainCanvasWrapper"; class LayoutColumn extends BaseLayoutComponent { static type: LayoutComponentTypes = LayoutComponentTypes.LAYOUT_COLUMN; - static deriveHighlights: DeriveHighlightsFn = deriveColumnHighlights; + static deriveHighlights: DeriveHighlightsFn = deriveAlignedColumnHighlights; static getChildTemplate(props: LayoutProps): LayoutProps | null { if (props.childTemplate || props.childTemplate === null) @@ -19,7 +21,7 @@ class LayoutColumn extends BaseLayoutComponent { return { insertChild: true, layoutId: "", - layoutType: LayoutComponentTypes.WIDGET_ROW, + layoutType: LayoutComponentTypes.ALIGNED_WIDGET_ROW, layout: [], }; } @@ -27,10 +29,19 @@ class LayoutColumn extends BaseLayoutComponent { getFlexLayoutProps(): Omit { return { ...super.getFlexLayoutProps(), - alignSelf: "stretch", + height: "100%", + gap: "spacing-4", direction: "column", }; } + + renderViewMode(): JSX.Element { + return ( + + {super.renderChildren()} + + ); + } } export default LayoutColumn; diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx new file mode 100644 index 000000000000..c4a2c7b74d69 --- /dev/null +++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx @@ -0,0 +1,14 @@ +import React from "react"; +import { FlexLayout, type FlexLayoutProps } from "./FlexLayout"; + +export const MainCanvasWrapper = (props: FlexLayoutProps) => { + const { search } = window.location; + const queryParams = new URLSearchParams(search); + const isEmbed = queryParams.get("embed") === "true"; + + return ( + + {props.children} + + ); +}; diff --git a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts index c15c7393b827..b9131c7d83be 100644 --- a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts +++ b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts @@ -18,14 +18,8 @@ export function anvilDSLTransformer(dsl: DSLWidget) { _dsl.layout = [ { layoutId: generateReactKey(), - layoutType: LayoutComponentTypes.ALIGNED_LAYOUT_COLUMN, + layoutType: LayoutComponentTypes.LAYOUT_COLUMN, layout: [], - layoutStyle: { - border: "none", - height: "100%", - padding: "spacing-4", - gap: "spacing-4", - }, isDropTarget: true, isPermanent: true, childTemplate: {