@acorex-platform/framework-client 0.0.46 → 0.0.49

package/fesm2022/acorex-platform-framework-client-layout-builder.mjs

@@ -6,7 +6,7 @@ import * as i4 from '@acorex-platform/framework-client/core';
 import { AXPHookService, resolveDialogActionShortcuts, DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS, AXP_SETTINGS_DEFINITION_DIALOG_OPENER, findOverlayContainerAncestor, getNestedVisibleOverlayPanes, getTopVisibleOverlayContainer, AXPExpressionEvaluatorService, AXPKeyboardShortcutRegistry, AXPDebugService, normalizeDialogActionShortcutChord, isDialogShortcutAllowedInEditableField, resolveConfiguredFooterActionShortcuts, AXPComponentSlotModule, AXPContextStore } from '@acorex-platform/framework-client/core';
 export { DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS } from '@acorex-platform/framework-client/core';
 import { provideCommandSetups, AXPCommandService } from '@acorex-platform/framework-client/runtime';
-import { AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY, AXPWidgetsList, AXPWidgetsCatalog, createRandomUuid, AXPKeyboardShortcutPriority } from '@acorex-platform/framework-shared/core';
+import { toAxpGridItemWidgetOptions, AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY, AXPWidgetsList, AXPWidgetsCatalog, createRandomUuid, AXPKeyboardShortcutPriority } from '@acorex-platform/framework-shared/core';
 import { AXPopupService } from '@acorex/components/popup';
 import * as i1 from '@acorex-platform/framework-client/layout/widget-core';
 import { AXPWidgetSerializationHelper, AXPWidgetContainerComponent, AXPWidgetCoreModule, AXPWidgetRegistryService } from '@acorex-platform/framework-client/layout/widget-core';
@@ -881,29 +881,8 @@ class LayoutContainerMixin extends BaseContainerMixin {
         if (typeof value === 'number') {
             this.containerState.options.colSpan = value;
         }
-        else if (value) {
-            const positions = value.positions;
-            if (positions) {
-                const placement = positions?.lg ?? positions?.xl ?? positions?.xxl ?? positions?.md ?? positions?.sm;
-                if (placement) {
-                    const opts = this.containerState.options;
-                    if (placement.colSpan != null)
-                        opts.colSpan = placement.colSpan;
-                    if (placement.colStart != null)
-                        opts.colStart = placement.colStart;
-                    if (placement.colEnd != null)
-                        opts.colEnd = placement.colEnd;
-                    if (placement.rowSpan != null)
-                        opts.rowSpan = placement.rowSpan;
-                    if (placement.rowStart != null)
-                        opts.rowStart = placement.rowStart;
-                    if (placement.rowEnd != null)
-                        opts.rowEnd = placement.rowEnd;
-                    const layoutOrder = value.order ?? placement.order;
-                    if (layoutOrder != null)
-                        opts.order = layoutOrder;
-                }
-            }
+        else if (value?.positions) {
+            Object.assign(this.containerState.options, toAxpGridItemWidgetOptions(value));
         }
         return this;
     }
@@ -1198,33 +1177,6 @@ function mergeAXPGridContainerOptions(prev, patch) {
     }
     return next;
 }
-function toGridItemOptions(layoutOptions) {
-    if (!layoutOptions?.positions)
-        return { colSpan: 12 };
-    const positions = layoutOptions.positions;
-    const placement = positions['lg'] ?? positions['xl'] ?? positions['xxl'] ?? positions['md'] ?? positions['sm'];
-    if (!placement)
-        return { colSpan: 12 };
-    const opts = {};
-    if (placement['colSpan'] != null)
-        opts['colSpan'] = placement['colSpan'];
-    if (placement['colStart'] != null)
-        opts['colStart'] = placement['colStart'];
-    if (placement['colEnd'] != null)
-        opts['colEnd'] = placement['colEnd'];
-    if (placement['rowSpan'] != null)
-        opts['rowSpan'] = placement['rowSpan'];
-    if (placement['rowStart'] != null)
-        opts['rowStart'] = placement['rowStart'];
-    if (placement['rowEnd'] != null)
-        opts['rowEnd'] = placement['rowEnd'];
-    const layoutOrder = layoutOptions.order ?? placement['order'];
-    if (layoutOrder != null)
-        opts['order'] = layoutOrder;
-    if (Object.keys(opts).length === 0)
-        opts['colSpan'] = 12;
-    return opts;
-}
 class GridContainerBuilder extends WidgetContainerMixin {
     constructor() {
         super('grid-layout');
@@ -1238,7 +1190,7 @@ class GridContainerBuilder extends WidgetContainerMixin {
         fieldset.withInheritanceContext(this.inheritanceContext);
         delegate(fieldset);
         const fieldsetNode = fieldset.build();
-        const gridItemOptions = toGridItemOptions(layoutOptions);
+        const gridItemOptions = toAxpGridItemWidgetOptions(layoutOptions);
         const gridItemNode = {
             type: 'grid-item-layout',
             options: gridItemOptions,