pds-dev-kit-web-test 2.5.323 → 2.5.325

package/dist/src/sub/DynamicLayout/CompositionRenderer/ComponentBlockMatcher.js

@@ -46,7 +46,7 @@ function ComponentBlockMatcher(_a) {
             return (0, jsx_runtime_1.jsx)(Youtube_1.Youtube, __assign({}, propsWithValue, { index: index }));
         case types_1.CB_ALL_CODES.CB_EMBED:
             return (0, jsx_runtime_1.jsx)(Embed_1.default, __assign({}, propsWithValue, { index: index }));
-        case types_1.CB_ALL_CODES.CB_CONTENTS_CAROUSEL: {
+        case types_1.CB_ALL_CODES.CB_CONTENTSCAROUSEL: {
             return (0, jsx_runtime_1.jsx)("div", { children: "NOT SUPPORTED NESTED CAROUSEL" });
         }
         default:

package/dist/src/sub/DynamicLayout/CompositionRenderer/Composition.d.ts

@@ -1,9 +1,11 @@
 import React from 'react';
-import type { ISection } from '../types';
+import type { IComposition } from '../types';
 import type { Layout } from 'publ-echo/dist/lib/GridLayoutEditor/types';
 export type LayoutsType = {
     sm: Layout;
     lg: Layout;
 };
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ISection & React.RefAttributes<unknown>>>;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<IComposition & {
+    device?: "DESKTOP" | "MOBILE" | undefined;
+} & React.RefAttributes<unknown>>>;
 export default _default;

package/dist/src/sub/DynamicLayout/CompositionRenderer/Composition.js

@@ -50,33 +50,31 @@ var styled_components_1 = __importDefault(require("styled-components"));
 var components_1 = require("../components");
 var gleStyles_1 = require("../gleStyles");
 var useResizableObserver_1 = require("../sections/CustomSection/hooks/useResizableObserver");
-var util_1 = require("../sections/CustomSection/util");
+require("../sections/CustomSection/util");
 var parseSectionPadding_1 = __importDefault(require("../sections/CustomSection/util/layoutPropParsers/parseSectionPadding"));
+var parseCompositionPlacement_1 = __importDefault(require("../sections/CustomSection/util/parseCompositionPlacement"));
 var FlexGridItem_1 = __importDefault(require("./FlexGridItem"));
-var GRID_CELL_MIN = 24;
-var DESKTOP_GRID_COLS = 24;
-var MOBILE_GRID_COLS = 8;
-var GLE_MIN_WIDTH_DESKTOP_PX = "".concat(GRID_CELL_MIN * DESKTOP_GRID_COLS, "px");
-var GLE_MIN_WIDTH_MOBILE_PX = "".concat(GRID_CELL_MIN * MOBILE_GRID_COLS, "px");
 var Composition = (0, react_1.forwardRef)(function CustomSection(props, ref) {
-    var _a;
-    var _b = (0, react_1.useContext)(dynamicLayoutContext_1.dynamicLayoutContext), device = _b.device, editingSectionId = _b.editingSectionId, mode = _b.mode, shortcutKeyMode = _b.shortcutKeyMode, sectionActionHandler = _b.sectionActionHandler;
+    var _a, _b, _c, _d, _e, _f, _g;
+    var _h = (0, react_1.useContext)(dynamicLayoutContext_1.dynamicLayoutContext), 
+    // NOTE: 이것을 사용해야함
+    contextDevice = _h.device, editingSectionId = _h.editingSectionId, mode = _h.mode, shortcutKeyMode = _h.shortcutKeyMode, sectionActionHandler = _h.sectionActionHandler;
     var componentBlocks = props.componentBlocks, jsonProperties = props.jsonProperties;
-    var _c = jsonProperties, _d = _c.data, CB_PLACEMENT_PROP_SECTION = _d.CB_PLACEMENT_PROP_SECTION, CB_LAYOUT_PROP_PADDING = _d.CB_LAYOUT_PROP_PADDING, zOrders = _c.zOrders;
+    // NOTE: 임시. 테스트용.
+    var device = (_b = (_a = props.device) !== null && _a !== void 0 ? _a : contextDevice) !== null && _b !== void 0 ? _b : 'DESKTOP';
+    var isMobile = device === 'MOBILE';
+    var isEditMode = mode === 'EDIT';
+    var _j = jsonProperties, _k = _j.data, CB_PLACEMENT_PROP_COMPOSITION = _k.CB_PLACEMENT_PROP_COMPOSITION, CB_LAYOUT_PROP_PADDING = _k.CB_LAYOUT_PROP_PADDING, zOrders = _j.zOrders;
+    var colsDesktop = (_c = CB_PLACEMENT_PROP_COMPOSITION.CB_PLACEMENT_PROP_COMPOSITION_SPEC_COLS) !== null && _c !== void 0 ? _c : 24;
+    var colsMobile = (_d = CB_PLACEMENT_PROP_COMPOSITION['CB_PLACEMENT_PROP_COMPOSITION_SPEC_COLS:MOBILE']) !== null && _d !== void 0 ? _d : 8;
+    var rowsDesktop = (_e = CB_PLACEMENT_PROP_COMPOSITION.CB_PLACEMENT_PROP_COMPOSITION_SPEC_ROWS) !== null && _e !== void 0 ? _e : 26;
+    var rowsMobile = (_f = CB_PLACEMENT_PROP_COMPOSITION['CB_PLACEMENT_PROP_COMPOSITION_SPEC_ROWS:MOBILE']) !== null && _f !== void 0 ? _f : 26;
+    var rows = isMobile ? rowsMobile : rowsDesktop;
+    var cols = isMobile ? colsMobile : colsDesktop;
     var containerRef = (0, react_1.useRef)(null);
     var size = (0, useResizableObserver_1.useResizeObserver)({ ref: containerRef, box: 'border-box' });
-    var _e = (0, react_1.useState)(null), selectedCB = _e[0], setSelectedCB = _e[1];
+    var _l = (0, react_1.useState)(null), selectedCB = _l[0], setSelectedCB = _l[1];
     var gleRef = (0, react_1.useRef)(null);
-    var isMobile = device === 'MOBILE';
-    var isEditMode = mode === 'EDIT';
-    // const layoutByDevice = device === 'DESKTOP' ? 'lg' : 'sm';
-    // const [layouts] = useState<LayoutsType>(() => {
-    //   const { lg, sm } = parsePlacement(componentBlocks ?? []);
-    //   return {
-    //     lg,
-    //     sm
-    //   };
-    // });
     (0, react_1.useEffect)(function () {
         if (editingSectionId !== props.id) {
             setSelectedCB(null);
@@ -124,14 +122,15 @@ var Composition = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             setSelectedCB('BULK');
         }
     }, [selectedCB, shortcutKeyMode, sectionActionHandler, setSelectedCB]);
-    var _f = (0, util_1.parseCustomSectionPlacement)({
+    var _m = (0, parseCompositionPlacement_1.default)({
         isMobile: isMobile,
-        customSectionProps: CB_PLACEMENT_PROP_SECTION
-    }), width = _f.width, minHeight = _f.minHeight, isFullWidth = _f.isFullWidth;
+        compositionProps: CB_PLACEMENT_PROP_COMPOSITION
+    }), minHeight = _m.minHeight, isFullWidth = _m.isFullWidth;
+    var canvasWidth = 50 * cols;
     var customSectionStyles = {
         minHeight: "".concat(minHeight, "vh"),
-        width: '100%',
-        maxWidth: isFullWidth ? '' : "".concat(width, "px")
+        width: "100%",
+        maxWidth: isFullWidth ? undefined : "".concat(canvasWidth, "px")
     };
     var onClickSection = function () {
         if (!isEditMode) {
@@ -147,18 +146,15 @@ var Composition = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             });
     };
     var padding = (0, parseSectionPadding_1.default)(CB_LAYOUT_PROP_PADDING, device);
-    var sectionRow = CB_PLACEMENT_PROP_SECTION[device === 'DESKTOP'
-        ? 'CB_PLACEMENT_PROP_SECTION_SPEC_ROWS'
-        : 'CB_PLACEMENT_PROP_SECTION_SPEC_ROWS:MOBILE'];
     var rowHeight = (function () {
         if (!size.width) {
             return 50;
         }
         if (device === 'MOBILE') {
-            var cellWidth_1 = size.width / MOBILE_GRID_COLS;
+            var cellWidth_1 = size.width / cols;
             return cellWidth_1 * 0.56;
         }
-        var cellWidth = size.width / DESKTOP_GRID_COLS;
+        var cellWidth = size.width / cols;
         return cellWidth * 0.56;
     })();
     var baseFontSize = (function () {
@@ -166,7 +162,7 @@ var Composition = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         if (!size.width) {
             return 16;
         }
-        var responsiveFontMode = !!((_b = (_a = props.jsonProperties) === null || _a === void 0 ? void 0 : _a.data.CB_CONTENT_PROP_SECTION) === null || _b === void 0 ? void 0 : _b.CB_CONTENT_PROP_SECTION_SPEC_VARIABLEROOTFONTSIZE);
+        var responsiveFontMode = !!((_b = (_a = props.jsonProperties) === null || _a === void 0 ? void 0 : _a.data.CB_CONTENT_PROP_COMPOSITION) === null || _b === void 0 ? void 0 : _b.CB_CONTENT_PROP_COMPOSITION_SPEC_VARIABLEROOTFONTSIZE);
         if (device === 'MOBILE') {
             if (responsiveFontMode) {
                 return size.width * 0.0421;
@@ -184,7 +180,7 @@ var Composition = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         }
         return 16;
     })();
-    return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(gleStyles_1.S_gleStyles, __assign({ style: { width: '100%', height: '100%' } }, { children: (0, jsx_runtime_1.jsx)(S_SectionWrapper, __assign({ ref: gleRef, "x-dlayout-section-type": "NO_NAME", onClick: onClickSection, style: {
+    return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(gleStyles_1.S_gleStyles, __assign({ style: { width: '100%', height: '100%' } }, { children: (0, jsx_runtime_1.jsx)(S_COMPOSITIONWrapper, __assign({ ref: gleRef, "x-dlayout-section-type": "NO_NAME", onClick: onClickSection, style: {
                     width: '100%',
                     height: '100%'
                 } }, { children: (0, jsx_runtime_1.jsx)(components_1.CustomSection, __assign({}, props, { isMobile: isMobile, overrideStyles: {
@@ -195,18 +191,18 @@ var Composition = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                         paddingLeft: padding.left,
                         width: '100%',
                         height: '100%'
-                    } }, { children: (0, jsx_runtime_1.jsx)(GridContainer, __assign({ ref: containerRef, cols: isMobile ? 8 : 24, rowHeight: rowHeight, sectionRow: sectionRow !== null && sectionRow !== void 0 ? sectionRow : 0, style: {
+                    } }, { children: (0, jsx_runtime_1.jsx)(GridContainer, __assign({ ref: containerRef, cols: cols, rowHeight: rowHeight, sectionRow: rows, style: {
                             width: customSectionStyles.width,
                             maxWidth: customSectionStyles.maxWidth,
-                            minWidth: isMobile ? GLE_MIN_WIDTH_MOBILE_PX : GLE_MIN_WIDTH_DESKTOP_PX,
+                            // minWidth: isMobile ? GLE_MIN_WIDTH_MOBILE_PX : GLE_MIN_WIDTH_DESKTOP_PX,
                             fontSize: "".concat(baseFontSize, "px")
-                        } }, { children: (_a = props.componentBlocks) === null || _a === void 0 ? void 0 : _a.map(function (cb, index) {
+                        } }, { children: (_g = props.componentBlocks) === null || _g === void 0 ? void 0 : _g.map(function (cb, index) {
                             var _a;
                             return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(FlexGridItem_1.default, { cb: cb, index: index, device: device, rowHeight: rowHeight, zIndex: (_a = zOrders === null || zOrders === void 0 ? void 0 : zOrders[device === 'DESKTOP' ? 'desktop' : 'mobile'][cb.id]) !== null && _a !== void 0 ? _a : 0 }) }, cb.id));
                         }) })) })) })) })) }));
 });
 var GridContainer = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  display: grid; /* Space between grid items */\n  gap: 10px;\n  grid-auto-rows: minmax(", ", auto);\n  grid-template-columns: repeat(", ", 1fr);\n  grid-template-rows: repeat(", ", minmax(", ", 1fr));\n  height: 100%;\n  padding: 10px 10px;\n  width: 100%;\n\n  * {\n    box-sizing: border-box;\n  }\n"], ["\n  display: grid; /* Space between grid items */\n  gap: 10px;\n  grid-auto-rows: minmax(", ", auto);\n  grid-template-columns: repeat(", ", 1fr);\n  grid-template-rows: repeat(", ", minmax(", ", 1fr));\n  height: 100%;\n  padding: 10px 10px;\n  width: 100%;\n\n  * {\n    box-sizing: border-box;\n  }\n"])), function (props) { return "".concat(props.rowHeight, "px"); }, function (props) { return props.cols; }, function (props) { return props.sectionRow; }, function (props) { return "".concat(0, "px"); });
-var S_SectionWrapper = styled_components_1.default.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  position: relative;\n"], ["\n  position: relative;\n"])));
+var S_COMPOSITIONWrapper = styled_components_1.default.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  position: relative;\n"], ["\n  position: relative;\n"])));
 exports.default = react_1.default.memo(Composition);
 function getDefensiveFontSize(device, width) {
     if (device === 'MOBILE') {

package/dist/src/sub/DynamicLayout/components/EditModeSectionMatcher/SectionBox.js

@@ -81,12 +81,9 @@ var TopRightAbsoluteBox = styled_components_1.default.div(templateObject_1 || (t
     var theme = _a.theme;
     return theme.ui_editor_preview_editing;
 });
-var S_SectionBox = styled_components_1.default.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  height: ", ";\n  position: relative;\n  z-index: ", ";\n"], ["\n  height: ", ";\n  position: relative;\n  z-index: ", ";\n"])), function (_a) {
+var S_SectionBox = styled_components_1.default.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  height: ", ";\n  position: relative;\n"], ["\n  height: ", ";\n  position: relative;\n"])), function (_a) {
     var isIframeSection = _a.isIframeSection;
     return (isIframeSection ? '100%' : 'auto');
-}, function (_a) {
-    var isEditing = _a.isEditing;
-    return (isEditing ? 3 : 1);
 });
 var DimmedEditOverlay = styled_components_1.default.div(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n  align-items: center;\n  animation: ", ";\n  background-color: ", ";\n  bottom: 0;\n  cursor: pointer;\n  display: flex;\n  justify-content: center;\n  left: 0;\n\n  opacity: ", ";\n\n  position: absolute;\n  right: 0;\n  top: 0;\n  transition: opacity 0.2s ease-out;\n  z-index: 10;\n\n  @keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n\n    50% {\n      opacity: 0.6;\n    }\n\n    100% {\n      opacity: 0;\n    }\n  }\n"], ["\n  align-items: center;\n  animation: ", ";\n  background-color: ", ";\n  bottom: 0;\n  cursor: pointer;\n  display: flex;\n  justify-content: center;\n  left: 0;\n\n  opacity: ", ";\n\n  position: absolute;\n  right: 0;\n  top: 0;\n  transition: opacity 0.2s ease-out;\n  z-index: 10;\n\n  @keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n\n    50% {\n      opacity: 0.6;\n    }\n\n    100% {\n      opacity: 0;\n    }\n  }\n"])), function (_a) {
     var fadeOut = _a.fadeOut;

package/dist/src/sub/DynamicLayout/components/Section/CustomSection.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { CSSProperties } from 'styled-components';
-import type { ISection } from '../../types';
-type SectionPropTypes = ISection & {
+import type { ISection, IComposition } from '../../types';
+type SectionPropTypes = (ISection | IComposition) & {
     children?: React.ReactNode;
 } & {
     overrideStyles?: CSSProperties;

package/dist/src/sub/DynamicLayout/components/Section/sectionContext.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-import type { ISection } from '../../types';
-export declare const sectionContext: import("react").Context<ISection | null>;
+import type { IComposition, ISection } from '../../types';
+export declare const sectionContext: import("react").Context<ISection | IComposition | null>;

package/dist/src/sub/DynamicLayout/compositionActionTypes.d.ts

@@ -0,0 +1,139 @@
+/// <reference types="react" />
+import type { Layout } from 'publ-echo/dist/lib';
+import type { ResizeEventType } from 'publ-echo/dist/lib/GridItem/types';
+import type { ComponentBlock, GroupBlock } from 'publ-echo/dist/lib/GridLayoutEditor/group';
+import type { LayoutItem, Layouts } from 'publ-echo/dist/lib/GridLayoutEditor/types';
+export type TypeOfCompositionAction = ActionMap<ActionHandlerPayload>[keyof ActionMap<ActionHandlerPayload>];
+export type PayloadCBType = {
+    type: ComponentBlock['type'];
+    blockId: string;
+    cbId: number;
+    workDir: string;
+};
+export type PayloadGBType = {
+    type: GroupBlock['type'];
+    blockId: string;
+    childrenBlockIds: string[];
+    childrenCBIds: number[];
+    workDir: string;
+};
+export type PayloadBulkType = {
+    type: 'BULK';
+    blockId: 'BULK';
+    childrenBlockIds: string[];
+    childrenCBIds: number[];
+    workDir: string;
+    groupDisabled: boolean;
+};
+export type BlockPayloadType = PayloadCBType | PayloadGBType | PayloadBulkType;
+type ActionHandlerPayload = {
+    '@COMPOSITION/CB_DRAG_START': {
+        layout: Layout;
+        prev?: LayoutItem;
+        item?: LayoutItem;
+        placeholder?: LayoutItem;
+        e?: ResizeEventType;
+        node?: HTMLElement;
+    };
+    '@COMPOSITION/CB_DRAG_STOP': {
+        layout: Layout;
+        prev?: LayoutItem;
+        item?: LayoutItem;
+        placeholder?: LayoutItem;
+        e?: ResizeEventType;
+        node?: HTMLElement;
+        blockId: string;
+        workDir: string;
+    };
+    '@COMPOSITION/CB_RESIZE_STOP': {
+        layout: Layout;
+        prev?: LayoutItem;
+        item?: LayoutItem;
+        placeholder?: LayoutItem;
+        e?: ResizeEventType;
+        node?: HTMLElement;
+        blockId: string;
+        workDir: string;
+    };
+    '@COMPOSITION/CB_AUTO_FIT_CONTENT': {
+        layout: Layout;
+        prev?: LayoutItem;
+        item?: LayoutItem;
+        placeholder?: LayoutItem;
+        e?: ResizeEventType;
+        node?: HTMLElement;
+        details: {
+            hadPaddingChanged: boolean;
+        };
+        blockId: string;
+        workDir: string;
+    };
+    '@COMPOSITION/PLACEMENT_CHANGED': {
+        layout: Layout;
+        layouts: Layouts;
+    };
+    '@COMPOSITION/BLOCK_CLICKED': {
+        block: BlockPayloadType;
+    };
+    '@COMPOSITION/CB_RIGHT_CLICKED': {
+        e: React.MouseEvent;
+        block: BlockPayloadType;
+    };
+    '@COMPOSITION/SECTION_CLICKED': {
+        sectionId: number;
+    };
+    '@COMPOSITION/SECTION_RIGHT_CLICKED': {
+        sectionId: number;
+        e: React.MouseEvent;
+    };
+    '@COMPOSITION/GROUP_RIGHT_CLICKED': {
+        e: React.MouseEvent;
+        block: PayloadGBType;
+        isEditingGroup: boolean;
+    };
+    '@COMPOSITION/BULK_RIGHT_CLICKED': {
+        e: React.MouseEvent;
+        block: PayloadBulkType;
+    };
+    '@COMPOSITION/BULK_CREATED': {
+        message: string;
+        data: LayoutItem;
+    };
+    '@COMPOSITION/BULK_DISMISSED': {
+        message: string;
+        editingGroupBlock: string;
+    };
+    '@COMPOSITION/COLLISION_NOT_FOUND': {
+        message: string;
+    };
+    '@COMPOSITION/ESCAPE_ONE_FROM_BULK': {
+        id: string;
+    };
+    '@COMPOSITION/BULK_DRAG_STOP': {
+        updatedBlocks: UpdatedBlock[];
+    };
+    '@COMPOSITION/GROUP_DRAG_STOP': {
+        updatedBlocks: UpdatedBlock[];
+        workDir: string;
+    };
+    '@COMPOSITION/WORKDIR_CHANGED': {
+        workDir: string;
+    };
+};
+export type UpdatedBlock = {
+    blockId: string;
+    cbId: number;
+    x: number;
+    y: number;
+};
+type ActionMap<M extends {
+    [index: string]: any;
+}> = {
+    [Key in keyof M]: M[Key] extends undefined ? {
+        type: Key;
+    } : {
+        type: Key;
+        payload: M[Key];
+    };
+};
+export {};

package/dist/src/sub/DynamicLayout/compositionActionTypes.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/sub/DynamicLayout/mock_composition.d.ts

@@ -0,0 +1,3 @@
+import type { IComposition } from './types';
+export declare const sampleMockComposition1: IComposition;
+export declare const sampleMockComposition2: IComposition;