pds-dev-kit-web-test 2.7.356 → 2.7.358

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

@@ -10,9 +10,9 @@ type Props = {
     zIndex: number;
     showPinned?: boolean;
     style?: React.CSSProperties;
-    isParentGroupPinned: boolean;
+    isParentGroupHeightVariable: boolean;
     block: Block;
 };
-declare function FlexGridItem({ cb, index, device, rowHeight, zIndex, showPinned, block, style, isParentGroupPinned }: Props): JSX.Element;
+declare function FlexGridItem({ cb, index, device, rowHeight, zIndex, showPinned, block, style, isParentGroupHeightVariable }: Props): JSX.Element;
 export declare function getGridAreaFromCB(props: CB_PLACEMENT_PROP_SPECS, device: Device): string;
 export default FlexGridItem;

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

@@ -24,12 +24,12 @@ var styled_components_1 = __importDefault(require("styled-components"));
 var ComponentBlockMatcherWithCCB_1 = __importDefault(require("../sections/CustomSection/components/ComponentBlock/ComponentBlockMatcherWithCCB"));
 var gap = 10;
 function FlexGridItem(_a) {
-    var cb = _a.cb, index = _a.index, device = _a.device, rowHeight = _a.rowHeight, zIndex = _a.zIndex, showPinned = _a.showPinned, block = _a.block, style = _a.style, isParentGroupPinned = _a.isParentGroupPinned;
+    var cb = _a.cb, index = _a.index, device = _a.device, rowHeight = _a.rowHeight, zIndex = _a.zIndex, showPinned = _a.showPinned, block = _a.block, style = _a.style, isParentGroupHeightVariable = _a.isParentGroupHeightVariable;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var defaultHeight = getMaxHeight(cb.jsonProperties.data.CB_PLACEMENT_PROP_PLACEMENT, device, rowHeight);
     var gridArea = getGridAreaFromCB(cb.jsonProperties.data.CB_PLACEMENT_PROP_PLACEMENT, device);
-    var isCBPinned = device === 'DESKTOP' ? block.isHeightVariableDesktop : block.isHeightVariableMobile;
-    var isPinned = isParentGroupPinned || isCBPinned;
+    var isCBHeightVariable = device === 'DESKTOP' ? block.isHeightVariableDesktop : block.isHeightVariableMobile;
+    var isHeightVariable = isParentGroupHeightVariable || isCBHeightVariable;
     var getHeightFitContent = function () {
         var _a, _b, _c, _d;
         if ('CB_STYLE_PROP_TEXT' in cb.jsonProperties.data) {
@@ -42,26 +42,26 @@ function FlexGridItem(_a) {
     };
     var heightFitContent = getHeightFitContent();
     var getHeightStyles = function () {
-        if (heightFitContent && isPinned) {
+        if (heightFitContent && isHeightVariable) {
             return {
-                height: 'fit-content',
+                height: 'auto',
                 maxHeight: 'none'
             };
         }
-        if (heightFitContent && !isPinned) {
+        if (heightFitContent && !isHeightVariable) {
             return {
-                height: 'auto',
+                height: 'fit-content',
                 maxHeight: 'none'
             };
         }
-        if (!heightFitContent && isPinned) {
+        if (!heightFitContent && isHeightVariable) {
             return {
-                height: defaultHeight,
-                maxHeight: defaultHeight
+                height: '100%'
             };
         }
         return {
-            height: '100%'
+            height: defaultHeight,
+            maxHeight: defaultHeight
         };
     };
     return ((0, jsx_runtime_1.jsx)(GridItem, __assign({ style: __assign(__assign({ zIndex: zIndex, gridArea: gridArea, position: 'relative' }, style), getHeightStyles()), className: "flex-grid-item", "data-show-pinned": showPinned, "data-height-fit-content": "true" }, { children: (0, jsx_runtime_1.jsx)(ComponentBlockMatcherWithCCB_1.default, { rowHeight: rowHeight, cbProps: cb, device: device, index: index }) })));

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

@@ -27,9 +27,9 @@ function FlexGridItem(_a) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var defaultHeight = getMaxHeight(cb.jsonProperties.data.CB_PLACEMENT_PROP_PLACEMENT, device, rowHeight);
     var gridArea = getGridAreaFromCB(cb.jsonProperties.data.CB_PLACEMENT_PROP_PLACEMENT, device, maxCols);
-    var isCBPinned = device === 'DESKTOP' ? block.isHeightVariableDesktop : block.isHeightVariableMobile;
-    var isPinned = isParentGroupPinned || isCBPinned;
-    return ((0, jsx_runtime_1.jsx)(GridItem, __assign({ style: __assign({ zIndex: zIndex, gridArea: gridArea, position: 'relative', maxHeight: isPinned ? defaultHeight : 'none' }, style) }, { children: (0, jsx_runtime_1.jsx)(ComponentBlockMatcher_1.default, { rowHeight: rowHeight, cbProps: cb, device: device, index: index }) })));
+    var isCBHeightVariable = device === 'DESKTOP' ? block.isHeightVariableDesktop : block.isHeightVariableMobile;
+    var isHeightVariable = isParentGroupPinned || isCBHeightVariable;
+    return ((0, jsx_runtime_1.jsx)(GridItem, __assign({ style: __assign({ zIndex: zIndex, gridArea: gridArea, position: 'relative', maxHeight: isHeightVariable ? 'none' : defaultHeight }, style) }, { children: (0, jsx_runtime_1.jsx)(ComponentBlockMatcher_1.default, { rowHeight: rowHeight, cbProps: cb, device: device, index: index }) })));
 }
 var GridItem = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  height: auto;\n  word-break: break-word;\n"], ["\n  height: auto;\n  word-break: break-word;\n"])));
 function getMaxHeight(props, device, rowHeight) {

package/dist/src/sub/DynamicLayout/GridAutoRowEditor/GridAutoRowEditorForDL.js

@@ -270,7 +270,7 @@ var GridAutoRowEditor = (0, react_1.forwardRef)(function CustomSection(props, re
                                     isEditMode: true }, child.blockId)); })] })) })) })) }) })) }));
 });
 function GroupBlockRender(_a) {
-    var block = _a.block, layouts = _a.layouts, pedigree = _a.pedigree, isEditing = _a.isEditing, isPinned = _a.isPinned, componentBlocks = _a.componentBlocks, onTogglePinned = _a.onTogglePinned, onDoubleClick = _a.onDoubleClick, onDoubleClickOutside = _a.onDoubleClickOutside;
+    var block = _a.block, layouts = _a.layouts, pedigree = _a.pedigree, isEditing = _a.isEditing, isHeightVariable = _a.isHeightVariable, componentBlocks = _a.componentBlocks, onTogglePinned = _a.onTogglePinned, onDoubleClick = _a.onDoubleClick, onDoubleClickOutside = _a.onDoubleClickOutside;
     var childrenIds = (0, group_1.findAllChildrenCbIds)(pedigree, block.blockId).map(function (i) { return i.toString(); });
     var bounding = (0, renderHelpers_1.getBoundingArea)(layouts, childrenIds);
     (0, react_1.useEffect)(function () {
@@ -312,7 +312,7 @@ function GroupBlockRender(_a) {
                     right: 0,
                     bottom: 0,
                     boxShadow: '0 0 0 3px #027aff'
-                } }), children === null || children === void 0 ? void 0 : children.map(function (cb, index) { return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(FlexGridItem_1.default, { cb: cb, index: index, device: "DESKTOP", rowHeight: 50, zIndex: 0, style: { pointerEvents: 'none', opacity: isEditing ? 1 : 0.3 }, showPinned: isEditing, block: block, isParentGroupPinned: isPinned }) }, cb.id)); })] })));
+                } }), children === null || children === void 0 ? void 0 : children.map(function (cb, index) { return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(FlexGridItem_1.default, { cb: cb, index: index, device: "DESKTOP", rowHeight: 50, zIndex: 0, style: { pointerEvents: 'none', opacity: isEditing ? 1 : 0.3 }, showPinned: isEditing, block: block, isParentGroupHeightVariable: isHeightVariable }) }, cb.id)); })] })));
 }
 var S_Pinned = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  pointer-events: auto;\n  position: absolute;\n  right: 0;\n  top: 0;\n  z-index: 9999999;\n"], ["\n  pointer-events: auto;\n  position: absolute;\n  right: 0;\n  top: 0;\n  z-index: 9999999;\n"])));
 function getGridAreaFromGroup(position) {

package/dist/src/sub/DynamicLayout/utils/groupUtils.d.ts

@@ -4,7 +4,7 @@ import type { Device } from '../sections/CustomSection/util/types';
 import type { Block } from 'publ-echo-test/dist/lib/GridLayoutEditor/group';
 import type { LayoutItem } from 'publ-echo/dist/lib';
 export declare function findAllChildrenCbIds(block: Block, targetGroupId: string): number[];
-export default function RenderPedigreeRecursively({ isEditMode, block, layoutItems, cbs, parentGroupArea, rowHeight, device, selectedRows, isParentGroupPinned }: {
+export default function RenderPedigreeRecursively({ isEditMode, block, layoutItems, cbs, parentGroupArea, rowHeight, device, selectedRows, isParentGroupHeightVariable }: {
     isEditMode: boolean;
     block: Block;
     layoutItems: LayoutItem[];
@@ -12,7 +12,7 @@ export default function RenderPedigreeRecursively({ isEditMode, block, layoutIte
     rowHeight: number;
     device: Device;
     selectedRows: number[];
-    isParentGroupPinned?: boolean;
+    isParentGroupHeightVariable?: boolean;
     parentGroupArea?: {
         rowStart: number;
         colStart: number;

package/dist/src/sub/DynamicLayout/utils/groupUtils.js

@@ -80,9 +80,9 @@ exports.findAllChildrenCbIds = findAllChildrenCbIds;
 function RenderPedigreeRecursively(_a) {
     var isEditMode = _a.isEditMode, block = _a.block, layoutItems = _a.layoutItems, cbs = _a.cbs, parentGroupArea = _a.parentGroupArea, rowHeight = _a.rowHeight, device = _a.device, selectedRows = _a.selectedRows, 
     // pinnedGBs,
-    _b = _a.isParentGroupPinned, 
+    _b = _a.isParentGroupHeightVariable, 
     // pinnedGBs,
-    isParentGroupPinned = _b === void 0 ? false : _b;
+    isParentGroupHeightVariable = _b === void 0 ? false : _b;
     var type = block.type;
     if (type === 'GROUP_BLOCK') {
         var childrenIds = findAllChildrenCbIds(block, block.blockId).map(function (i) { return i.toString(); });
@@ -103,7 +103,7 @@ function RenderPedigreeRecursively(_a) {
         var relativeSelectedRows_1 = selectedRows
             .map(function (row) { return row - gridArea_1.rowStart + 1; })
             .filter(function (row) { return row >= 0 && row <= bounding_1.h; });
-        var isGBPinned_1 = device === 'DESKTOP' ? block.isHeightVariableDesktop : block.isHeightVariableMobile;
+        var isGBHeightVariable_1 = device === 'DESKTOP' ? block.isHeightVariableDesktop : block.isHeightVariableMobile;
         var defaultHeight = getMaxHeight({ cols: bounding_1.w, rows: bounding_1.h, x: bounding_1.x, y: bounding_1.y }, rowHeight);
         return ((0, jsx_runtime_1.jsx)(S_GroupItem, __assign({ cols: bounding_1.w, sectionRow: bounding_1.h, isEditMode: isEditMode, rowHeight: rowHeight, selectedRows: relativeSelectedRows_1, style: {
                 gridArea: gridAreaObjToString(relativeGridArea_1),
@@ -111,11 +111,11 @@ function RenderPedigreeRecursively(_a) {
                 zIndex: device === 'DESKTOP'
                     ? block.zOrderDesktopInternal
                     : block.zOrderMobileInternal,
-                maxHeight: isGBPinned_1 ? defaultHeight : 'none'
+                maxHeight: isGBHeightVariable_1 ? 'none' : defaultHeight
             }, className: "flex-grid-item", "data-show-pinned": isEditMode }, { children: block.children.map(function (child) { return ((0, jsx_runtime_1.jsx)(RenderPedigreeRecursively, { rowHeight: rowHeight, block: child, layoutItems: layoutItems, cbs: cbs, parentGroupArea: gridArea_1, device: device, selectedRows: relativeSelectedRows_1, 
                 // pinnedGBs={pinnedGBs}
                 // onToggleGBPinned={onToggleGBPinned}
-                isEditMode: isEditMode, isParentGroupPinned: isGBPinned_1 }, child.blockId)); }) })));
+                isEditMode: isEditMode, isParentGroupHeightVariable: isGBHeightVariable_1 }, child.blockId)); }) })));
     }
     // default: TYPE === 'COMPONENT_BLOCK'
     var cbIndex = cbs.findIndex(function (c) { return c.blockId === block.blockId; });
@@ -143,7 +143,7 @@ function RenderPedigreeRecursively(_a) {
                 gridArea: gridAreaObjToString(relativeGridArea),
                 pointerEvents: isEditMode ? 'none' : 'auto',
                 boxShadow: isEditMode ? '0 0 0 3px #027aff' : ''
-            }, showPinned: isEditMode && !parentGroupArea, isParentGroupPinned: isParentGroupPinned }) }, cb.id)
+            }, showPinned: isEditMode && !parentGroupArea, isParentGroupHeightVariable: isParentGroupHeightVariable }) }, cb.id)
     // </S_GridItem>
     );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pds-dev-kit-web-test",
-  "version": "2.7.356",
+  "version": "2.7.358",
   "license": "MIT",
   "private": false,
   "main": "dist/index.js",
@@ -25,7 +25,7 @@
     "lottie-react": "^2.3.1",
     "nuka-carousel": "^4.8.4",
     "publ-echo": "^0.0.120",
-    "publ-echo-test": "^0.0.359",
+    "publ-echo-test": "^0.0.360",
     "react-hook-form": "^7.28.1",
     "react-i18next": "^11.12.0",
     "react-router-dom": "^5.2.0",