@idraw/util 0.4.0-beta.40 → 0.4.0-beta.42

package/dist/esm/{lib → view}/data.js

@@ -9,7 +9,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { createAssetId, createUUID, isAssetId } from './uuid';
+import { createAssetId, createUUID, isAssetId } from '../tool/uuid';
 export function deepClone(target) {
     function _clone(t) {
         const type = is(t);
@@ -73,7 +73,7 @@ export function sortDataAsserts(data, opts) {
         elems.forEach((elem) => {
             if (elem.type === 'image' && elem.detail.src) {
                 const src = elem.detail.src;
-                const assetUUID = createAssetId(src);
+                const assetUUID = createAssetId(src, elem.uuid);
                 if (!assets[assetUUID]) {
                     assets[assetUUID] = {
                         type: 'image',
@@ -84,7 +84,7 @@ export function sortDataAsserts(data, opts) {
             }
             else if (elem.type === 'svg') {
                 const svg = elem.detail.svg;
-                const assetUUID = createAssetId(svg);
+                const assetUUID = createAssetId(svg, elem.uuid);
                 if (!assets[assetUUID]) {
                     assets[assetUUID] = {
                         type: 'svg',
@@ -95,7 +95,7 @@ export function sortDataAsserts(data, opts) {
             }
             else if (elem.type === 'html') {
                 const html = elem.detail.html;
-                const assetUUID = createAssetId(html);
+                const assetUUID = createAssetId(html, elem.uuid);
                 if (!assets[assetUUID]) {
                     assets[assetUUID] = {
                         type: 'html',
@@ -136,7 +136,7 @@ export function filterCompactData(data, opts) {
                     };
                 }
                 else if (!assets[src]) {
-                    const assetUUID = createAssetId(src);
+                    const assetUUID = createAssetId(src, elem.uuid);
                     if (!assets[assetUUID]) {
                         assets[assetUUID] = {
                             type: 'image',
@@ -155,7 +155,7 @@ export function filterCompactData(data, opts) {
                     };
                 }
                 else if (!assets[svg]) {
-                    const assetUUID = createAssetId(svg);
+                    const assetUUID = createAssetId(svg, elem.uuid);
                     if (!assets[assetUUID]) {
                         assets[assetUUID] = {
                             type: 'svg',
@@ -174,7 +174,7 @@ export function filterCompactData(data, opts) {
                     };
                 }
                 else if (!assets[html]) {
-                    const assetUUID = createAssetId(html);
+                    const assetUUID = createAssetId(html, elem.uuid);
                     if (!assets[assetUUID]) {
                         assets[assetUUID] = {
                             type: 'html',

package/dist/esm/{lib → view}/element.js

@@ -1,5 +1,5 @@
 import { limitAngle, rotateElementVertexes } from './rotate';
-import { isAssetId, createAssetId } from './uuid';
+import { isAssetId, createAssetId } from '../tool/uuid';
 function getGroupUUIDs(elements, index) {
     var _a;
     const uuids = [];
@@ -168,7 +168,11 @@ export function calcElementsContextSize(elements, opts) {
     return ctxSize;
 }
 export function calcElementsViewInfo(elements, prevViewSize, options) {
-    const contextSize = calcElementsContextSize(elements, { viewWidth: prevViewSize.width, viewHeight: prevViewSize.height, extend: options === null || options === void 0 ? void 0 : options.extend });
+    const contextSize = calcElementsContextSize(elements, {
+        viewWidth: prevViewSize.width,
+        viewHeight: prevViewSize.height,
+        extend: options === null || options === void 0 ? void 0 : options.extend
+    });
     if ((options === null || options === void 0 ? void 0 : options.extend) === true) {
         contextSize.contextWidth = Math.max(contextSize.contextWidth, prevViewSize.contextWidth);
         contextSize.contextHeight = Math.max(contextSize.contextHeight, prevViewSize.contextHeight);
@@ -327,7 +331,7 @@ export function filterElementAsset(element) {
         resource = element.detail.html;
     }
     if (typeof resource === 'string' && !isAssetId(resource)) {
-        assetId = createAssetId(resource);
+        assetId = createAssetId(resource, element.uuid);
         assetItem = {
             type: element.type,
             value: resource
@@ -367,7 +371,7 @@ export function findElementFromListByPosition(position, list) {
     for (let i = 0; i < position.length; i++) {
         const pos = position[i];
         const item = tempList[pos];
-        if (i < position.length - 1 && item.type === 'group') {
+        if (i < position.length - 1 && (item === null || item === void 0 ? void 0 : item.type) === 'group') {
             tempList = item.detail.children;
         }
         else if (i === position.length - 1) {
@@ -459,5 +463,9 @@ export function getElementPositionMapFromList(uuids, elements) {
     return positionMap;
 }
 export function isSameElementSize(elem1, elem2) {
-    return (elem1.x === elem2.x && elem1.y === elem2.y && elem1.h === elem2.h && elem1.w === elem2.w && limitAngle(elem1.angle || 0) === limitAngle(elem2.angle || 0));
+    return (elem1.x === elem2.x &&
+        elem1.y === elem2.y &&
+        elem1.h === elem2.h &&
+        elem1.w === elem2.w &&
+        limitAngle(elem1.angle || 0) === limitAngle(elem2.angle || 0));
 }

package/dist/esm/{lib → view}/flat.js

@@ -13,7 +13,8 @@ import { calcElementVertexesInGroup } from './vertex';
 import { limitAngle, parseAngleToRadian, calcElementCenterFromVertexes, rotatePoint } from './rotate';
 function flatElementSize(elemSize, opts) {
     const { groupQueue } = opts;
-    let { x, y, w, h, angle = 0 } = elemSize;
+    let { x, y } = elemSize;
+    const { w, h, angle = 0 } = elemSize;
     let totalAngle = 0;
     groupQueue.forEach((group) => {
         x += group.x;

package/dist/esm/{lib → view}/group.js

@@ -1,6 +1,6 @@
 import { findElementFromListByPosition, calcElementListSize } from './element';
 import { deleteElementInListByPosition, insertElementToListByPosition } from './handle-element';
-import { createUUID } from './uuid';
+import { createUUID } from '../tool/uuid';
 export function groupElementsByPosition(list, positions) {
     if (positions.length > 1) {
         let isValidPositions = true;

package/dist/esm/{lib → view}/handle-element.d.ts

@@ -15,5 +15,10 @@ export declare function moveElementPosition(elements: Elements, opts: {
     from: ElementPosition;
     to: ElementPosition;
 };
+export declare function mergeElement<T extends Element<ElementType> = Element<ElementType>>(originElem: T, updateContent: RecursivePartial<T>, opts?: {
+    strict?: boolean;
+}): T;
 export declare function updateElementInList(uuid: string, updateContent: RecursivePartial<Element<ElementType>>, elements: Element[]): Element | null;
-export declare function updateElementInListByPosition(position: ElementPosition, updateContent: RecursivePartial<Element<ElementType>>, elements: Element[]): Element | null;
+export declare function updateElementInListByPosition(position: ElementPosition, updateContent: RecursivePartial<Element<ElementType>>, elements: Element[], opts?: {
+    strict?: boolean;
+}): Element | null;

package/dist/esm/{lib → view}/handle-element.js

@@ -1,6 +1,7 @@
-import { createUUID } from './uuid';
+import { createUUID } from '../tool/uuid';
 import { defaultText, getDefaultElementRectDetail, getDefaultElementCircleDetail, getDefaultElementTextDetail, getDefaultElementSVGDetail, getDefaultElementImageDetail, getDefaultElementGroupDetail } from './config';
-import { istype } from './istype';
+import { toFlattenElement } from './modify-record';
+import { set, del } from '../tool/get-set-del';
 import { findElementFromListByPosition, getElementPositionFromList } from './element';
 import { deepResizeGroupElement } from './resize-element';
 const defaultViewWidth = 200;
@@ -67,7 +68,7 @@ export function createElement(type, baseElem, opts) {
     else if (type === 'group') {
         detail = getDefaultElementGroupDetail();
     }
-    const elem = Object.assign(Object.assign(Object.assign({}, elementSize), baseElem), { uuid: createUUID(), type, detail: Object.assign(Object.assign({}, detail), (baseElem.detail || {})) });
+    const elem = Object.assign(Object.assign(Object.assign({ uuid: createUUID() }, elementSize), baseElem), { type, detail: Object.assign(Object.assign({}, detail), (baseElem.detail || {})) });
     return elem;
 }
 export function insertElementToListByPosition(element, position, list) {
@@ -217,35 +218,29 @@ export function moveElementPosition(elements, opts) {
     }
     return { elements, from, to };
 }
-function mergeElement(originElem, updateContent) {
-    var _a;
-    const commonKeys = Object.keys(updateContent);
-    for (let i = 0; i < commonKeys.length; i++) {
-        const commonKey = commonKeys[i];
-        if (['x', 'y', 'w', 'h', 'angle', 'name'].includes(commonKey)) {
-            originElem[commonKey] = updateContent[commonKey];
-        }
-        else if (['detail', 'operations'].includes(commonKey)) {
-            if (istype.json(updateContent[commonKey])) {
-                if (!(originElem === null || originElem === void 0 ? void 0 : originElem.hasOwnProperty(commonKey))) {
-                    originElem[commonKey] = {};
-                }
-                if (istype.json(originElem[commonKey])) {
-                    originElem[commonKey] = Object.assign(Object.assign({}, originElem[commonKey]), updateContent[commonKey]);
-                }
+export function mergeElement(originElem, updateContent, opts) {
+    const updatedFlatten = toFlattenElement(updateContent);
+    const ignoreKeys = ['uuid', 'type'];
+    const updatedKeys = Object.keys(updatedFlatten);
+    updatedKeys.forEach((key) => {
+        if (!ignoreKeys.includes(key)) {
+            const value = updatedFlatten[key];
+            del(originElem, key);
+            if (value !== undefined) {
+                set(originElem, key, value);
             }
-            else if (istype.array(updateContent[commonKey])) {
-                if (!(originElem === null || originElem === void 0 ? void 0 : originElem.hasOwnProperty(commonKey))) {
-                    originElem[commonKey] = [];
-                }
-                if (istype.array(originElem[commonKey])) {
-                    (_a = updateContent === null || updateContent === void 0 ? void 0 : updateContent[commonKey]) === null || _a === void 0 ? void 0 : _a.forEach((item, i) => {
-                        originElem[commonKey][i] = item;
-                    });
-                    originElem[commonKey] = [...originElem[commonKey], ...updateContent[commonKey]];
+        }
+    });
+    if ((opts === null || opts === void 0 ? void 0 : opts.strict) === true) {
+        const originFlatten = toFlattenElement(originElem);
+        const originKeys = Object.keys(originFlatten);
+        originKeys.forEach((key) => {
+            if (!ignoreKeys.includes(key)) {
+                if (!updatedKeys.includes(key)) {
+                    del(originElem, key);
                 }
             }
-        }
+        });
     }
     return originElem;
 }
@@ -273,7 +268,7 @@ export function updateElementInList(uuid, updateContent, elements) {
     }
     return targetElement;
 }
-export function updateElementInListByPosition(position, updateContent, elements) {
+export function updateElementInListByPosition(position, updateContent, elements, opts) {
     var _a;
     const elem = findElementFromListByPosition(position, elements);
     if (elem) {
@@ -285,7 +280,7 @@ export function updateElementInListByPosition(position, updateContent, elements)
                 });
             }
         }
-        mergeElement(elem, updateContent);
+        mergeElement(elem, updateContent, opts);
     }
     return elem;
 }

package/dist/esm/view/handle-global.d.ts

@@ -0,0 +1,4 @@
+import type { RecursivePartial, DataGlobal } from '@idraw/types';
+export declare function mergeGlobal(originGlobal: DataGlobal, updateContent: RecursivePartial<DataGlobal>, opts?: {
+    strict?: boolean;
+}): DataGlobal;

package/dist/esm/view/handle-global.js

@@ -0,0 +1,28 @@
+import { toFlattenGlobal } from './modify-record';
+import { set, del } from '../tool/get-set-del';
+export function mergeGlobal(originGlobal, updateContent, opts) {
+    const updatedFlatten = toFlattenGlobal(updateContent);
+    const ignoreKeys = [];
+    const updatedKeys = Object.keys(updatedFlatten);
+    updatedKeys.forEach((key) => {
+        if (!ignoreKeys.includes(key)) {
+            const value = updatedFlatten[key];
+            del(originGlobal, key);
+            if (value !== undefined) {
+                set(originGlobal, key, value);
+            }
+        }
+    });
+    if ((opts === null || opts === void 0 ? void 0 : opts.strict) === true) {
+        const originFlatten = toFlattenGlobal(originGlobal);
+        const originKeys = Object.keys(originFlatten);
+        originKeys.forEach((key) => {
+            if (!ignoreKeys.includes(key)) {
+                if (!updatedKeys.includes(key)) {
+                    del(originGlobal, key);
+                }
+            }
+        });
+    }
+    return originGlobal;
+}

package/dist/esm/view/handle-layout.d.ts

@@ -0,0 +1,4 @@
+import type { RecursivePartial, DataLayout } from '@idraw/types';
+export declare function mergeLayout(originLayout: DataLayout, updateContent: RecursivePartial<DataLayout>, opts?: {
+    strict?: boolean;
+}): DataLayout;

package/dist/esm/view/handle-layout.js

@@ -0,0 +1,28 @@
+import { toFlattenLayout } from './modify-record';
+import { set, del } from '../tool/get-set-del';
+export function mergeLayout(originLayout, updateContent, opts) {
+    const updatedFlatten = toFlattenLayout(updateContent);
+    const ignoreKeys = [];
+    const updatedKeys = Object.keys(updatedFlatten);
+    updatedKeys.forEach((key) => {
+        if (!ignoreKeys.includes(key)) {
+            const value = updatedFlatten[key];
+            del(originLayout, key);
+            if (value !== undefined) {
+                set(originLayout, key, value);
+            }
+        }
+    });
+    if ((opts === null || opts === void 0 ? void 0 : opts.strict) === true) {
+        const originFlatten = toFlattenLayout(originLayout);
+        const originKeys = Object.keys(originFlatten);
+        originKeys.forEach((key) => {
+            if (!ignoreKeys.includes(key)) {
+                if (!updatedKeys.includes(key)) {
+                    del(originLayout, key);
+                }
+            }
+        });
+    }
+    return originLayout;
+}

package/dist/esm/{lib → view}/is.js

@@ -1,4 +1,4 @@
-import { isColorStr } from './color';
+import { isColorStr } from '../tool/color';
 function positiveNum(value) {
     return typeof value === 'number' && value >= 0;
 }

package/dist/esm/view/modify-record.d.ts

@@ -0,0 +1,4 @@
+import type { FlattenElement, Element, RecursivePartial, DataLayout, DataGlobal } from '@idraw/types';
+export declare function toFlattenElement(elem: Element | RecursivePartial<Element>): FlattenElement;
+export declare function toFlattenLayout(layout: DataLayout | RecursivePartial<DataLayout>): FlattenElement;
+export declare function toFlattenGlobal(global: DataGlobal | RecursivePartial<DataLayout>): FlattenElement;

package/dist/esm/view/modify-record.js

@@ -0,0 +1,10 @@
+import { flatObject } from '../tool/flat-object';
+export function toFlattenElement(elem) {
+    return flatObject(elem, { ignorePaths: ['detail.children'] });
+}
+export function toFlattenLayout(layout) {
+    return flatObject(layout);
+}
+export function toFlattenGlobal(global) {
+    return flatObject(global);
+}

package/dist/esm/view/position.d.ts

@@ -0,0 +1,15 @@
+import type { ElementPosition } from '@idraw/types';
+export declare function calcResultMovePosition(opts: {
+    from: ElementPosition;
+    to: ElementPosition;
+}): {
+    from: ElementPosition;
+    to: ElementPosition;
+} | null;
+export declare function calcRevertMovePosition(opts: {
+    from: ElementPosition;
+    to: ElementPosition;
+}): {
+    from: ElementPosition;
+    to: ElementPosition;
+} | null;

package/dist/esm/view/position.js

@@ -0,0 +1,79 @@
+export function calcResultMovePosition(opts) {
+    const from = [...opts.from];
+    const to = [...opts.to];
+    if (from.length === 0 || to.length === 0) {
+        return null;
+    }
+    if (from.length <= to.length) {
+        for (let i = 0; i < from.length; i++) {
+            if (to[i] === from[i]) {
+                if (i === from.length - 1) {
+                    return null;
+                }
+                continue;
+            }
+        }
+    }
+    let moveDirection = null;
+    if (from.length >= 1 && to.length >= 1) {
+        if (from.length <= to.length) {
+            if (from.length === 1) {
+                if (from[0] < to[0]) {
+                    moveDirection = 'up-down';
+                }
+            }
+            else {
+                for (let i = 0; i < from.length; i++) {
+                    if (from[i] === to[i]) {
+                        if (from.length === from.length - 1) {
+                            moveDirection = 'up-down';
+                            break;
+                        }
+                    }
+                    else {
+                        break;
+                    }
+                }
+            }
+        }
+        if (from.length >= to.length) {
+            if (to.length === 1) {
+                if (to[0] < from[0]) {
+                    moveDirection = 'down-up';
+                }
+            }
+            else {
+                for (let i = 0; i < to.length; i++) {
+                    if (i === to.length - 1 && to[i] < from[i]) {
+                        moveDirection = 'down-up';
+                    }
+                    if (from[i] === to[i]) {
+                        continue;
+                    }
+                    else {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    const startEffectIndex = from.length - 1;
+    const endEffectIndex = to.length - 1;
+    if (moveDirection === 'up-down' && startEffectIndex >= 0) {
+        to[startEffectIndex] -= 1;
+    }
+    else if (moveDirection === 'down-up' && endEffectIndex >= 0) {
+        from[endEffectIndex] += 1;
+    }
+    return { from, to };
+}
+export function calcRevertMovePosition(opts) {
+    const result = calcResultMovePosition(opts);
+    if (!result) {
+        return result;
+    }
+    return {
+        from: [...result.to],
+        to: [...result.from]
+    };
+}

package/dist/esm/{lib → view}/resize-element.js

@@ -1,4 +1,4 @@
-import { formatNumber } from './number';
+import { formatNumber } from '../tool/number';
 const doNum = (n) => {
     return formatNumber(n, { decimalPlaces: 4 });
 };

package/dist/esm/{lib → view}/view-content.js

@@ -1,5 +1,5 @@
 import { rotateElementVertexes } from './rotate';
-import { formatNumber } from './number';
+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;