@sepveneto/free-dom 0.4.2 → 0.5.0

package/dist/index.css

@@ -1,4 +1,4 @@
-/* ../../../../../../../tmp/tmp-1778-6uk8ditWyl3v/core/src/style/index.css */
+/* ../../../../../../../tmp/tmp-1786-gkIJaG8JbzPz/core/src/style/index.css */
 :root {
   --free-dom-theme: #4089ef;
   --free-dom-line: var(--free-dom-theme);

package/dist/index.js

@@ -202,7 +202,7 @@ var FreeDom = (0, import_vue_demi2.defineComponent)({
   emits: ["update:x", "update:y", "update:width", "update:height", "select"],
   setup(props, { emit }) {
     const active = (0, import_vue_demi2.ref)(false);
-    const SceneContext = (0, import_vue_demi2.inject)(SceneToken);
+    const SceneContext = (0, import_vue_demi2.inject)(SceneToken, void 0);
     const _preview = (0, import_vue_demi2.computed)(() => SceneContext?.preview || props.preview);
     const canScale = (0, import_vue_demi2.computed)(() => !_preview.value && (SceneContext?.scale || props.scale));
     const canMove = (0, import_vue_demi2.computed)(() => !_preview.value && (SceneContext?.move || props.move));
@@ -216,13 +216,7 @@ var FreeDom = (0, import_vue_demi2.defineComponent)({
     const uuid = (0, import_uuid.v4)();
     const isScale = (0, import_vue_demi2.ref)(false);
     const isMove = (0, import_vue_demi2.ref)(false);
-    const _rect = (0, import_vue_demi2.reactive)({
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0
-    });
-    const triggerThrottle = (0, import_core.useThrottleFn)(trigger);
+    const _rect = (0, import_vue_demi2.reactive)({});
     const context = {
       _rect,
       trigger
@@ -230,47 +224,45 @@ var FreeDom = (0, import_vue_demi2.defineComponent)({
     (0, import_core.onClickOutside)(widgetRef, () => {
       active.value = false;
     });
-    function parseNum(val) {
-      return typeof val === "number" ? val : parseFloat(val);
-    }
-    let init = false;
-    (0, import_vue_demi2.watchEffect)(() => {
-      props.width && (_rect.width = props.width);
-      props.height && (_rect.height = props.height);
-      props.x && (_rect.x = props.x);
-      props.y && (_rect.y = props.y);
-      init && triggerThrottle();
-      init = true;
-    });
-    const rectBound = (0, import_core.useElementBounding)(widgetRef);
-    const unwatchHeight = (0, import_vue_demi2.watch)(rectBound.height, (height) => {
-      if (height) {
-        _rect.height = height;
-        unwatchHeight();
-      }
-    });
-    const unwatchWidth = (0, import_vue_demi2.watch)(rectBound.width, (width) => {
-      if (width) {
+    let rectSize = (0, import_vue_demi2.reactive)((0, import_core.useElementSize)(widgetRef));
+    let autoWidth = true;
+    let autoHeight = true;
+    const unwatch = (0, import_vue_demi2.watch)(rectSize, ({ width, height }) => {
+      if (autoWidth && width) {
         _rect.width = width;
-        unwatchWidth();
+      }
+      if (autoHeight && height) {
+        _rect.height = height;
       }
     });
+    (0, import_vue_demi2.watch)(
+      [
+        () => props.width,
+        () => props.height,
+        () => props.x,
+        () => props.y
+      ],
+      ([width, height, x, y]) => {
+        autoWidth = width === _rect.width;
+        autoHeight = height === _rect.height;
+        if (!autoHeight && !autoWidth) {
+          unwatch();
+          rectSize = null;
+        }
+        width && (_rect.width = width);
+        height && (_rect.height = height);
+        x && (_rect.x = x);
+        y && (_rect.y = y);
+        trigger();
+      },
+      { immediate: true }
+    );
     (0, import_vue_demi2.onMounted)(async () => {
       SceneContext?.register(uuid, context);
-      await (0, import_vue_demi2.nextTick)();
-      const rect = widgetRef.value.getBoundingClientRect();
-      _rect.width = _rect.width || rect.width;
-      if (_rect.width) {
-        unwatchWidth();
-      }
-      _rect.height = _rect.height || rect.height;
-      if (_rect.height) {
-        unwatchHeight();
-      }
-      _rect.x = _rect.x || 0;
-      _rect.y = _rect.y || 0;
+      const { offsetTop, offsetLeft } = widgetRef.value;
+      _rect.x = _rect.x || offsetLeft;
+      _rect.y = _rect.y || offsetTop;
       trigger();
-      emitPos();
     });
     function trigger() {
       const { x, y, width, height } = _rect;
@@ -328,9 +320,7 @@ var FreeDom = (0, import_vue_demi2.defineComponent)({
       emit("update:height", _rect.height);
     }
     function getDotPos(dot) {
-      if (!_style.value)
-        return {};
-      const { width, height } = _style.value;
+      const { width, height } = _rect;
       const isL = /l/.test(dot);
       const isR = /r/.test(dot);
       const isT = /t/.test(dot);
@@ -362,7 +352,7 @@ var FreeDom = (0, import_vue_demi2.defineComponent)({
       const shouldUpdate = props.onDragStart?.();
       if (shouldUpdate === false)
         return;
-      const pos = getStyle(_style.value);
+      const pos = { ..._rect };
       const move = (mouseEvt) => {
         const { clientX, clientY } = mouseEvt;
         const x = clientX - evt.clientX + pos.x;
@@ -398,27 +388,6 @@ var FreeDom = (0, import_vue_demi2.defineComponent)({
         return true;
       }
     }
-    function getStyle(style) {
-      const { transform, width, height } = style;
-      const { x, y } = getPos(transform);
-      return {
-        x: x ? Number(x) : 0,
-        y: y ? Number(y) : 0,
-        width: parseFloat(width),
-        height: parseFloat(height)
-      };
-    }
-    function getPos(transform) {
-      if (!transform) {
-        return {
-          x: 0,
-          y: 0
-        };
-      }
-      const posRegexp = /translate\(([.0-9]+)px[, ]+([.0-9]+)px\)/;
-      const [, x, y] = posRegexp.exec(transform) ?? [];
-      return { x: parseNum(x), y: parseNum(y) };
-    }
     return {
       widgetRef,
       canMove,

package/dist/index.mjs

@@ -7,7 +7,6 @@ var __publicField = (obj, key, value) => {
 
 // src/components/freeDom.ts
 import {
-  nextTick,
   onMounted,
   defineComponent,
   h,
@@ -17,7 +16,6 @@ import {
   reactive,
   isVue2,
   shallowRef,
-  watchEffect,
   watch as watch2
 } from "vue-demi";
 
@@ -126,7 +124,7 @@ function useResize(startX, startY, rect, dot, diagonal, snapGrid, callbacks) {
 }
 
 // src/components/freeDom.ts
-import { onClickOutside, useThrottleFn, useElementBounding } from "@vueuse/core";
+import { onClickOutside, useElementSize } from "@vueuse/core";
 import { v4 as uuidv4 } from "uuid";
 var Dots = ["t", "r", "l", "b", "lt", "lb", "rt", "rb"];
 var FreeDom = defineComponent({
@@ -190,7 +188,7 @@ var FreeDom = defineComponent({
   emits: ["update:x", "update:y", "update:width", "update:height", "select"],
   setup(props, { emit }) {
     const active = ref2(false);
-    const SceneContext = inject(SceneToken);
+    const SceneContext = inject(SceneToken, void 0);
     const _preview = computed(() => SceneContext?.preview || props.preview);
     const canScale = computed(() => !_preview.value && (SceneContext?.scale || props.scale));
     const canMove = computed(() => !_preview.value && (SceneContext?.move || props.move));
@@ -204,13 +202,7 @@ var FreeDom = defineComponent({
     const uuid = uuidv4();
     const isScale = ref2(false);
     const isMove = ref2(false);
-    const _rect = reactive({
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0
-    });
-    const triggerThrottle = useThrottleFn(trigger);
+    const _rect = reactive({});
     const context = {
       _rect,
       trigger
@@ -218,47 +210,45 @@ var FreeDom = defineComponent({
     onClickOutside(widgetRef, () => {
       active.value = false;
     });
-    function parseNum(val) {
-      return typeof val === "number" ? val : parseFloat(val);
-    }
-    let init = false;
-    watchEffect(() => {
-      props.width && (_rect.width = props.width);
-      props.height && (_rect.height = props.height);
-      props.x && (_rect.x = props.x);
-      props.y && (_rect.y = props.y);
-      init && triggerThrottle();
-      init = true;
-    });
-    const rectBound = useElementBounding(widgetRef);
-    const unwatchHeight = watch2(rectBound.height, (height) => {
-      if (height) {
-        _rect.height = height;
-        unwatchHeight();
-      }
-    });
-    const unwatchWidth = watch2(rectBound.width, (width) => {
-      if (width) {
+    let rectSize = reactive(useElementSize(widgetRef));
+    let autoWidth = true;
+    let autoHeight = true;
+    const unwatch = watch2(rectSize, ({ width, height }) => {
+      if (autoWidth && width) {
         _rect.width = width;
-        unwatchWidth();
+      }
+      if (autoHeight && height) {
+        _rect.height = height;
       }
     });
+    watch2(
+      [
+        () => props.width,
+        () => props.height,
+        () => props.x,
+        () => props.y
+      ],
+      ([width, height, x, y]) => {
+        autoWidth = width === _rect.width;
+        autoHeight = height === _rect.height;
+        if (!autoHeight && !autoWidth) {
+          unwatch();
+          rectSize = null;
+        }
+        width && (_rect.width = width);
+        height && (_rect.height = height);
+        x && (_rect.x = x);
+        y && (_rect.y = y);
+        trigger();
+      },
+      { immediate: true }
+    );
     onMounted(async () => {
       SceneContext?.register(uuid, context);
-      await nextTick();
-      const rect = widgetRef.value.getBoundingClientRect();
-      _rect.width = _rect.width || rect.width;
-      if (_rect.width) {
-        unwatchWidth();
-      }
-      _rect.height = _rect.height || rect.height;
-      if (_rect.height) {
-        unwatchHeight();
-      }
-      _rect.x = _rect.x || 0;
-      _rect.y = _rect.y || 0;
+      const { offsetTop, offsetLeft } = widgetRef.value;
+      _rect.x = _rect.x || offsetLeft;
+      _rect.y = _rect.y || offsetTop;
       trigger();
-      emitPos();
     });
     function trigger() {
       const { x, y, width, height } = _rect;
@@ -316,9 +306,7 @@ var FreeDom = defineComponent({
       emit("update:height", _rect.height);
     }
     function getDotPos(dot) {
-      if (!_style.value)
-        return {};
-      const { width, height } = _style.value;
+      const { width, height } = _rect;
       const isL = /l/.test(dot);
       const isR = /r/.test(dot);
       const isT = /t/.test(dot);
@@ -350,7 +338,7 @@ var FreeDom = defineComponent({
       const shouldUpdate = props.onDragStart?.();
       if (shouldUpdate === false)
         return;
-      const pos = getStyle(_style.value);
+      const pos = { ..._rect };
       const move = (mouseEvt) => {
         const { clientX, clientY } = mouseEvt;
         const x = clientX - evt.clientX + pos.x;
@@ -386,27 +374,6 @@ var FreeDom = defineComponent({
         return true;
       }
     }
-    function getStyle(style) {
-      const { transform, width, height } = style;
-      const { x, y } = getPos(transform);
-      return {
-        x: x ? Number(x) : 0,
-        y: y ? Number(y) : 0,
-        width: parseFloat(width),
-        height: parseFloat(height)
-      };
-    }
-    function getPos(transform) {
-      if (!transform) {
-        return {
-          x: 0,
-          y: 0
-        };
-      }
-      const posRegexp = /translate\(([.0-9]+)px[, ]+([.0-9]+)px\)/;
-      const [, x, y] = posRegexp.exec(transform) ?? [];
-      return { x: parseNum(x), y: parseNum(y) };
-    }
     return {
       widgetRef,
       canMove,
@@ -481,7 +448,7 @@ var FreeDom = defineComponent({
 
 // src/components/freeDomWrap.ts
 import { defineComponent as defineComponent3, shallowRef as shallowRef3, h as h3, provide, reactive as reactive3, ref as ref4, toRefs } from "vue-demi";
-import { useElementBounding as useElementBounding2 } from "@vueuse/core";
+import { useElementBounding } from "@vueuse/core";
 
 // src/components/markLine.ts
 import { h as h2, defineComponent as defineComponent2, shallowRef as shallowRef2, ref as ref3, reactive as reactive2, inject as inject2, onBeforeUnmount } from "vue-demi";
@@ -675,7 +642,7 @@ var FreeDomWrap = defineComponent3({
   props: freeDomWrapProps,
   setup(props) {
     const rectRef = shallowRef3(null);
-    const rect = useElementBounding2(rectRef);
+    const rect = useElementBounding(rectRef);
     const nodes = ref4([]);
     function register(uuid, node) {
       nodes.value.push({ uuid, node });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sepveneto/free-dom",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",