publ-echo-test 0.0.50 → 0.0.52

package/dist/lib/Resizable/Resizable.js

@@ -48,8 +48,8 @@ var Resizable = function (_a) {
     });
     var startPosition = useRef(null);
     var startSize = useRef(null);
-    var lastHandleRect = null;
-    var slack = null;
+    var lastHandleRectRef = useRef(null);
+    var slack = useRef(null);
     var className = props.className, draggableOpts = props.draggableOpts, width = props.width, height = props.height, handle = props.handle, onResize = props.onResize, onResizeStop = props.onResizeStop, onResizeStart = props.onResizeStart, restProps = __rest(props, ["className", "draggableOpts", "width", "height", "handle", "onResize", "onResizeStop", "onResizeStart"]);
     var elementRef = children.ref;
     var extendedHeightRef = useRef(null);
@@ -95,11 +95,13 @@ var Resizable = function (_a) {
         }
     }, [isResizing, autoResize, children, elementRef]);
     var resetData = function () {
-        lastHandleRect = slack = null;
+        lastHandleRectRef.current = null;
+        slack.current = null;
     };
     // NOTE - 최소 또는 최대 제약 조건 width와 height 계산, 비율 고정 계산
     var checkConstraints = function (width, height) {
-        if (!minConstraints && !maxConstraints && !lockAspectRatio) {
+        var _a;
+        if (!maxConstraints && !lockAspectRatio) {
             return [width, height];
         }
         if (lockAspectRatio) {
@@ -113,19 +115,26 @@ var Resizable = function (_a) {
                 width = height * ratio;
             }
         }
-        var _a = [width, height], oldW = _a[0], oldH = _a[1];
-        var _b = slack || [0, 0], slackW = _b[0], slackH = _b[1];
+        var _b = [width, height], oldW = _b[0], oldH = _b[1];
+        var _c = (_a = slack.current) !== null && _a !== void 0 ? _a : [0, 0], slackW = _c[0], slackH = _c[1];
         width += slackW;
         height += slackH;
-        if (minConstraints) {
-            width = Math.max(minConstraints[0], width);
-            height = Math.max(minConstraints[1], height);
+        if (autoResize) {
+            width = Math.max(minWidth.current, width);
+            height = Math.max(minHeight.current, height);
+        }
+        else {
+            if (minConstraints) {
+                width = Math.max(minConstraints[0], width);
+                height = Math.max(minConstraints[1], height);
+            }
         }
         if (maxConstraints) {
             width = Math.min(maxConstraints[0], width);
             height = Math.min(maxConstraints[1], height);
         }
-        slack = [slackW + (oldW - width), slackH + (oldH - height)];
+        slack.current = [slackW + (oldW - width), slackH + (oldH - height)];
+        // console.log([slackW, slackH]);
         return [width, height];
     };
     var checkTopLeft = function (deltaX, deltaY, top, left, width, height, handleAxis) {
@@ -172,7 +181,7 @@ var Resizable = function (_a) {
     var resizeHandler = function (handlerName, handleAxis) {
         return function (e, _a) {
             var _b, _c;
-            var _d, _e, _f, _g, _h, _j, _k;
+            var _d, _e, _f, _g, _h, _j;
             var node = _a.node, deltaX = _a.deltaX, deltaY = _a.deltaY;
             if (handlerName === "onResizeStart") {
                 var position = { top: (_d = props.top) !== null && _d !== void 0 ? _d : 0, left: (_e = props.left) !== null && _e !== void 0 ? _e : 0 };
@@ -194,26 +203,24 @@ var Resizable = function (_a) {
             var axisV = handleAxis[0];
             var axisH = handleAxis[handleAxis.length - 1];
             var handleRect = node.getBoundingClientRect();
-            // if (lastHandleRect !== null) {
+            // if (lastHandleRectRef.current !== null) {
             //   if (axisH === "w") {
-            //     const deltaLeftSinceLast = handleRect.left - lastHandleRect.left;
+            //     const deltaLeftSinceLast = handleRect.left - lastHandleRectRef.current.left;
+            //     console.log('delta, :', deltaLeftSinceLast);
             //     deltaX += deltaLeftSinceLast;
             //   }
             //   if (axisV === "n") {
-            //     const deltaTopSinceLast = handleRect.top - lastHandleRect.top;
+            //     const deltaTopSinceLast = handleRect.top - lastHandleRectRef.current.top;
             //     deltaY += deltaTopSinceLast;
             //   }
             // }
-            lastHandleRect = handleRect;
+            lastHandleRectRef.current = handleRect;
             if (axisH === "w") {
                 deltaX = -deltaX;
             }
             if (axisV === "n") {
                 deltaY = -deltaY;
             }
-            if (shouldShrinkRef.current) {
-                deltaY = 0;
-            }
             var width = props.width + (canDragX ? deltaX / transformScale : 0);
             var height = props.height + (canDragY ? deltaY / transformScale : 0);
             var left = (_h = props === null || props === void 0 ? void 0 : props.left) !== null && _h !== void 0 ? _h : 0;
@@ -226,20 +233,20 @@ var Resizable = function (_a) {
             }
             // width = Math.max(width, minWidth.current);
             // const isOverMin = calcWH()
-            if (minHeight.current) {
-                height = Math.max(minHeight.current, height);
-            }
-            if (extendedHeightRef.current) {
-                height = extendedHeightRef.current;
+            // if (minHeight.current) {
+            //   height = Math.max(minHeight.current, height);
+            // }
+            _b = checkConstraints(width, height), width = _b[0], height = _b[1];
+            if (extendedHeightRef.current === height) {
                 handleAxis = removeNorthHandle(handleAxis);
             }
-            _b = checkConstraints(width, height), width = _b[0], height = _b[1];
             _c = checkTopLeft(deltaX, deltaY, top, left, width, height, handleAxis), top = _c[0], left = _c[1];
             var isDimensionsChanged = width !== props.width || height !== props.height;
             var cb = typeof props[handlerName] === "function" ? props[handlerName] : null;
             var isCbSkipped = handlerName === "onResize" && !isDimensionsChanged;
             if (cb && !isCbSkipped) {
-                cb(e, { node: node, size: { width: width, height: height, top: top, left: left }, handle: handleAxis, minWidth: minWidth.current, minHeight: (_k = minHeight.current) !== null && _k !== void 0 ? _k : 0 });
+                // cb(e, { node, size: { width, height, top, left }, handle: handleAxis, minWidth: minWidth.current, minHeight: minHeight.current ?? 0 });
+                cb(e, { node: node, size: { width: width, height: height, top: top, left: left }, handle: handleAxis });
             }
             if (handlerName === "onResizeStop") {
                 startPosition.current = null;

package/package.json

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