diff --git a/app/client/packages/design-system/widgets/src/components/Markdown/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Markdown/src/styles.module.css index 96036ed4d177..c0995e835b25 100644 --- a/app/client/packages/design-system/widgets/src/components/Markdown/src/styles.module.css +++ b/app/client/packages/design-system/widgets/src/components/Markdown/src/styles.module.css @@ -1,12 +1,6 @@ .markdown { color: var(--color-fg); - &::after, - &::before { - /* This is required to remove the compensators of capsizing that comes up due to use of `wds-body-text` class */ - content: none !important; - } - table { border: var(--border-width-1) solid var(--color-bd); border-collapse: separate; diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts index c121a4583586..730772a90e03 100644 --- a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts +++ b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts @@ -27,6 +27,7 @@ import log from "loglevel"; import { generateDefaultLayoutPreset } from "layoutSystems/anvil/layoutComponents/presets/DefaultLayoutPreset"; import { addWidgetsToPreset } from "layoutSystems/anvil/utils/layouts/update/additionUtils"; import { addNewAnvilWidgetToDSL } from "./helpers"; +import { klona } from "klona"; // The suggested widget functionality allows users to bind data from the Query pane // to a new or existing widget on the Canvas. @@ -109,7 +110,8 @@ export function* getUpdatedListOfWidgetsAfterAddingNewWidget( isSection: boolean, // Indicates if the drop zone is a section ) { const { alignment, canvasId } = highlight; - const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets); + const allWidgetsFromRedux: CanvasWidgetsReduxState = yield select(getWidgets); + const allWidgets = klona(allWidgetsFromRedux) as CanvasWidgetsReduxState; const parentWidgetWithLayout = allWidgets[canvasId]; diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts index 9a4f5df405eb..8cb4c9d4474e 100644 --- a/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts @@ -19,7 +19,7 @@ import { addNewAnvilWidgetToDSL } from "layoutSystems/anvil/integrations/sagas/a export function* createSectionAndAddWidget( allWidgets: CanvasWidgetsReduxState, highlight: AnvilHighlightInfo, - widgets: WidgetLayoutProps[], + draggedWidgets: WidgetLayoutProps[], parentId: string, ) { /** @@ -48,7 +48,7 @@ export function* createSectionAndAddWidget( yield call( addWidgetsToSection, updatedWidgets, - widgets, + draggedWidgets, highlight, sectionProps, ); diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts index acffc1094914..09cef911286e 100644 --- a/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts @@ -58,7 +58,7 @@ export function* createZoneAndAddWidgets( updatedWidgets, draggedWidgets, highlight, - zoneProps, + zoneProps.widgetId, ); return res; @@ -68,13 +68,11 @@ export function* addWidgetsToZone( allWidgets: CanvasWidgetsReduxState, draggedWidgets: WidgetLayoutProps[], highlight: AnvilHighlightInfo, - zone: WidgetProps, + zoneWidgetId: string, ) { let updatedWidgets: CanvasWidgetsReduxState = { ...allWidgets }; - const zoneProps = { ...zone }; - const preset: LayoutProps[] = zoneProps.layout; + const preset: LayoutProps[] = updatedWidgets[zoneWidgetId].layout; let zoneLayout: LayoutProps = preset[0]; - const { widgetId: zoneWidgetId } = zoneProps; /** * If dragged widget is a new widget, @@ -86,7 +84,6 @@ export function* addWidgetsToZone( zoneWidgetId, draggedWidgets, ); - zoneProps.children = updatedWidgets[zoneWidgetId].children; /** * Split new widgets based on type. @@ -127,14 +124,11 @@ export function* addWidgetsToZone( /** * Update zone widget with the updated preset. */ - zoneProps.layout = [zoneLayout]; + updatedWidgets[zoneWidgetId].layout = [zoneLayout]; return { - canvasWidgets: { - ...updatedWidgets, - [zoneProps.widgetId]: zoneProps, - }, - zone: zoneProps, + canvasWidgets: updatedWidgets, + zone: updatedWidgets[zoneWidgetId], }; } @@ -219,7 +213,7 @@ function* moveWidgetsToNewLayout( widgets, transformMovedWidgets(widgets, movedWidgets, highlight), highlight, - zone, + zone.widgetId, ); return canvasWidgets;