publ-echo-test 0.0.290 → 0.0.292

package/dist/lib/GridItem/GridItem.js

@@ -142,13 +142,20 @@ var GridItem = function (_a) {
                     mutation.attributeName === "data-min-height";
                 var keepWidth = true;
                 var hasPaddingChanged = true;
+                var layoutBox = targetNode.children[0];
+                var contentsWrapper = layoutBox.children[0];
+                var oneComposition = contentsWrapper.children[0];
                 // const insetTop = Number(mutation.target.dataset.insetTop!);
                 // const insetBottom = Number(mutation.target.dataset.insetBottom!);
                 var minWidth = 0;
                 // const minHeight =
                 //   Number(mutation.target.dataset.minHeight) + insetTop + insetBottom;
-                var contentsWrapper = mutation.target.querySelector(".cb-contentslist-wrapper");
-                var oneComposition = mutation.target.querySelector(".composition-container");
+                // const contentsWrapper = mutation.target.querySelector(
+                //   ".cb-contentslist-wrapper"
+                // );
+                // const oneComposition = mutation.target.querySelector(
+                //   ".composition-container"
+                // );
                 var minHeight = 0;
                 if (contentsWrapper && oneComposition) {
                     var minCellWidth = 10;

package/dist/lib/GridItem/GroupItem.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
-import { GridItemProps } from './types';
-import { PropsWithChildren } from '../types';
+import React from "react";
+import { GridItemProps } from "./types";
+import { PropsWithChildren } from "../types";
 declare const GroupItem: ({ children, ...props }: PropsWithChildren<GridItemProps & {
     onContextGroup: (e: React.MouseEvent) => void;
     zOrder: number;

package/dist/lib/GridItem/GroupItem.js

@@ -21,22 +21,22 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useEffect, useRef, useState } from 'react';
-import { DraggableCore } from '../Draggable';
-import classNames from '../../external-lib/classnames';
-import { calcGridColWidth, calcGridItemPosition, calcGridItemWHPx, calcWH, calcXY, clamp, resolveRowHeight, } from './utils/calculateUtils';
-import { perc, setTopLeft, setTransform, } from '../GridLayoutEditor/utils/renderHelpers';
+import React, { useEffect, useRef, useState } from "react";
+import { DraggableCore } from "../Draggable";
+import classNames from "../../external-lib/classnames";
+import { calcGridColWidth, calcGridItemPosition, calcGridItemWHPx, calcWH, calcXY, clamp, resolveRowHeight, } from "./utils/calculateUtils";
+import { perc, setTopLeft, setTransform, } from "../GridLayoutEditor/utils/renderHelpers";
 var GroupItem = function (_a) {
     var _b;
     var children = _a.children, props = __rest(_a, ["children"]);
-    var resizeHandle = props.resizeHandle, cols = props.cols, zOrder = props.zOrder, zOrderInternal = props.zOrderInternal, isDraggable = props.isDraggable, _c = props.transformScale, transformScale = _c === void 0 ? 1 : _c, isResizable = props.isResizable, useCSSTransforms = props.useCSSTransforms, className = props.className, _d = props.cancel, cancel = _d === void 0 ? '' : _d, _e = props.handle, handle = _e === void 0 ? '' : _e, x = props.x, y = props.y, z = props.z, w = props.w, h = props.h, _f = props.minH, minH = _f === void 0 ? 1 : _f, _g = props.minW, minW = _g === void 0 ? 1 : _g, _h = props.maxH, maxH = _h === void 0 ? Infinity : _h, _j = props.maxW, maxW = _j === void 0 ? Infinity : _j, i = props.i, _k = props.isHiddenVisibility, isHiddenVisibility = _k === void 0 ? false : _k, containerWidth = props.containerWidth, customColWidth = props.customColWidth, autoResize = props.autoResize, minZ = props.minZ, onContextGroup = props.onContextGroup;
+    var resizeHandle = props.resizeHandle, cols = props.cols, zOrder = props.zOrder, zOrderInternal = props.zOrderInternal, isDraggable = props.isDraggable, _c = props.transformScale, transformScale = _c === void 0 ? 1 : _c, isResizable = props.isResizable, useCSSTransforms = props.useCSSTransforms, className = props.className, _d = props.cancel, cancel = _d === void 0 ? "" : _d, _e = props.handle, handle = _e === void 0 ? "" : _e, x = props.x, y = props.y, z = props.z, w = props.w, h = props.h, _f = props.minH, minH = _f === void 0 ? 1 : _f, _g = props.minW, minW = _g === void 0 ? 1 : _g, _h = props.maxH, maxH = _h === void 0 ? Infinity : _h, _j = props.maxW, maxW = _j === void 0 ? Infinity : _j, i = props.i, _k = props.isHiddenVisibility, isHiddenVisibility = _k === void 0 ? false : _k, containerWidth = props.containerWidth, customColWidth = props.customColWidth, autoResize = props.autoResize, minZ = props.minZ, onContextGroup = props.onContextGroup;
     var _l = useState(), resizing = _l[0], setResizing = _l[1];
     var _m = useState(), dragging = _m[0], setDragging = _m[1];
     var _o = useState(), dragStart = _o[0], setDragStart = _o[1];
     var _p = useState(false), isDragging = _p[0], setIsDragging = _p[1];
     var _q = useState(false), isResizing = _q[0], setIsResizing = _q[1];
     var elementRef = useRef(null);
-    var isSelected = (_b = elementRef.current) === null || _b === void 0 ? void 0 : _b.classList.contains('react-grid-item-selected');
+    var isSelected = (_b = elementRef.current) === null || _b === void 0 ? void 0 : _b.classList.contains("react-grid-item-selected");
     useEffect(function () {
         var _a;
         if (!isSelected || !autoResize) {
@@ -54,7 +54,7 @@ var GroupItem = function (_a) {
         var callback = function (mutationsList) {
             for (var _i = 0, mutationsList_1 = mutationsList; _i < mutationsList_1.length; _i++) {
                 var mutation = mutationsList_1[_i];
-                var isCharacterChanged = mutation.type === 'characterData';
+                var isCharacterChanged = mutation.type === "characterData";
                 var keepWidth = true;
                 var hasPaddingChanged = false;
                 var height = isCharacterChanged
@@ -85,14 +85,14 @@ var GroupItem = function (_a) {
                 var _a = calcWH(getPositionParams(), {
                     width: width,
                     height: height,
-                }, x, y, 'e', props.w, props.h, false), w_1 = _a.w, h_1 = _a.h;
+                }, x, y, "e", props.w, props.h, false), w_1 = _a.w, h_1 = _a.h;
                 if (keepWidth) {
                     w_1 = prevW;
                 }
                 if (prevH > h_1) {
                     h_1 = prevH;
                 }
-                var _b = getResizableXYPosition('e', w_1, h_1, prevW, prevH), newX = _b.newX, newY = _b.newY;
+                var _b = getResizableXYPosition("e", w_1, h_1, prevW, prevH), newX = _b.newX, newY = _b.newY;
                 if (prevH === h_1 && prevW === w_1 && newX === x && newY === y) {
                     return;
                 }
@@ -162,7 +162,7 @@ var GroupItem = function (_a) {
             style = setTopLeft(pos);
             if (usePercentages) {
                 if (containerWidth == null) {
-                    throw new Error('Container width is missing!');
+                    throw new Error("Container width is missing!");
                 }
                 style.left = perc(pos.left / containerWidth);
                 style.width = perc(pos.width / containerWidth);
@@ -176,7 +176,7 @@ var GroupItem = function (_a) {
      * @return {Element}          Child wrapped in Draggable.
      */
     var mixinDraggable = function (child, isDraggable) {
-        return (_jsx(DraggableCore, { disabled: !isDraggable, onStart: onDragStart, onDrag: onDrag, onStop: onDragStop, handle: handle, cancel: '.react-resizable-handle' + (cancel ? ',' + cancel : ''), scale: transformScale, nodeRef: elementRef, children: child }));
+        return (_jsx(DraggableCore, { disabled: !isDraggable, onStart: onDragStart, onDrag: onDrag, onStop: onDragStop, handle: handle, cancel: ".react-resizable-handle" + (cancel ? "," + cancel : ""), scale: transformScale, nodeRef: elementRef, children: child }));
     };
     // /**
     //  * Mix a Resizable instance into a child.
@@ -263,7 +263,7 @@ var GroupItem = function (_a) {
     var onDrag = function (e, _a) {
         var node = _a.node, deltaX = _a.deltaX, deltaY = _a.deltaY;
         if (!dragging) {
-            throw new Error('onDrag called before onDragStart.');
+            throw new Error("onDrag called before onDragStart.");
         }
         setIsDragging(true);
         var top = dragging.top + deltaY;
@@ -278,7 +278,6 @@ var GroupItem = function (_a) {
                 var rowHeightNumber = resolveRowHeight(rowHeight, colWidth);
                 var bottomBoundary = offsetParent.clientHeight -
                     calcGridItemWHPx(h, rowHeightNumber, margin[1]);
-                console.log('bb', bottomBoundary);
                 top = clamp(top, 0, bottomBoundary);
                 var rightBoundary = containerWidth - calcGridItemWHPx(w, colWidth, margin[0]);
                 left = clamp(left, 0, rightBoundary);
@@ -297,7 +296,7 @@ var GroupItem = function (_a) {
     var onDragStop = function (e, _a) {
         var node = _a.node, deltaX = _a.deltaX, deltaY = _a.deltaY;
         if (!dragging) {
-            throw new Error('onDragEnd called before onDragStart.');
+            throw new Error("onDragEnd called before onDragStart.");
         }
         var w = props.w, h = props.h, i = props.i;
         var left = dragging.left, top = dragging.top;
@@ -313,7 +312,7 @@ var GroupItem = function (_a) {
     var getResizableXYPosition = function (handle, width, height, prevW, prevH) {
         var newX = x;
         var newY = y;
-        if (handle === 'nw') {
+        if (handle === "nw") {
             // NOTE - nw left(X)와 top(Y) 둘다 변경
             if (width > prevW) {
                 newX = x - (width - prevW);
@@ -328,7 +327,7 @@ var GroupItem = function (_a) {
                 newY = y + (prevH - height);
             }
         }
-        if (handle === 'n' || handle === 'ne') {
+        if (handle === "n" || handle === "ne") {
             // NOTE - n, ne left(X) 고정 & top(Y) 변경
             if (height > prevH) {
                 newY = y - (height - prevH);
@@ -337,7 +336,7 @@ var GroupItem = function (_a) {
                 newY = y + (prevH - height);
             }
         }
-        if (handle === 'w' || handle === 'sw') {
+        if (handle === "w" || handle === "sw") {
             // NOTE - s, sw left(X) 변경 top(Y) 고정
             if (width > prevW) {
                 newX = x - (width - prevW);
@@ -354,7 +353,7 @@ var GroupItem = function (_a) {
      * @param  {Object} callbackData  an object with node and size information
      */
     var onResizeStart = function (e, callbackData) {
-        onResizeHandler(e, callbackData, 'onResizeStart');
+        onResizeHandler(e, callbackData, "onResizeStart");
     };
     /**
      * onResize event handler
@@ -363,7 +362,7 @@ var GroupItem = function (_a) {
      */
     var onResize = function (e, callbackData) {
         setIsResizing(true);
-        onResizeHandler(e, callbackData, 'onResize');
+        onResizeHandler(e, callbackData, "onResize");
     };
     /**
      * onResizeStop event handler
@@ -372,7 +371,7 @@ var GroupItem = function (_a) {
      */
     var onResizeStop = function (e, callbackData) {
         setIsResizing(false);
-        onResizeHandler(e, callbackData, 'onResizeStop');
+        onResizeHandler(e, callbackData, "onResizeStop");
     };
     /**
      * Wrapper around drag events to provide more useful data.
@@ -406,7 +405,7 @@ var GroupItem = function (_a) {
         // maxW = Math.min(maxW, cols - x);
         w = clamp(w, minW, maxW);
         h = clamp(h, tempMinH, maxH);
-        setResizing(handlerName === 'onResizeStop' ? undefined : size);
+        setResizing(handlerName === "onResizeStop" ? undefined : size);
         var _d = getResizableXYPosition(handle, w, h, prevW, prevH), newX = _d.newX, newY = _d.newY;
         handler(i, w, h, { e: e, node: node, size: size }, newX, newY);
     };
@@ -415,22 +414,22 @@ var GroupItem = function (_a) {
     var newChild = React.cloneElement(child, {
         key: i,
         ref: elementRef,
-        'data-group-block-id': i,
-        'data-z-index': z,
-        'data-z-order': zOrder,
-        'data-z-order-internal': zOrderInternal,
-        'data-min-z': minZ,
-        className: classNames('react-group-block', child.props.className, className, {
+        "data-group-block-id": i,
+        "data-z-index": z,
+        "data-z-order": zOrder,
+        "data-z-order-internal": zOrderInternal,
+        "data-min-z": minZ,
+        className: classNames("react-group-block", child.props.className, className, {
             static: props.static,
             isResizing: Boolean(resizing) &&
                 Boolean(isResizing) &&
                 Boolean(isHiddenVisibility),
             resizing: Boolean(resizing),
-            'react-draggable': isDraggable,
+            "react-draggable": isDraggable,
             isDragging: Boolean(isDragging) &&
                 Boolean(dragging) &&
                 Boolean(isHiddenVisibility),
-            'react-draggable-dragging': Boolean(dragging),
+            "react-draggable-dragging": Boolean(dragging),
             // dropping: Boolean(droppingPosition),
             cssTransforms: useCSSTransforms,
         }),
@@ -444,25 +443,25 @@ var GroupItem = function (_a) {
             }
             // 일시적으로 pointer-events 비활성화
             if (elementRef.current) {
-                elementRef.current.style.pointerEvents = 'none';
+                elementRef.current.style.pointerEvents = "none";
             }
             // 현재 마우스 위치에서 실제 요소 찾기
             var underlyingElement = document.elementFromPoint(e.clientX, e.clientY);
             // pointer-events 복구
             if (elementRef.current) {
-                elementRef.current.style.pointerEvents = 'auto';
+                elementRef.current.style.pointerEvents = "auto";
             }
-            document.querySelectorAll('.cb-layout-box.hovered').forEach(function (el) {
-                el.classList.remove('hovered');
+            document.querySelectorAll(".cb-layout-box.hovered").forEach(function (el) {
+                el.classList.remove("hovered");
             });
             if (underlyingElement &&
-                underlyingElement.classList.contains('cb-layout-box')) {
-                underlyingElement.classList.add('hovered');
+                underlyingElement.classList.contains("cb-layout-box")) {
+                underlyingElement.classList.add("hovered");
             }
         },
         onMouseLeave: function () {
-            document.querySelectorAll('.cb-layout-box.hovered').forEach(function (el) {
-                el.classList.remove('hovered');
+            document.querySelectorAll(".cb-layout-box.hovered").forEach(function (el) {
+                el.classList.remove("hovered");
             });
         },
     });

package/dist/lib/Resizable/Resizable.js

@@ -126,8 +126,11 @@ var Resizable = function (_a) {
                 return;
             }
             var target = (_a = placeholder.children[0].children[0].children[0]) !== null && _a !== void 0 ? _a : placeholder.children[0].children[0];
-            var oneComposition = target.querySelector(".composition-container");
+            // const oneComposition = target.querySelector(".composition-container");
             var isContentsList = target.id === "contentslist-box";
+            var layoutBox = target.children[0];
+            var contentsWrapper = layoutBox.children[0];
+            var oneComposition = contentsWrapper.children[0];
             if (!isContentsList || !oneComposition) {
                 return;
             }
@@ -145,7 +148,9 @@ var Resizable = function (_a) {
                 var oneCompositionMinWidth = minCellWidth * compositionCols + 20; /* 20px padding */
                 // let oneCompositionMinHeight =
                 //   minColHeight * compositionRows + 20; /* 20px padding */
-                var contentsWrapper = placeholder.querySelector(".cb-contentslist-wrapper");
+                // const contentsWrapper = placeholder.querySelector(
+                //   ".cb-contentslist-wrapper"
+                // );
                 if (contentsWrapper) {
                     var gridWrapperInnerH = contentsWrapper.clientHeight;
                     var oneCompositionH = oneComposition.clientHeight;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "publ-echo-test",
-  "version": "0.0.290",
+  "version": "0.0.292",
   "private": false,
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.js",