@idraw/util 0.4.3 → 1.0.0-alpha.1

package/dist/esm/view/view-content.d.ts

@@ -1,4 +1,4 @@
-import type { Data, ViewSizeInfo, ViewScaleInfo, PointSize } from '@idraw/types';
+import type { Data, ViewSizeInfo, ViewScaleInfo, Point } from '@idraw/types';
 interface ViewCenterContentResult {
     offsetX: number;
     offsetY: number;
@@ -10,5 +10,5 @@ export declare function calcViewCenterContent(data: Data, opts: {
 export declare function calcViewCenter(opts?: {
     viewScaleInfo: ViewScaleInfo;
     viewSizeInfo: ViewSizeInfo;
-}): PointSize;
+}): Point;
 export {};

package/dist/esm/view/view-content.js

@@ -1,46 +1,46 @@
-import { rotateElementVertexes } from './rotate';
+import { rotateMaterialVertexes } from './rotate';
 import { formatNumber } from '../tool/number';
 import { is } from './is';
 export function calcViewCenterContent(data, opts) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     let offsetX = 0;
     let offsetY = 0;
     let scale = 1;
-    let contentX = ((_b = (_a = data === null || data === void 0 ? void 0 : data.elements) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.x) || 0;
-    let contentY = ((_d = (_c = data === null || data === void 0 ? void 0 : data.elements) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.y) || 0;
-    let contentW = ((_f = (_e = data === null || data === void 0 ? void 0 : data.elements) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.w) || 0;
-    let contentH = ((_h = (_g = data === null || data === void 0 ? void 0 : data.elements) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.h) || 0;
+    let contentX = ((_b = (_a = data === null || data === void 0 ? void 0 : data.materials) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.x) || 0;
+    let contentY = ((_d = (_c = data === null || data === void 0 ? void 0 : data.materials) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.y) || 0;
+    let contentW = ((_f = (_e = data === null || data === void 0 ? void 0 : data.materials) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.width) || 0;
+    let contentH = ((_h = (_g = data === null || data === void 0 ? void 0 : data.materials) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.height) || 0;
     const { width, height } = opts.viewSizeInfo;
-    if (is.layout(data.layout) && ((_k = (_j = data.layout) === null || _j === void 0 ? void 0 : _j.detail) === null || _k === void 0 ? void 0 : _k.overflow) === 'hidden') {
+    if (is.layout(data.layout) && ((_j = data.layout) === null || _j === void 0 ? void 0 : _j.overflow) === 'hidden') {
         contentX = data.layout.x;
         contentY = data.layout.y;
-        contentW = data.layout.w || 0;
-        contentH = data.layout.h || 0;
+        contentW = data.layout.width || 0;
+        contentH = data.layout.height || 0;
     }
     else {
-        data.elements.forEach((elem) => {
-            const elemSize = {
-                x: elem.x,
-                y: elem.y,
-                w: elem.w,
-                h: elem.h,
-                angle: elem.angle
+        data.materials.forEach((mtrl) => {
+            const mtrlSize = {
+                x: mtrl.x,
+                y: mtrl.y,
+                width: mtrl.width,
+                height: mtrl.height,
+                angle: mtrl.angle,
             };
-            if (elemSize.angle && (elemSize.angle > 0 || elemSize.angle < 0)) {
-                const ves = rotateElementVertexes(elemSize);
+            if (mtrlSize.angle && (mtrlSize.angle > 0 || mtrlSize.angle < 0)) {
+                const ves = rotateMaterialVertexes(mtrlSize);
                 if (ves.length === 4) {
                     const xList = [ves[0].x, ves[1].x, ves[2].x, ves[3].x];
                     const yList = [ves[0].y, ves[1].y, ves[2].y, ves[3].y];
-                    elemSize.x = Math.min(...xList);
-                    elemSize.y = Math.min(...yList);
-                    elemSize.w = Math.abs(Math.max(...xList) - Math.min(...xList));
-                    elemSize.h = Math.abs(Math.max(...yList) - Math.min(...yList));
+                    mtrlSize.x = Math.min(...xList);
+                    mtrlSize.y = Math.min(...yList);
+                    mtrlSize.width = Math.abs(Math.max(...xList) - Math.min(...xList));
+                    mtrlSize.height = Math.abs(Math.max(...yList) - Math.min(...yList));
                 }
             }
-            const areaStartX = Math.min(elemSize.x, contentX);
-            const areaStartY = Math.min(elemSize.y, contentY);
-            const areaEndX = Math.max(elemSize.x + elemSize.w, contentX + contentW);
-            const areaEndY = Math.max(elemSize.y + elemSize.h, contentY + contentH);
+            const areaStartX = Math.min(mtrlSize.x, contentX);
+            const areaStartY = Math.min(mtrlSize.y, contentY);
+            const areaEndX = Math.max(mtrlSize.x + mtrlSize.width, contentX + contentW);
+            const areaEndY = Math.max(mtrlSize.y + mtrlSize.height, contentY + contentH);
             contentX = areaStartX;
             contentY = areaStartY;
             contentW = Math.abs(areaEndX - areaStartX);
@@ -48,18 +48,18 @@ export function calcViewCenterContent(data, opts) {
         });
     }
     if ((data === null || data === void 0 ? void 0 : data.layout) && is.layout(data.layout)) {
-        const { x, y, w, h } = data.layout;
-        if (((_m = (_l = data.layout) === null || _l === void 0 ? void 0 : _l.detail) === null || _m === void 0 ? void 0 : _m.overflow) === 'hidden') {
+        const { x, y, width, height } = data.layout;
+        if (((_k = data.layout) === null || _k === void 0 ? void 0 : _k.overflow) === 'hidden') {
             contentX = Math.min(contentX, x);
             contentY = Math.min(contentY, y);
-            contentW = Math.min(contentW, w);
-            contentH = Math.min(contentH, h);
+            contentW = Math.min(contentW, width);
+            contentH = Math.min(contentH, height);
         }
         else {
             contentX = Math.min(contentX, x);
             contentY = Math.min(contentY, y);
-            contentW = Math.max(contentW, w);
-            contentH = Math.max(contentH, h);
+            contentW = Math.max(contentW, width);
+            contentH = Math.max(contentH, height);
         }
     }
     if (contentW > 0 && contentH > 0) {
@@ -72,7 +72,7 @@ export function calcViewCenterContent(data, opts) {
     const result = {
         offsetX: formatNumber(offsetX, { decimalPlaces: 0 }),
         offsetY: formatNumber(offsetY, { decimalPlaces: 0 }),
-        scale
+        scale,
     };
     return result;
 }
@@ -88,7 +88,7 @@ export function calcViewCenter(opts) {
     }
     const p = {
         x,
-        y
+        y,
     };
     return p;
 }