@idraw/util 0.4.0-beta.3 → 0.4.0-beta.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/dist/esm/index.d.ts +14 -8
  2. package/dist/esm/index.js +14 -8
  3. package/dist/esm/lib/canvas.d.ts +6 -1
  4. package/dist/esm/lib/canvas.js +42 -19
  5. package/dist/esm/lib/config.d.ts +5 -10
  6. package/dist/esm/lib/config.js +9 -9
  7. package/dist/esm/lib/context2d.d.ts +2 -0
  8. package/dist/esm/lib/context2d.js +14 -0
  9. package/dist/esm/lib/controller.d.ts +5 -1
  10. package/dist/esm/lib/controller.js +142 -0
  11. package/dist/esm/lib/data.d.ts +6 -2
  12. package/dist/esm/lib/data.js +95 -2
  13. package/dist/esm/lib/element.d.ts +1 -0
  14. package/dist/esm/lib/element.js +19 -0
  15. package/dist/esm/lib/event.d.ts +4 -2
  16. package/dist/esm/lib/event.js +31 -11
  17. package/dist/esm/lib/file.d.ts +7 -2
  18. package/dist/esm/lib/file.js +26 -7
  19. package/dist/esm/lib/flat.d.ts +2 -0
  20. package/dist/esm/lib/flat.js +132 -0
  21. package/dist/esm/lib/handle-element.d.ts +6 -1
  22. package/dist/esm/lib/handle-element.js +108 -43
  23. package/dist/esm/lib/html.d.ts +1 -1
  24. package/dist/esm/lib/istype.d.ts +1 -0
  25. package/dist/esm/lib/istype.js +3 -0
  26. package/dist/esm/lib/modify-recorder.d.ts +15 -0
  27. package/dist/esm/lib/modify-recorder.js +177 -0
  28. package/dist/esm/lib/modify.d.ts +6 -0
  29. package/dist/esm/lib/modify.js +99 -0
  30. package/dist/esm/lib/rect.js +9 -9
  31. package/dist/esm/lib/resize-element.d.ts +2 -0
  32. package/dist/esm/lib/resize-element.js +101 -0
  33. package/dist/esm/lib/store.d.ts +6 -5
  34. package/dist/esm/lib/store.js +30 -9
  35. package/dist/esm/lib/text.d.ts +1 -0
  36. package/dist/esm/lib/text.js +4 -0
  37. package/dist/esm/lib/time.d.ts +1 -0
  38. package/dist/esm/lib/time.js +13 -1
  39. package/dist/esm/lib/view-box.js +4 -3
  40. package/dist/esm/lib/view-calc.d.ts +20 -3
  41. package/dist/esm/lib/view-calc.js +171 -3
  42. package/dist/esm/lib/view-content.d.ts +14 -0
  43. package/dist/esm/lib/view-content.js +88 -0
  44. package/dist/esm/lib/view-visible.d.ts +21 -0
  45. package/dist/esm/lib/view-visible.js +93 -0
  46. package/dist/index.global.js +1272 -176
  47. package/dist/index.global.min.js +1 -1
  48. package/package.json +1 -1
@@ -16,6 +16,7 @@ export declare function getElemenetsAssetIds(elements: Elements): string[];
16
16
  export declare function findElementFromList(uuid: string, list: Element<ElementType>[]): Element<ElementType> | null;
17
17
  export declare function findElementsFromList(uuids: string[], list: Element<ElementType>[]): Element<ElementType>[];
18
18
  export declare function getGroupQueueFromList(uuid: string, elements: Element<ElementType>[]): Element<'group'>[];
19
+ export declare function getGroupQueueByElementPosition(elements: Element<ElementType>[], position: ElementPosition): Element<'group'>[] | null;
19
20
  export declare function getElementSize(elem: Element): ElementSize;
20
21
  export declare function mergeElementAsset<T extends Element<LoadElementType>>(element: T, assets: ElementAssets): T;
21
22
  export declare function filterElementAsset<T extends Element<LoadElementType>>(element: T): {
@@ -260,6 +260,25 @@ export function getGroupQueueFromList(uuid, elements) {
260
260
  _scan(uuid, elements);
261
261
  return groupQueue;
262
262
  }
263
+ export function getGroupQueueByElementPosition(elements, position) {
264
+ var _a;
265
+ const groupQueue = [];
266
+ let currentElements = elements;
267
+ if (position.length > 1) {
268
+ for (let i = 0; i < position.length - 1; i++) {
269
+ const index = position[i];
270
+ const group = currentElements[index];
271
+ if ((group === null || group === void 0 ? void 0 : group.type) === 'group' && Array.isArray((_a = group === null || group === void 0 ? void 0 : group.detail) === null || _a === void 0 ? void 0 : _a.children)) {
272
+ groupQueue.push(group);
273
+ currentElements = group.detail.children;
274
+ }
275
+ else {
276
+ return null;
277
+ }
278
+ }
279
+ }
280
+ return groupQueue;
281
+ }
263
282
  export function getElementSize(elem) {
264
283
  const { x, y, w, h, angle } = elem;
265
284
  const size = { x, y, w, h, angle };
@@ -1,9 +1,11 @@
1
1
  import type { UtilEventEmitter } from '@idraw/types';
2
2
  export declare class EventEmitter<T extends Record<string, any>> implements UtilEventEmitter<T> {
3
- private _listeners;
3
+ #private;
4
4
  constructor();
5
5
  on<K extends keyof T>(eventKey: K, callback: (e: T[K]) => void): void;
6
6
  off<K extends keyof T>(eventKey: K, callback: (e: T[K]) => void): void;
7
- trigger<K extends keyof T>(eventKey: K, e: T[K]): boolean;
7
+ trigger<K extends keyof T>(eventKey: K, e?: T[K]): boolean;
8
8
  has<K extends keyof T>(name: K | string): boolean;
9
+ destroy(): void;
10
+ clear(): void;
9
11
  }
@@ -1,20 +1,33 @@
1
+ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
2
+ if (kind === "m") throw new TypeError("Private method is not writable");
3
+ if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
4
+ if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
5
+ return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
6
+ };
7
+ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
8
+ if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
9
+ if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
10
+ return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
11
+ };
12
+ var _EventEmitter_listeners;
1
13
  export class EventEmitter {
2
14
  constructor() {
3
- this._listeners = new Map();
15
+ _EventEmitter_listeners.set(this, void 0);
16
+ __classPrivateFieldSet(this, _EventEmitter_listeners, new Map(), "f");
4
17
  }
5
18
  on(eventKey, callback) {
6
- if (this._listeners.has(eventKey)) {
7
- const callbacks = this._listeners.get(eventKey) || [];
19
+ if (__classPrivateFieldGet(this, _EventEmitter_listeners, "f").has(eventKey)) {
20
+ const callbacks = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(eventKey) || [];
8
21
  callbacks === null || callbacks === void 0 ? void 0 : callbacks.push(callback);
9
- this._listeners.set(eventKey, callbacks);
22
+ __classPrivateFieldGet(this, _EventEmitter_listeners, "f").set(eventKey, callbacks);
10
23
  }
11
24
  else {
12
- this._listeners.set(eventKey, [callback]);
25
+ __classPrivateFieldGet(this, _EventEmitter_listeners, "f").set(eventKey, [callback]);
13
26
  }
14
27
  }
15
28
  off(eventKey, callback) {
16
- if (this._listeners.has(eventKey)) {
17
- const callbacks = this._listeners.get(eventKey);
29
+ if (__classPrivateFieldGet(this, _EventEmitter_listeners, "f").has(eventKey)) {
30
+ const callbacks = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(eventKey);
18
31
  if (Array.isArray(callbacks)) {
19
32
  for (let i = 0; i < (callbacks === null || callbacks === void 0 ? void 0 : callbacks.length); i++) {
20
33
  if (callbacks[i] === callback) {
@@ -23,11 +36,11 @@ export class EventEmitter {
23
36
  }
24
37
  }
25
38
  }
26
- this._listeners.set(eventKey, callbacks || []);
39
+ __classPrivateFieldGet(this, _EventEmitter_listeners, "f").set(eventKey, callbacks || []);
27
40
  }
28
41
  }
29
42
  trigger(eventKey, e) {
30
- const callbacks = this._listeners.get(eventKey);
43
+ const callbacks = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(eventKey);
31
44
  if (Array.isArray(callbacks)) {
32
45
  callbacks.forEach((cb) => {
33
46
  cb(e);
@@ -39,12 +52,19 @@ export class EventEmitter {
39
52
  }
40
53
  }
41
54
  has(name) {
42
- if (this._listeners.has(name)) {
43
- const list = this._listeners.get(name);
55
+ if (__classPrivateFieldGet(this, _EventEmitter_listeners, "f").has(name)) {
56
+ const list = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(name);
44
57
  if (Array.isArray(list) && list.length > 0) {
45
58
  return true;
46
59
  }
47
60
  }
48
61
  return false;
49
62
  }
63
+ destroy() {
64
+ this.clear();
65
+ }
66
+ clear() {
67
+ __classPrivateFieldGet(this, _EventEmitter_listeners, "f").clear();
68
+ }
50
69
  }
70
+ _EventEmitter_listeners = new WeakMap();
@@ -1,14 +1,19 @@
1
1
  type ImageType = 'image/jpeg' | 'image/png';
2
2
  export declare function downloadImageFromCanvas(canvas: HTMLCanvasElement, opts: {
3
- filename: string;
3
+ fileName: string;
4
4
  type: ImageType;
5
5
  }): void;
6
6
  export declare function pickFile(opts: {
7
+ accept?: string;
7
8
  success: (data: {
8
9
  file: File;
9
10
  }) => void;
10
- error?: (err: ErrorEvent) => void;
11
+ error?: (err: Error | any) => void;
11
12
  }): void;
12
13
  export declare function parseFileToBase64(file: File): Promise<string | ArrayBuffer>;
13
14
  export declare function parseFileToText(file: File): Promise<string | ArrayBuffer>;
15
+ export declare function parseTextToBlobURL(text: string): string;
16
+ export declare function downloadFileFromText(text: string, opts: {
17
+ fileName: string;
18
+ }): void;
14
19
  export {};
@@ -1,17 +1,19 @@
1
1
  export function downloadImageFromCanvas(canvas, opts) {
2
- const { filename, type = 'image/jpeg' } = opts;
2
+ const { fileName, type = 'image/jpeg' } = opts;
3
3
  const stream = canvas.toDataURL(type);
4
- const downloadLink = document.createElement('a');
4
+ let downloadLink = document.createElement('a');
5
5
  downloadLink.href = stream;
6
- downloadLink.download = filename;
7
- const downloadClickEvent = document.createEvent('MouseEvents');
8
- downloadClickEvent.initEvent('click', true, false);
9
- downloadLink.dispatchEvent(downloadClickEvent);
6
+ downloadLink.download = fileName;
7
+ downloadLink.click();
8
+ downloadLink = null;
10
9
  }
11
10
  export function pickFile(opts) {
12
- const { success, error } = opts;
11
+ const { accept, success, error } = opts;
13
12
  let input = document.createElement('input');
14
13
  input.type = 'file';
14
+ if (accept) {
15
+ input.accept = accept;
16
+ }
15
17
  input.addEventListener('change', function () {
16
18
  var _a;
17
19
  const file = (_a = input.files) === null || _a === void 0 ? void 0 : _a[0];
@@ -64,3 +66,20 @@ export function parseFileToText(file) {
64
66
  reader.readAsText(file);
65
67
  });
66
68
  }
69
+ export function parseTextToBlobURL(text) {
70
+ const bytes = new TextEncoder().encode(text);
71
+ const blob = new Blob([bytes], {
72
+ type: 'text/plain;charset=utf-8'
73
+ });
74
+ const blobURL = window.URL.createObjectURL(blob);
75
+ return blobURL;
76
+ }
77
+ export function downloadFileFromText(text, opts) {
78
+ const { fileName } = opts;
79
+ const blobURL = parseTextToBlobURL(text);
80
+ let downloadLink = document.createElement('a');
81
+ downloadLink.href = blobURL;
82
+ downloadLink.download = fileName;
83
+ downloadLink.click();
84
+ downloadLink = null;
85
+ }
@@ -0,0 +1,2 @@
1
+ import type { Elements } from '@idraw/types';
2
+ export declare function flatElementList(list: Elements): Elements;
@@ -0,0 +1,132 @@
1
+ var __rest = (this && this.__rest) || function (s, e) {
2
+ var t = {};
3
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
4
+ t[p] = s[p];
5
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
6
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
7
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
8
+ t[p[i]] = s[p[i]];
9
+ }
10
+ return t;
11
+ };
12
+ import { calcElementVertexesInGroup } from './vertex';
13
+ import { limitAngle, parseAngleToRadian, calcElementCenterFromVertexes, rotatePoint } from './rotate';
14
+ function flatElementSize(elemSize, opts) {
15
+ const { groupQueue } = opts;
16
+ let { x, y, w, h, angle = 0 } = elemSize;
17
+ let totalAngle = 0;
18
+ groupQueue.forEach((group) => {
19
+ x += group.x;
20
+ y += group.y;
21
+ totalAngle += group.angle || 0;
22
+ });
23
+ totalAngle = limitAngle(totalAngle);
24
+ if (totalAngle === 0) {
25
+ return {
26
+ x,
27
+ y,
28
+ w,
29
+ h,
30
+ angle
31
+ };
32
+ }
33
+ totalAngle += elemSize.angle || 0;
34
+ totalAngle = limitAngle(totalAngle);
35
+ const vertexes = calcElementVertexesInGroup(elemSize, { groupQueue });
36
+ const center = calcElementCenterFromVertexes(vertexes);
37
+ const start = rotatePoint(center, vertexes[0], parseAngleToRadian(0 - totalAngle));
38
+ x = start.x;
39
+ y = start.y;
40
+ return {
41
+ x,
42
+ y,
43
+ w,
44
+ h,
45
+ angle: totalAngle
46
+ };
47
+ }
48
+ function isValidElement(elem) {
49
+ var _a;
50
+ if (['rect', 'circle'].includes(elem.type)) {
51
+ const detail = elem.detail;
52
+ if (!detail.background && !detail.borderWidth) {
53
+ return false;
54
+ }
55
+ if (detail.background === 'transparent' && !detail.borderWidth) {
56
+ return false;
57
+ }
58
+ }
59
+ if (['group'].includes(elem.type)) {
60
+ const detail = elem.detail || {};
61
+ const { children } = detail;
62
+ if (!(children.length > 0) && !detail.background && !detail.borderWidth) {
63
+ return false;
64
+ }
65
+ if (!(children.length > 0) && detail.background === 'transparent' && !detail.borderWidth) {
66
+ return false;
67
+ }
68
+ }
69
+ if (elem.type === 'text') {
70
+ if (!elem.detail.text) {
71
+ return false;
72
+ }
73
+ }
74
+ if (elem.type === 'image') {
75
+ if (!elem.detail.src) {
76
+ return false;
77
+ }
78
+ }
79
+ if (elem.type === 'html') {
80
+ if (!elem.detail.html) {
81
+ return false;
82
+ }
83
+ }
84
+ if (elem.type === 'svg') {
85
+ if (!elem.detail.svg) {
86
+ return false;
87
+ }
88
+ }
89
+ if (elem.type === 'path') {
90
+ const detail = elem.detail;
91
+ if (!(((_a = detail === null || detail === void 0 ? void 0 : detail.commands) === null || _a === void 0 ? void 0 : _a.length) > 0)) {
92
+ return false;
93
+ }
94
+ }
95
+ return true;
96
+ }
97
+ export function flatElementList(list) {
98
+ const elemeList = [];
99
+ const currentGroupQueue = [];
100
+ const _resetElemSize = (elem) => {
101
+ if (!isValidElement(elem)) {
102
+ return;
103
+ }
104
+ const newSize = flatElementSize(elem, { groupQueue: currentGroupQueue });
105
+ const resizeElem = Object.assign(Object.assign({}, elem), newSize);
106
+ elemeList.push(resizeElem);
107
+ };
108
+ const _walk = (elem) => {
109
+ var _a;
110
+ if (((_a = elem === null || elem === void 0 ? void 0 : elem.operations) === null || _a === void 0 ? void 0 : _a.invisible) === true) {
111
+ return;
112
+ }
113
+ if (elem.type === 'group') {
114
+ const { detail } = elem;
115
+ const { children } = detail, restDetail = __rest(detail, ["children"]);
116
+ _resetElemSize(Object.assign(Object.assign({}, elem), { detail: Object.assign(Object.assign({}, restDetail), { children: [] }) }));
117
+ currentGroupQueue.push(elem);
118
+ children.forEach((child) => {
119
+ _walk(child);
120
+ });
121
+ currentGroupQueue.pop();
122
+ }
123
+ else {
124
+ _resetElemSize(elem);
125
+ }
126
+ };
127
+ for (let i = 0; i < list.length; i++) {
128
+ const elem = list[i];
129
+ _walk(elem);
130
+ }
131
+ return elemeList;
132
+ }
@@ -10,5 +10,10 @@ export declare function deleteElementInList(uuid: string, list: Element[]): bool
10
10
  export declare function moveElementPosition(elements: Elements, opts: {
11
11
  from: ElementPosition;
12
12
  to: ElementPosition;
13
- }): Elements;
13
+ }): {
14
+ elements: Elements;
15
+ from: ElementPosition;
16
+ to: ElementPosition;
17
+ };
14
18
  export declare function updateElementInList(uuid: string, updateContent: RecursivePartial<Element<ElementType>>, elements: Element[]): Element | null;
19
+ export declare function updateElementInListByPosition(position: ElementPosition, updateContent: RecursivePartial<Element<ElementType>>, elements: Element[]): Element | null;
@@ -1,10 +1,10 @@
1
1
  import { createUUID } from './uuid';
2
- import { getDefaultElementDetailConfig, getDefaultElementRectDetail, getDefaultElementCircleDetail, getDefaultElementTextDetail, getDefaultElementSVGDetail, getDefaultElementImageDetail, getDefaultElementGroupDetail } from './config';
2
+ import { defaultText, getDefaultElementRectDetail, getDefaultElementCircleDetail, getDefaultElementTextDetail, getDefaultElementSVGDetail, getDefaultElementImageDetail, getDefaultElementGroupDetail } from './config';
3
3
  import { istype } from './istype';
4
4
  import { findElementFromListByPosition, getElementPositionFromList } from './element';
5
+ import { deepResizeGroupElement } from './resize-element';
5
6
  const defaultViewWidth = 200;
6
7
  const defaultViewHeight = 200;
7
- const defaultDetail = getDefaultElementDetailConfig();
8
8
  function createElementSize(type, opts) {
9
9
  let x = 0;
10
10
  let y = 0;
@@ -14,29 +14,26 @@ function createElementSize(type, opts) {
14
14
  const { viewScaleInfo, viewSizeInfo } = opts;
15
15
  const { scale, offsetLeft, offsetTop } = viewScaleInfo;
16
16
  const { width, height } = viewSizeInfo;
17
- if (type === 'text') {
18
- const textDetail = getDefaultElementTextDetail();
19
- w = defaultDetail.fontSize * scale * textDetail.text.length;
20
- h = defaultDetail.fontSize * scale * 2;
17
+ const limitViewWidth = width / 4;
18
+ const limitViewHeight = height / 4;
19
+ if (defaultViewWidth >= limitViewWidth) {
20
+ w = limitViewWidth / scale;
21
21
  }
22
22
  else {
23
- const limitViewWidth = width / 4;
24
- const limitViewHeight = height / 4;
25
- if (defaultViewWidth >= limitViewWidth) {
26
- w = limitViewWidth / scale;
27
- }
28
- else {
29
- w = defaultViewWidth / scale;
30
- }
31
- if (defaultViewHeight >= limitViewHeight) {
32
- h = limitViewHeight / scale;
33
- }
34
- else {
35
- h = defaultViewHeight / scale;
36
- }
37
- if (['circle', 'svg', 'image'].includes(type)) {
38
- w = h = Math.max(w, h);
39
- }
23
+ w = defaultViewWidth / scale;
24
+ }
25
+ if (defaultViewHeight >= limitViewHeight) {
26
+ h = limitViewHeight / scale;
27
+ }
28
+ else {
29
+ h = defaultViewHeight / scale;
30
+ }
31
+ if (['circle', 'svg', 'image'].includes(type)) {
32
+ w = h = Math.max(w, h);
33
+ }
34
+ else if (type === 'text') {
35
+ const fontSize = w / defaultText.length;
36
+ h = fontSize * 2;
40
37
  }
41
38
  x = (0 - offsetLeft + width / 2 - (w * scale) / 2) / scale;
42
39
  y = (0 - offsetTop + height / 2 - (h * scale) / 2) / scale;
@@ -50,18 +47,16 @@ function createElementSize(type, opts) {
50
47
  return elemSize;
51
48
  }
52
49
  export function createElement(type, baseElem, opts) {
53
- const elemSize = createElementSize(type, opts);
50
+ const elementSize = createElementSize(type, opts);
54
51
  let detail = {};
55
52
  if (type === 'rect') {
56
53
  detail = getDefaultElementRectDetail();
57
54
  }
58
55
  else if (type === 'circle') {
59
- detail = getDefaultElementCircleDetail({
60
- radius: elemSize.w
61
- });
56
+ detail = getDefaultElementCircleDetail();
62
57
  }
63
58
  else if (type === 'text') {
64
- detail = getDefaultElementTextDetail(opts);
59
+ detail = getDefaultElementTextDetail(elementSize);
65
60
  }
66
61
  else if (type === 'svg') {
67
62
  detail = getDefaultElementSVGDetail();
@@ -72,7 +67,7 @@ export function createElement(type, baseElem, opts) {
72
67
  else if (type === 'group') {
73
68
  detail = getDefaultElementGroupDetail();
74
69
  }
75
- const elem = Object.assign(Object.assign(Object.assign({}, elemSize), baseElem), { uuid: createUUID(), type, detail: Object.assign(Object.assign({}, detail), (baseElem.detail || {})) });
70
+ const elem = Object.assign(Object.assign(Object.assign({}, elementSize), baseElem), { uuid: createUUID(), type, detail: Object.assign(Object.assign({}, detail), (baseElem.detail || {})) });
76
71
  return elem;
77
72
  }
78
73
  export function insertElementToListByPosition(element, position, list) {
@@ -134,15 +129,16 @@ export function deleteElementInList(uuid, list) {
134
129
  return deleteElementInListByPosition(position, list);
135
130
  }
136
131
  export function moveElementPosition(elements, opts) {
137
- const { from, to } = opts;
132
+ const from = [...opts.from];
133
+ const to = [...opts.to];
138
134
  if (from.length === 0 || to.length === 0) {
139
- return elements;
135
+ return { elements, from, to };
140
136
  }
141
137
  if (from.length <= to.length) {
142
138
  for (let i = 0; i < from.length; i++) {
143
139
  if (to[i] === from[i]) {
144
140
  if (i === from.length - 1) {
145
- return elements;
141
+ return { elements, from, to };
146
142
  }
147
143
  continue;
148
144
  }
@@ -152,19 +148,64 @@ export function moveElementPosition(elements, opts) {
152
148
  if (target) {
153
149
  const insterResult = insertElementToListByPosition(target, to, elements);
154
150
  if (!insterResult) {
155
- return elements;
151
+ return { elements, from, to };
156
152
  }
157
153
  let trimDeletePosIndex = -1;
158
154
  const trimDeletePosAction = 'down';
159
- for (let i = 0; i < from.length; i++) {
160
- if (!(to[i] >= 0)) {
161
- break;
155
+ let isEffectToIndex = false;
156
+ if (from.length >= 1 && to.length >= 1) {
157
+ if (from.length <= to.length) {
158
+ if (from.length === 1) {
159
+ if (from[0] < to[0]) {
160
+ isEffectToIndex = true;
161
+ }
162
+ }
163
+ else {
164
+ for (let i = 0; i < from.length; i++) {
165
+ if (from[i] === to[i]) {
166
+ if (from.length === from.length - 1) {
167
+ isEffectToIndex = true;
168
+ break;
169
+ }
170
+ }
171
+ else {
172
+ break;
173
+ }
174
+ }
175
+ }
162
176
  }
163
- if (to[i] === from[i]) {
164
- continue;
177
+ if (from.length >= to.length) {
178
+ if (to.length === 1) {
179
+ if (to[0] < from[0]) {
180
+ isEffectToIndex = true;
181
+ }
182
+ }
183
+ else {
184
+ for (let i = 0; i < to.length; i++) {
185
+ if (i === to.length - 1 && to[i] < from[i]) {
186
+ isEffectToIndex = true;
187
+ }
188
+ if (from[i] === to[i]) {
189
+ continue;
190
+ }
191
+ else {
192
+ break;
193
+ }
194
+ }
195
+ }
165
196
  }
166
- if (to[i] < from[i] && i == to.length - 1) {
167
- trimDeletePosIndex = i;
197
+ }
198
+ if (isEffectToIndex === true) {
199
+ for (let i = 0; i < from.length; i++) {
200
+ if (!(to[i] >= 0)) {
201
+ break;
202
+ }
203
+ if (to[i] === from[i]) {
204
+ continue;
205
+ }
206
+ if (to[i] < from[i] && i == to.length - 1) {
207
+ trimDeletePosIndex = i;
208
+ }
168
209
  }
169
210
  }
170
211
  if (trimDeletePosIndex >= 0) {
@@ -174,7 +215,7 @@ export function moveElementPosition(elements, opts) {
174
215
  }
175
216
  deleteElementInListByPosition(from, elements);
176
217
  }
177
- return elements;
218
+ return { elements, from, to };
178
219
  }
179
220
  function mergeElement(originElem, updateContent) {
180
221
  var _a;
@@ -209,18 +250,42 @@ function mergeElement(originElem, updateContent) {
209
250
  return originElem;
210
251
  }
211
252
  export function updateElementInList(uuid, updateContent, elements) {
212
- var _a;
253
+ var _a, _b;
213
254
  let targetElement = null;
214
255
  for (let i = 0; i < elements.length; i++) {
215
256
  const elem = elements[i];
216
257
  if (elem.uuid === uuid) {
258
+ if (elem.type === 'group' && ((_a = elem.operations) === null || _a === void 0 ? void 0 : _a.deepResize) === true) {
259
+ if ((updateContent.w && updateContent.w > 0) || (updateContent.h && updateContent.h > 0)) {
260
+ deepResizeGroupElement(elem, {
261
+ w: updateContent.w,
262
+ h: updateContent.h
263
+ });
264
+ }
265
+ }
217
266
  mergeElement(elem, updateContent);
218
267
  targetElement = elem;
219
268
  break;
220
269
  }
221
270
  else if (elem.type === 'group') {
222
- targetElement = updateElementInList(uuid, updateContent, ((_a = elem === null || elem === void 0 ? void 0 : elem.detail) === null || _a === void 0 ? void 0 : _a.children) || []);
271
+ targetElement = updateElementInList(uuid, updateContent, ((_b = elem === null || elem === void 0 ? void 0 : elem.detail) === null || _b === void 0 ? void 0 : _b.children) || []);
223
272
  }
224
273
  }
225
274
  return targetElement;
226
275
  }
276
+ export function updateElementInListByPosition(position, updateContent, elements) {
277
+ var _a;
278
+ const elem = findElementFromListByPosition(position, elements);
279
+ if (elem) {
280
+ if (elem.type === 'group' && ((_a = elem.operations) === null || _a === void 0 ? void 0 : _a.deepResize) === true) {
281
+ if ((updateContent.w && updateContent.w > 0) || (updateContent.h && updateContent.h > 0)) {
282
+ deepResizeGroupElement(elem, {
283
+ w: updateContent.w,
284
+ h: updateContent.h
285
+ });
286
+ }
287
+ }
288
+ mergeElement(elem, updateContent);
289
+ }
290
+ return elem;
291
+ }
@@ -1,3 +1,3 @@
1
1
  import { HTMLNode } from '@idraw/types';
2
2
  export declare function parseHTML(html: string): HTMLNode[];
3
- export declare function generateHTML(htmlNodes: HTMLNode[]): HTMLNode;
3
+ export declare function generateHTML(htmlNodes: HTMLNode[]): string;
@@ -4,6 +4,7 @@ export declare const istype: {
4
4
  json(data: any): boolean;
5
5
  function(data: any): boolean;
6
6
  asyncFunction(data: any): boolean;
7
+ boolean(data: any): boolean;
7
8
  string(data: any): boolean;
8
9
  number(data: any): boolean;
9
10
  undefined(data: any): boolean;
@@ -20,6 +20,9 @@ export const istype = {
20
20
  asyncFunction(data) {
21
21
  return parsePrototype(data) === 'AsyncFunction';
22
22
  },
23
+ boolean(data) {
24
+ return parsePrototype(data) === 'Boolean';
25
+ },
23
26
  string(data) {
24
27
  return parsePrototype(data) === 'String';
25
28
  },
@@ -0,0 +1,15 @@
1
+ import type { Data, ModifyType, ModifyOptions, ModifyRecord } from '@idraw/types';
2
+ export interface ModifyRecorderOptions {
3
+ recordable: boolean;
4
+ }
5
+ export declare class ModifyRecorder {
6
+ #private;
7
+ constructor(opts: ModifyRecorderOptions);
8
+ $getDoStack(): ModifyRecord[];
9
+ $getUndoStack(): ModifyRecord[];
10
+ clear(): void;
11
+ destroy(): void;
12
+ do<T extends ModifyType>(data: Data, opts: ModifyOptions<T>): Data;
13
+ undo(data: Data): Data | null;
14
+ redo(data: Data): Data | null;
15
+ }