@fulate/vue 1.0.15 → 2.0.11

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.
package/README.md CHANGED
@@ -17,7 +17,16 @@ app.unmount();
17
17
 
18
18
  传入 `HTMLElement`、选择器或已有 `Root`。自动创建的 Root 由 app 释放;传入已有 Root 时,app 只
19
19
  释放自己创建的 Layer 和 renderer。一个 Root 只能承载一个 Fulate Vue app;应用不可在 unmount 后
20
- 重新挂载。
20
+ 重新挂载。初次 `onMounted()` 中卸载 app 或 Root,也会结束该次 Vue scope。
21
+
22
+ 使用 Yoga 标签时导入 `@fulate/vue/yoga`;`@fulate/components` 已完成该注册。Vue 主入口可单独使用,
23
+ Yoga 是适配入口的可选 peer dependency。
24
+
25
+ ## 场景事件
26
+
27
+ Canvas 标签支持 `@click.capture` 与 JSX 的 `onClickCapture`,普通监听使用 `@click` / `onClick`。
28
+ 捕获和普通 handler 独立更新、移除;合并的 handler 数组逐项注册。事件名和阶段由 Core 解析,
29
+ 传播、停止及回调变更规则见 [Core 事件指南](../core/docs/guides/events-and-animation.md)。
21
30
 
22
31
  ## VueShape 与自定义元素
23
32
 
@@ -54,7 +63,7 @@ class KeyValueShape extends VueShape<KeyValueProperties, KeyValueOption> {
54
63
 
55
64
  初始绑定、configured/runtime 更新与清除、属性快照恢复都经过该映射。mapped props 是派生缓存,不写入
56
65
  JSON、Clipboard 或 History;mapped 业务类型由其具体 type factory 恢复。manual 模式仍保存组件名称和
57
- 手动 component props,`fromVueToFulate()` 与基础 `vueClipboardPlugin` 的行为不变。
66
+ 手动 component props,`fromVueToFulate()` 与基础 `vueShapeV2Codec` 的行为不变。
58
67
 
59
68
  每个 `VueShape` 都拥有独立 Vue app。组件可在 `setup()` 中直接通过 `useFulateHost()` 取得当前宿主;
60
69
  派生类型可作为泛型参数保留具体类型:
@@ -89,12 +98,17 @@ unregister();
89
98
 
90
99
  ## Clipboard
91
100
 
92
- `vueClipboardPlugin` 是按 `Select` 实例显式安装的 clipboard adapter:
101
+ `vueShapeV2Codec` 是供文件与剪贴板共用的 v2 codec:
93
102
 
94
103
  ```ts
95
- const select = new Select().useClipboard(vueClipboardPlugin);
104
+ const codecs = new Map([...elementV2Codecs, ["vue-component", vueShapeV2Codec]]);
105
+ const select = new Select({ codecs });
96
106
  ```
97
107
 
98
108
  基础 manual `VueShape` 的复制 payload 保存组件名称、props 和必要元素数据,组件必须在恢复前完成
99
- 注册。mapped 自定义类型不保存组件名称或派生 props,由业务 type factory 恢复。该 adapter 不注册
109
+ 注册。mapped 自定义类型不保存组件名称或派生 props,由业务 type codec 恢复。该 adapter 不注册
100
110
  全局 Select 行为,也不读取旧格式。
111
+
112
+ `f-vector-path` 创建 UI `EditorVectorPath`,path 接受 Core `VectorPathCommand[]` 或 canonical `VectorPathGeometry`;
113
+ `f-polygon` 的 path 接受 points 或 canonical geometry。初始 props 进入构造,后续替换沿同一 setOptions 更新,
114
+ live path 始终为 canonical 值。
@@ -0,0 +1,102 @@
1
+ import { Element, Shape, parseEventOptionKey } from "@fulate/core";
2
+ import { Circle, EditorVectorPath, Group, Image, Line, LineTree, Polygon, Rectangle, RippleOverlay, ScrollView, Text, Triangle, Workspace } from "@fulate/ui";
3
+ import { isFunction } from "lodash-es";
4
+ import { createRenderer, markRaw } from "vue";
5
+ //#region packages/vue/src/renderer.ts
6
+ var elementConstructors = new Map([
7
+ ["f-element", Element],
8
+ ["f-shape", Shape],
9
+ ["f-rectangle", Rectangle],
10
+ ["f-circle", Circle],
11
+ ["f-triangle", Triangle],
12
+ ["f-polygon", Polygon],
13
+ ["f-vector-path", EditorVectorPath],
14
+ ["f-text", Text],
15
+ ["f-image", Image],
16
+ ["f-workspace", Workspace],
17
+ ["f-group", Group],
18
+ ["f-scrollview", ScrollView],
19
+ ["f-scroll-view", ScrollView],
20
+ ["f-line", Line],
21
+ ["f-line-tree", LineTree],
22
+ ["f-ripple", RippleOverlay]
23
+ ]);
24
+ function registerElement(type, Constructor) {
25
+ elementConstructors.set(type, Constructor);
26
+ }
27
+ function getRegisteredElement(type) {
28
+ return elementConstructors.get(type);
29
+ }
30
+ function isEventProp(key) {
31
+ return /^on[A-Z]/.test(key);
32
+ }
33
+ function forEachEventHandler(value, callback) {
34
+ if (Array.isArray(value)) value.forEach((item) => forEachEventHandler(item, callback));
35
+ else if (isFunction(value)) callback(value);
36
+ }
37
+ function createPlaceholder() {
38
+ const el = new Element({
39
+ width: 0,
40
+ height: 0,
41
+ silent: true,
42
+ pickable: false
43
+ });
44
+ placeholders.add(el);
45
+ return el;
46
+ }
47
+ var placeholders = /* @__PURE__ */ new WeakSet();
48
+ /** Hosts leave initialization on their first Vue insert, even before Root activation. */
49
+ var initialElements = /* @__PURE__ */ new WeakSet();
50
+ var renderer = createRenderer({
51
+ createElement(type, _namespace, _is, props) {
52
+ const Ctor = getRegisteredElement(type);
53
+ if (!Ctor) throw new Error(`[fulate-vue] Unknown element "${type}". Register it before mounting the app.`);
54
+ const options = {};
55
+ if (props) {
56
+ for (const key in props) if (key !== "key" && key !== "ref" && key !== "ref_for" && key !== "ref_key" && !isEventProp(key)) options[key] = props[key];
57
+ }
58
+ const el = markRaw(new Ctor(options));
59
+ initialElements.add(el);
60
+ return el;
61
+ },
62
+ insert(child, parent, anchor) {
63
+ if (!parent) return;
64
+ initialElements.delete(child);
65
+ if (anchor) parent.insertBefore(child, anchor);
66
+ else parent.append(child);
67
+ },
68
+ remove(child) {
69
+ child.unmount();
70
+ },
71
+ patchProp(el, key, prevValue, nextValue) {
72
+ if (placeholders.has(el)) return;
73
+ if (isEventProp(key)) {
74
+ const { eventName, capture } = parseEventOptionKey(key);
75
+ forEachEventHandler(prevValue, (handler) => el.removeEventListener(eventName, handler, { capture }));
76
+ forEachEventHandler(nextValue, (handler) => el.addEventListener(eventName, handler, { capture }));
77
+ return;
78
+ }
79
+ if (!initialElements.has(el)) el.setOptions({ [key]: nextValue });
80
+ },
81
+ createText() {
82
+ return createPlaceholder();
83
+ },
84
+ createComment() {
85
+ return createPlaceholder();
86
+ },
87
+ setText() {},
88
+ setElementText(el, text) {
89
+ if (placeholders.has(el)) return;
90
+ if (el.type === "text") el.setOptions({ text });
91
+ },
92
+ parentNode(node) {
93
+ return node?.parent ?? null;
94
+ },
95
+ nextSibling(node) {
96
+ return node?.nextSibling ?? null;
97
+ }
98
+ });
99
+ renderer.render;
100
+ var baseCreateApp = renderer.createApp;
101
+ //#endregion
102
+ export { getRegisteredElement as n, registerElement as r, baseCreateApp as t };
package/dist/index.d.ts CHANGED
@@ -4,5 +4,5 @@ export { createApp } from "./app";
4
4
  export type { FulateApp, FulateAppMountOptions } from "./app";
5
5
  export { FULATE_HOST_KEY, FULATE_OVERLAY_KEY, FULATE_ROOT_KEY, VUE_SHAPE_SIZE_KEY, registerVueOverlay, useFulateHost } from "./context";
6
6
  export { FTransition } from "./transition";
7
- export { VueShape, fromVueToFulate, registerVueComponent, vueClipboardPlugin } from "./vue-shape";
7
+ export { VueShape, fromVueToFulate, registerVueComponent, vueShapeV2Codec } from "./vue-shape";
8
8
  export type { VueComponentPropsResolver, VueShapeJSON } from "./vue-shape";
package/dist/index.js CHANGED
@@ -1,97 +1,8 @@
1
- import { BaseTransition, createRenderer, defineComponent, getCurrentInstance, h, inject, markRaw, mergeProps, onBeforeUnmount, reactive, shallowRef } from "vue";
2
- import { Element, Layer, Root, Shape } from "@fulate/core";
3
- import { cloneDeep, has, isFunction, isString, isUndefined } from "lodash-es";
4
- import { Circle, Group, Image, Line, LineTree, Polygon, Rectangle, RectangleProperties, RectangleTransform, RippleOverlay, ScrollView, Text, Triangle, Workspace } from "@fulate/ui";
5
- //#region packages/vue/src/renderer.ts
6
- var elementConstructors = new Map([
7
- ["f-element", Element],
8
- ["f-shape", Shape],
9
- ["f-rectangle", Rectangle],
10
- ["f-circle", Circle],
11
- ["f-triangle", Triangle],
12
- ["f-polygon", Polygon],
13
- ["f-text", Text],
14
- ["f-image", Image],
15
- ["f-workspace", Workspace],
16
- ["f-group", Group],
17
- ["f-scrollview", ScrollView],
18
- ["f-scroll-view", ScrollView],
19
- ["f-line", Line],
20
- ["f-line-tree", LineTree],
21
- ["f-ripple", RippleOverlay]
22
- ]);
23
- function registerElement(type, Constructor) {
24
- elementConstructors.set(type, Constructor);
25
- }
26
- function getRegisteredElement(type) {
27
- return elementConstructors.get(type);
28
- }
29
- function isEventProp(key) {
30
- return /^on[A-Z]/.test(key);
31
- }
32
- function toEventName(key) {
33
- return key.slice(2).toLowerCase();
34
- }
35
- function forEachEventHandler(value, callback) {
36
- if (Array.isArray(value)) value.forEach((item) => forEachEventHandler(item, callback));
37
- else if (isFunction(value)) callback(value);
38
- }
39
- function createPlaceholder() {
40
- const el = new Element({
41
- width: 0,
42
- height: 0,
43
- silent: true,
44
- pickable: false
45
- });
46
- placeholders.add(el);
47
- return el;
48
- }
49
- var placeholders = /* @__PURE__ */ new WeakSet();
50
- var renderer = createRenderer({
51
- createElement(type) {
52
- const Ctor = getRegisteredElement(type);
53
- if (!Ctor) throw new Error(`[fulate-vue] Unknown element "${type}". Register it before mounting the app.`);
54
- return markRaw(new Ctor());
55
- },
56
- insert(child, parent, anchor) {
57
- if (!parent) return;
58
- if (anchor) parent.insertBefore(child, anchor);
59
- else parent.append(child);
60
- },
61
- remove(child) {
62
- child.unmount();
63
- },
64
- patchProp(el, key, prevValue, nextValue) {
65
- if (placeholders.has(el)) return;
66
- if (isEventProp(key)) {
67
- const eventName = toEventName(key);
68
- forEachEventHandler(prevValue, (handler) => el.removeEventListener(eventName, handler));
69
- forEachEventHandler(nextValue, (handler) => el.addEventListener(eventName, handler));
70
- return;
71
- }
72
- el.setOptions({ [key]: nextValue });
73
- },
74
- createText() {
75
- return createPlaceholder();
76
- },
77
- createComment() {
78
- return createPlaceholder();
79
- },
80
- setText() {},
81
- setElementText(el, text) {
82
- if (placeholders.has(el)) return;
83
- if (el.type === "text") el.setOptions({ text });
84
- },
85
- parentNode(node) {
86
- return node?.parent ?? null;
87
- },
88
- nextSibling(node) {
89
- return node?.nextSibling ?? null;
90
- }
91
- });
92
- renderer.render;
93
- var baseCreateApp = renderer.createApp;
94
- //#endregion
1
+ import { n as getRegisteredElement, r as registerElement, t as baseCreateApp } from "./chunks/renderer-D5hdLgxq.js";
2
+ import { Layer, Root } from "@fulate/core";
3
+ import { Rectangle, RectangleProperties, RectangleTransform } from "@fulate/ui";
4
+ import { cloneDeep, has, isString, isUndefined } from "lodash-es";
5
+ import { BaseTransition, defineComponent, getCurrentInstance, h, inject, markRaw, mergeProps, onBeforeUnmount, reactive, shallowRef } from "vue";
95
6
  //#region packages/vue/src/context.ts
96
7
  var FULATE_ROOT_KEY = "__fulate_root";
97
8
  var FULATE_OVERLAY_KEY = "__fulate_overlay";
@@ -189,7 +100,7 @@ function createApp(rootComponent, rootProps) {
189
100
  root.append(overlay);
190
101
  app.provide(FULATE_OVERLAY_KEY, overlay);
191
102
  app.provide(FULATE_ROOT_KEY, root);
192
- mounted = {
103
+ const state = {
193
104
  root,
194
105
  ownsRoot,
195
106
  content,
@@ -198,9 +109,14 @@ function createApp(rootComponent, rootProps) {
198
109
  dispose(true);
199
110
  })
200
111
  };
201
- setFulateRootLayers(root, mounted);
112
+ mounted = state;
113
+ setFulateRootLayers(root, state);
202
114
  try {
203
115
  const instance = originalMount(content);
116
+ if (mounted !== state) {
117
+ originalUnmount();
118
+ return instance;
119
+ }
204
120
  rendererMounted = true;
205
121
  if (!root.isMounted) root.mount();
206
122
  return instance;
@@ -481,9 +397,11 @@ var VueShape = class extends Rectangle {
481
397
  if (this.componentPropsResolver) this.setComponentProps(this.componentPropsResolver(properties));
482
398
  }
483
399
  /** manual 模式保存 component metadata;mapped 模式只保存 Properties。 */
400
+ getPersistentChildren() {
401
+ return [];
402
+ }
484
403
  toJSON() {
485
404
  const json = super.toJSON();
486
- delete json.children;
487
405
  if (this.componentPropsResolver) return json;
488
406
  return {
489
407
  ...json,
@@ -492,13 +410,11 @@ var VueShape = class extends Rectangle {
492
410
  };
493
411
  }
494
412
  };
495
- var vueClipboardPlugin = {
496
- type: "vue-component",
497
- deserialize(data) {
498
- const { type: _type, children: _children, component, componentProps, ...shapeProps } = data;
499
- const comp = vueCompRegistry.get(component);
500
- if (!comp) return;
501
- return fromVueToFulate(comp, shapeProps, componentProps);
413
+ var vueShapeV2Codec = {
414
+ encode: (element) => element.toJSON(),
415
+ decode(data) {
416
+ const { type: _type, component, componentProps, ...shapeProps } = data;
417
+ return fromVueToFulate(vueCompRegistry.get(component), shapeProps, componentProps);
502
418
  }
503
419
  };
504
420
  /** 从彼此独立的 Rectangle options 和 Vue component props 创建 VueShape。 */
@@ -506,4 +422,4 @@ function fromVueToFulate(comp, options = {}, componentProps = {}) {
506
422
  return markRaw(new VueShape(options, componentProps)).bindComponent(comp);
507
423
  }
508
424
  //#endregion
509
- export { FTransition, FULATE_HOST_KEY, FULATE_OVERLAY_KEY, FULATE_ROOT_KEY, VUE_SHAPE_SIZE_KEY, VueShape, createApp, fromVueToFulate, getRegisteredElement, registerElement, registerVueComponent, registerVueOverlay, useFulateHost, vueClipboardPlugin };
425
+ export { FTransition, FULATE_HOST_KEY, FULATE_OVERLAY_KEY, FULATE_ROOT_KEY, VUE_SHAPE_SIZE_KEY, VueShape, createApp, fromVueToFulate, getRegisteredElement, registerElement, registerVueComponent, registerVueOverlay, useFulateHost, vueShapeV2Codec };
@@ -1,5 +1,5 @@
1
- import { type Renderer } from "vue";
2
1
  import { Element } from "@fulate/core";
2
+ import { type Renderer } from "vue";
3
3
  export type ElementConstructor<T extends Element = Element> = new (options?: any) => T;
4
4
  export declare function registerElement(type: string, Constructor: ElementConstructor): void;
5
5
  export declare function getRegisteredElement(type: string): ElementConstructor | undefined;
@@ -1,10 +1,11 @@
1
- import { type ElementJSON, type ElementTransformClass, type Layer, type PropertyChanges, type Root } from "@fulate/core";
1
+ import type { ElementV2Codec } from "@fulate/import";
2
+ import { type ElementPayload, type ElementTransformClass, type Layer, type PropertyChanges, type Root } from "@fulate/core";
2
3
  import { Rectangle, RectangleProperties, type RectangleOption } from "@fulate/ui";
3
4
  import { type Component } from "vue";
4
5
  export declare function registerVueComponent(name: string, comp: Component): void;
5
6
  /** 将当前 effective Properties 映射为完整 Vue component props。 */
6
7
  export type VueComponentPropsResolver<P extends RectangleProperties = RectangleProperties> = (properties: Readonly<P>) => Record<string, unknown>;
7
- export type VueShapeJSON<O extends RectangleOption<any> = RectangleOption<any>> = ElementJSON<O> & {
8
+ export type VueShapeJSON = ElementPayload & {
8
9
  component?: string;
9
10
  componentProps?: Record<string, unknown>;
10
11
  };
@@ -33,11 +34,9 @@ export declare class VueShape<P extends RectangleProperties = RectanglePropertie
33
34
  private syncSize;
34
35
  private syncComponentProps;
35
36
  /** manual 模式保存 component metadata;mapped 模式只保存 Properties。 */
36
- toJSON(): VueShapeJSON<O>;
37
+ getPersistentChildren(): any[];
38
+ toJSON(): VueShapeJSON;
37
39
  }
38
- export declare const vueClipboardPlugin: {
39
- readonly type: "vue-component";
40
- readonly deserialize: (data: Record<string, any>) => VueShape<RectangleProperties, RectangleOption<any>>;
41
- };
40
+ export declare const vueShapeV2Codec: ElementV2Codec;
42
41
  /** 从彼此独立的 Rectangle options 和 Vue component props 创建 VueShape。 */
43
42
  export declare function fromVueToFulate(comp: Component, options?: RectangleOption<VueShape>, componentProps?: Record<string, unknown>): VueShape;
package/dist/yoga.d.ts ADDED
@@ -0,0 +1 @@
1
+ export {};
package/dist/yoga.js ADDED
@@ -0,0 +1,7 @@
1
+ import { r as registerElement } from "./chunks/renderer-D5hdLgxq.js";
2
+ import { Div, Span, TextRow } from "@fulate/yoga";
3
+ //#region packages/vue/src/yoga.ts
4
+ registerElement("f-div", Div);
5
+ registerElement("f-span", Span);
6
+ registerElement("f-text-row", TextRow);
7
+ //#endregion
package/package.json CHANGED
@@ -1,29 +1,40 @@
1
- {
2
- "name": "@fulate/vue",
3
- "version": "1.0.15",
4
- "type": "module",
5
- "main": "./dist/index.js",
6
- "types": "./dist/index.d.ts",
7
- "exports": {
8
- ".": {
9
- "types": "./dist/index.d.ts",
10
- "import": "./dist/index.js"
11
- }
12
- },
13
- "files": [
14
- "dist"
15
- ],
16
- "license": "MIT",
17
- "scripts": {
18
- "test": "vitest run",
19
- "test:watch": "vitest"
20
- },
21
- "dependencies": {
22
- "@fulate/core": "*",
23
- "@fulate/ui": "*",
24
- "lodash-es": "^4.17.22"
25
- },
26
- "peerDependencies": {
27
- "vue": "^3.5.0"
28
- }
29
- }
1
+ {
2
+ "name": "@fulate/vue",
3
+ "version": "2.0.11",
4
+ "type": "module",
5
+ "main": "./dist/index.js",
6
+ "types": "./dist/index.d.ts",
7
+ "exports": {
8
+ ".": {
9
+ "types": "./dist/index.d.ts",
10
+ "import": "./dist/index.js"
11
+ },
12
+ "./yoga": {
13
+ "types": "./dist/yoga.d.ts",
14
+ "import": "./dist/yoga.js"
15
+ }
16
+ },
17
+ "files": [
18
+ "dist"
19
+ ],
20
+ "license": "MIT",
21
+ "scripts": {
22
+ "test": "vitest run",
23
+ "test:watch": "vitest"
24
+ },
25
+ "dependencies": {
26
+ "@fulate/core": "2.0.11",
27
+ "@fulate/ui": "2.0.11",
28
+ "lodash-es": "^4.17.22",
29
+ "@fulate/import": "2.0.11"
30
+ },
31
+ "peerDependencies": {
32
+ "vue": "^3.5.0",
33
+ "@fulate/yoga": "2.0.11"
34
+ },
35
+ "peerDependenciesMeta": {
36
+ "@fulate/yoga": {
37
+ "optional": true
38
+ }
39
+ }
40
+ }