@tmagic/stage 1.4.3 → 1.4.5

package/dist/tmagic-stage.js

@@ -2,7 +2,7 @@ import EventEmitter, { EventEmitter as EventEmitter$1 } from 'events';
 import KeyController from 'keycon';
 import { merge, throttle } from 'lodash-es';
 import { Env } from '@tmagic/core';
-import { removeClassName, guid, addClassName, removeClassNameByClassName, getDocument, createDiv, injectStyle, isSameDomain, getHost } from '@tmagic/utils';
+import { removeClassName, guid, calcValueByFontsize, addClassName, removeClassNameByClassName, getDocument, createDiv, injectStyle, isSameDomain, getHost } from '@tmagic/utils';
 import MoveableHelper from 'moveable-helper';
 import Moveable from 'moveable';
 import Guides from '@scena/guides';
@@ -181,14 +181,6 @@ const addSelectedClassName = (el, doc) => {
     item.classList.add(`${SELECTED_CLASS}-parents`);
   });
 };
-const calcValueByFontsize = (doc, value) => {
-  const { fontSize } = doc.documentElement.style;
-  if (fontSize) {
-    const times = globalThis.parseFloat(fontSize) / 100;
-    return Number((value / times).toFixed(2));
-  }
-  return value;
-};
 const down = (deltaTop, target) => {
   let swapIndex = 0;
   let addUpH = target.clientHeight;
@@ -2790,4 +2782,4 @@ class StageCore extends EventEmitter$1 {
   }
 }
 
-export { AbleActionEventType, CONTAINER_HIGHLIGHT_CLASS_NAME, ContainerHighlightType, DEFAULT_ZOOM, DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, GuidesType, HIGHLIGHT_EL_ID_PREFIX, Mode, MouseButton, PAGE_CLASS, RenderType, SELECTED_CLASS, SelectStatus, StageDragResize, StageDragStatus, StageMask, StageRender, ZIndex, addSelectedClassName, calcValueByFontsize, StageCore as default, down, getAbsolutePosition, getBorderWidth, getMarginValue, getMode, getOffset, getScrollParent, getTargetElStyle, isAbsolute, isFixed, isFixedParent, isMoveableButton, isRelative, isStatic, removeSelectedClassName, up };
+export { AbleActionEventType, CONTAINER_HIGHLIGHT_CLASS_NAME, ContainerHighlightType, DEFAULT_ZOOM, DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, GuidesType, HIGHLIGHT_EL_ID_PREFIX, Mode, MouseButton, PAGE_CLASS, RenderType, SELECTED_CLASS, SelectStatus, StageDragResize, StageDragStatus, StageMask, StageRender, ZIndex, addSelectedClassName, StageCore as default, down, getAbsolutePosition, getBorderWidth, getMarginValue, getMode, getOffset, getScrollParent, getTargetElStyle, isAbsolute, isFixed, isFixedParent, isMoveableButton, isRelative, isStatic, removeSelectedClassName, up };

package/dist/tmagic-stage.umd.cjs

@@ -178,14 +178,6 @@
       item.classList.add(`${SELECTED_CLASS}-parents`);
     });
   };
-  const calcValueByFontsize = (doc, value) => {
-    const { fontSize } = doc.documentElement.style;
-    if (fontSize) {
-      const times = globalThis.parseFloat(fontSize) / 100;
-      return Number((value / times).toFixed(2));
-    }
-    return value;
-  };
   const down = (deltaTop, target) => {
     let swapIndex = 0;
     let addUpH = target.clientHeight;
@@ -549,11 +541,11 @@
     getUpdatedElRect(el, parentEl, doc) {
       const offset = this.mode === Mode.SORTABLE ? { left: 0, top: 0 } : { left: el.offsetLeft, top: el.offsetTop };
       const { marginLeft, marginTop } = getMarginValue(el);
-      let left = calcValueByFontsize(doc, offset.left) - marginLeft;
-      let top = calcValueByFontsize(doc, offset.top) - marginTop;
+      let left = utils.calcValueByFontsize(doc, offset.left) - marginLeft;
+      let top = utils.calcValueByFontsize(doc, offset.top) - marginTop;
       const { borderLeftWidth, borderRightWidth, borderTopWidth, borderBottomWidth } = getBorderWidth(el);
-      const width = calcValueByFontsize(doc, el.clientWidth + borderLeftWidth + borderRightWidth);
-      const height = calcValueByFontsize(doc, el.clientHeight + borderTopWidth + borderBottomWidth);
+      const width = utils.calcValueByFontsize(doc, el.clientWidth + borderLeftWidth + borderRightWidth);
+      const height = utils.calcValueByFontsize(doc, el.clientHeight + borderTopWidth + borderBottomWidth);
       let shadowEl = this.getShadowEl();
       const shadowEls = this.getShadowEls();
       if (shadowEls.length) {
@@ -566,8 +558,8 @@
         const frame = this.getFrame(shadowEl);
         const [translateX, translateY] = frame?.properties.transform.translate.value;
         const { left: parentLeft, top: parentTop } = getOffset(parentEl);
-        left = calcValueByFontsize(doc, targetShadowElOffsetLeft) + parseFloat(translateX) - calcValueByFontsize(doc, parentLeft);
-        top = calcValueByFontsize(doc, targetShadowElOffsetTop) + parseFloat(translateY) - calcValueByFontsize(doc, parentTop);
+        left = utils.calcValueByFontsize(doc, targetShadowElOffsetLeft) + parseFloat(translateX) - utils.calcValueByFontsize(doc, parentLeft);
+        top = utils.calcValueByFontsize(doc, targetShadowElOffsetTop) + parseFloat(translateY) - utils.calcValueByFontsize(doc, parentTop);
       }
       return { width, height, left, top };
     }
@@ -2807,7 +2799,6 @@
   exports.StageRender = StageRender;
   exports.ZIndex = ZIndex;
   exports.addSelectedClassName = addSelectedClassName;
-  exports.calcValueByFontsize = calcValueByFontsize;
   exports.default = StageCore;
   exports.down = down;
   exports.getAbsolutePosition = getAbsolutePosition;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.3",
+  "version": "1.4.5",
   "name": "@tmagic/stage",
   "type": "module",
   "sideEffects": [
@@ -26,27 +26,30 @@
   },
   "dependencies": {
     "@scena/guides": "^0.29.2",
-    "@tmagic/core": "1.4.3",
-    "@tmagic/schema": "1.4.3",
-    "@tmagic/utils": "1.4.3",
     "events": "^3.3.0",
     "keycon": "^1.4.0",
     "lodash-es": "^4.17.21",
-    "moveable": "^0.51.1",
+    "moveable": "^0.53.0",
     "moveable-helper": "^0.4.0"
   },
+  "peerDependencies": {
+    "@tmagic/core": "1.4.5",
+    "@tmagic/schema": "1.4.5",
+    "@tmagic/utils": "1.4.5"
+  },
   "devDependencies": {
     "@types/events": "^3.0.0",
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^18.19.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.35.1",
+    "sass": "^1.77.0",
     "typescript": "^5.4.2",
-    "vite": "^5.1.6"
+    "vite": "^5.2.11"
   },
   "scripts": {
     "build": "npm run build:type && vite build",
     "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json",
-    "clear:type": "rimraf ./types"
+    "clear:type": "rimraf ./types",
+    "check:type": "tsc --noEmit --project tsconfig.build.json"
   }
 }

package/src/DragResizeHelper.ts

@@ -32,10 +32,12 @@ import type {
 } from 'moveable';
 import MoveableHelper from 'moveable-helper';
 
+import { calcValueByFontsize } from '@tmagic/utils';
+
 import { DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, Mode, ZIndex } from './const';
 import TargetShadow from './TargetShadow';
 import type { DragResizeHelperConfig, Rect, TargetElement } from './types';
-import { calcValueByFontsize, getAbsolutePosition, getBorderWidth, getMarginValue, getOffset } from './util';
+import { getAbsolutePosition, getBorderWidth, getMarginValue, getOffset } from './util';
 
 /**
  * 拖拽/改变大小等操作发生时，moveable会抛出各种状态事件，DragResizeHelper负责响应这些事件，对目标节点target和拖拽节点targetShadow进行修改；

package/src/util.ts

@@ -161,17 +161,6 @@ export const addSelectedClassName = (el: Element, doc: Document) => {
   });
 };
 
-export const calcValueByFontsize = (doc: Document, value: number) => {
-  const { fontSize } = doc.documentElement.style;
-
-  if (fontSize) {
-    const times = globalThis.parseFloat(fontSize) / 100;
-    return Number((value / times).toFixed(2));
-  }
-
-  return value;
-};
-
 /**
  * 下移组件位置
  * @param {number} deltaTop 偏移量

package/types/util.d.ts

@@ -15,7 +15,6 @@ export declare const getMode: (el: Element) => Mode;
 export declare const getScrollParent: (element: HTMLElement, includeHidden?: boolean) => HTMLElement | null;
 export declare const removeSelectedClassName: (doc: Document) => void;
 export declare const addSelectedClassName: (el: Element, doc: Document) => void;
-export declare const calcValueByFontsize: (doc: Document, value: number) => number;
 /**
  * 下移组件位置
  * @param {number} deltaTop 偏移量