@fulate/import 1.0.15 → 1.0.19

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 (3) hide show
  1. package/README.md +1 -0
  2. package/dist/index.js +12 -13
  3. package/package.json +1 -1
package/README.md CHANGED
@@ -22,6 +22,7 @@ restoreScene(root, data);
22
22
  `__fulate_file__`,`version` 为 `2`。`deserializeElement()`
23
23
  按 `type` 选择当前内建或调用者提供的 factory;文件中的 `key` 由 producer 保留,Core 不生成第二
24
24
  份身份。`exportToFile()` 与 `importFromFile()` 是浏览器文件 API 的薄适配。
25
+ 文件选择取消或读取完成前 Root 已卸载时,文件导入返回 `false`;尚未激活的 Root 仍可导入。
25
26
  `parseFileData()` 只执行 JSON parse;声明格式错误和 restore 错误直接传播。History 属于应用组合层,
26
27
  成功恢复场景后由拥有 Select 的应用决定是否清空。
27
28
 
package/dist/index.js CHANGED
@@ -231,6 +231,7 @@ function pickFile(accept) {
231
231
  input.type = "file";
232
232
  input.accept = accept;
233
233
  input.onchange = () => resolve(input.files?.[0] ?? null);
234
+ input.oncancel = () => resolve(null);
234
235
  input.click();
235
236
  });
236
237
  }
@@ -622,10 +623,10 @@ function parseSketchPoint(str, frameW, frameH) {
622
623
  };
623
624
  }
624
625
  function assignImageSrc(base, layer, ctx) {
625
- const src = resolveImageSrc(layer, ctx.zipImages);
626
+ const ref = layer.image?._ref;
627
+ const src = (ref && ctx.imageDataURLs.get(ref)) ?? resolveImageSrc(layer, ctx.zipImages);
626
628
  if (src) {
627
629
  base.src = src;
628
- const ref = layer.image?._ref;
629
630
  if (ref) ctx.imageDataURLs.set(ref, src);
630
631
  } else ctx.warnings.push(`[${layer.name}] image resource not found`);
631
632
  }
@@ -643,6 +644,7 @@ async function importSketchFile(root, deserialize, filter) {
643
644
  const file = await pickFile(".sketch");
644
645
  if (!file) return false;
645
646
  const result = await importSketch(file);
647
+ if (root.isUnmounted) return false;
646
648
  if (result.warnings.length) console.warn("[Sketch Import]", result.warnings);
647
649
  restoreScene$1({
648
650
  root,
@@ -666,7 +668,7 @@ async function importSketchFile(root, deserialize, filter) {
666
668
  //#region packages/import/src/fulate/index.ts
667
669
  var FILE_MARKER = "__fulate_file__";
668
670
  var FILE_VERSION = 2;
669
- var builtInConstructors = {
671
+ var builtInFactories = Object.fromEntries(Object.entries({
670
672
  element: Element,
671
673
  shape: Shape,
672
674
  layer: Layer,
@@ -683,20 +685,15 @@ var builtInConstructors = {
683
685
  line: Line,
684
686
  lineTree: LineTree,
685
687
  ripple: RippleOverlay
686
- };
687
- function normalizeType(type) {
688
- return type.startsWith("f-") ? type.slice(2) : type;
689
- }
690
- var builtInFactories = Object.fromEntries(Object.entries(builtInConstructors).map(([type, Constructor]) => [type, (data) => {
688
+ }).map(([type, Constructor]) => [type, (data) => {
691
689
  const { type, children, ...options } = data;
692
690
  return new Constructor(options);
693
691
  }]));
694
692
  function resolveFactory(type, factories) {
695
- const normalized = normalizeType(type);
696
693
  let custom;
697
- if (factories instanceof Map) custom = factories.get(normalized);
698
- else if (factories && has(factories, [normalized])) custom = factories[normalized];
699
- return custom ?? builtInFactories[normalized];
694
+ if (factories instanceof Map) custom = factories.get(type);
695
+ else if (factories && has(factories, [type])) custom = factories[type];
696
+ return custom ?? builtInFactories[type];
700
697
  }
701
698
  function serializeScene(root, filter) {
702
699
  return {
@@ -738,7 +735,9 @@ function exportToFile(root, filename = "fulate-design.json", filter) {
738
735
  async function importFromFile(root, filter, factories) {
739
736
  const file = await pickFile(".json");
740
737
  if (!file) return false;
741
- restoreScene(root, parseFileData(await file.text()), filter, factories);
738
+ const fileData = parseFileData(await file.text());
739
+ if (root.isUnmounted) return false;
740
+ restoreScene(root, fileData, filter, factories);
742
741
  return true;
743
742
  }
744
743
  //#endregion
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fulate/import",
3
- "version": "1.0.15",
3
+ "version": "1.0.19",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",