@lvce-editor/editor-worker 19.72.8 → 19.72.10

package/dist/editorWorkerMain.js

@@ -8922,7 +8922,7 @@ const getColorPickerBounds = editor => {
   };
 };
 
-const newStateGenerator$5 = (state, parentUid) => {
+const newStateGenerator$4 = (state, parentUid) => {
   return loadContent$3(state, parentUid);
 };
 const openColorPicker = async editor => {
@@ -8933,7 +8933,7 @@ const openColorPicker = async editor => {
   } = await Promise.resolve().then(function () { return GetColorPickerRange; });
   const range = await getColorPickerRange(editor);
   const createWidget = () => create$6(bounds, range, editor.undoStack.length);
-  return addWidgetToEditor(ColorPicker$2, ColorPicker, editor, createWidget, newStateGenerator$5, fullFocus);
+  return addWidgetToEditor(ColorPicker$2, ColorPicker, editor, createWidget, newStateGenerator$4, fullFocus);
 };
 const closeColorPicker = editor => {
   const {
@@ -12203,7 +12203,7 @@ const create$4 = () => {
   return widget;
 };
 
-const newStateGenerator$4 = async state => {
+const newStateGenerator$3 = async state => {
   const latestState = {
     ...state,
     height: 45,
@@ -12215,7 +12215,7 @@ const newStateGenerator$4 = async state => {
 };
 const openCodeGenerator = async editor => {
   const fullFocus = true;
-  return addWidgetToEditor(CodeGenerator, FocusCodeGenerator, editor, create$4, newStateGenerator$4, fullFocus);
+  return addWidgetToEditor(CodeGenerator, FocusCodeGenerator, editor, create$4, newStateGenerator$3, fullFocus);
 };
 
 const create$3 = () => {
@@ -12247,7 +12247,7 @@ const {
   setFactory
 } = createLazyRpc(CompletionWorker);
 
-const newStateGenerator$3 = async (state, parentUid) => {
+const newStateGenerator$2 = async (state, parentUid) => {
   const {
     height,
     uid,
@@ -12273,7 +12273,7 @@ const newStateGenerator$3 = async (state, parentUid) => {
 };
 const openCompletion = async editor => {
   const fullFocus = false;
-  return addWidgetToEditor(Completion, EditorCompletion, editor, create$3, newStateGenerator$3, fullFocus);
+  return addWidgetToEditor(Completion, EditorCompletion, editor, create$3, newStateGenerator$2, fullFocus);
 };
 
 const isFunctional = widgetId => {
@@ -12712,7 +12712,7 @@ const create$2 = () => {
   return widget;
 };
 
-const loadContent$2 = async (state, parentUid) => {
+const loadContent$2 = async (state, parentUid, savedState) => {
   const {
     uid
   } = state;
@@ -12725,7 +12725,7 @@ const loadContent$2 = async (state, parentUid) => {
   } = editor;
   await launch();
   await invoke$3('FindWidget.create', uid, x, y, width, height, parentUid);
-  await invoke$3('FindWidget.loadContent', uid);
+  await invoke$3('FindWidget.loadContent', uid, savedState);
   const diff = await invoke$3('FindWidget.diff2', uid);
   const commands = await invoke$3('FindWidget.render2', uid, diff);
   return {
@@ -12734,16 +12734,16 @@ const loadContent$2 = async (state, parentUid) => {
   };
 };
 
-const newStateGenerator$2 = (state, parentUid) => {
-  return loadContent$2(state, parentUid);
-};
-const openFind2 = async editor => {
+const openFind2 = async (editor, savedState) => {
   const editorWithFocusedFind = focusFindInput(editor);
   if (editorWithFocusedFind !== editor) {
     return editorWithFocusedFind;
   }
   const fullFocus = true;
-  return addWidgetToEditor(Find, FindWidget, editor, create$2, newStateGenerator$2, fullFocus);
+  const newStateGenerator = (state, parentUid) => {
+    return loadContent$2(state, parentUid, savedState);
+  };
+  return addWidgetToEditor(Find, FindWidget, editor, create$2, newStateGenerator, fullFocus);
 };
 
 const openFind = async state => {
@@ -15556,6 +15556,7 @@ const getWordAtOffset = editor => {
   return '';
 };
 
+const applyEditCommand = wrapCommand$1(applyEdit, false, false);
 const getPositionAtCursor = editorUid => {
   const editor = getEditor$1(editorUid);
   return getPositionAtCursor$1(editor);
@@ -15662,10 +15663,7 @@ const closeFind2 = async editorUid => {
   await closeWidget2(editorUid, Find, 'FindWidget', 0);
 };
 const applyEdits2 = async (editorUid, edits, selectionChanges) => {
-  const editor = getEditor$1(editorUid);
-  const newEditor = await applyEdit(editor, edits, selectionChanges);
-  const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$a(editorUid, editor, newEditorWithDerivedState);
+  await applyEditCommand(editorUid, edits, selectionChanges);
 };
 const getSourceActions = async editorUid => {
   const actions = await getEditorSourceActions(editorUid);
@@ -18817,6 +18815,17 @@ const renderEventListeners = () => {
   }];
 };
 
+const restorePersistentWidgets = async (editor, savedWidgets) => {
+  if (!Array.isArray(savedWidgets)) {
+    return editor;
+  }
+  const savedFindWidget = savedWidgets.find(widget => widget?.id === Find);
+  if (!savedFindWidget) {
+    return editor;
+  }
+  return openFind2(editor, savedFindWidget.state);
+};
+
 const revealProblem = (editor, rowIndex, columnIndex) => {
   if (!Number.isSafeInteger(rowIndex) || !Number.isSafeInteger(columnIndex)) {
     return editor;
@@ -18845,14 +18854,31 @@ const save = async (uid, skipFormatting = false) => {
   }
 };
 
-const saveState = (state, savedState) => {
+const saveState = async (state, savedState) => {
   const {
     explicitLanguageId,
     largeFile,
     lines,
     redoStack,
-    undoStack
+    undoStack,
+    widgets: stateWidgets
   } = state;
+  const widgets = [];
+  const widgetsToSave = stateWidgets || [];
+  for (const widget of widgetsToSave) {
+    if (!widget?.newState || !isPersistentWidget(widget.id)) {
+      continue;
+    }
+    const descriptor = getWidgetHotReloadDescriptor(widget.id);
+    if (!descriptor) {
+      continue;
+    }
+    const widgetState = await descriptor.invoke(`${descriptor.name}.saveState`, widget.newState.uid);
+    widgets.push({
+      id: widget.id,
+      state: widgetState
+    });
+  }
   return {
     ...(explicitLanguageId && {
       explicitLanguageId
@@ -18860,6 +18886,9 @@ const saveState = (state, savedState) => {
     ...(largeFile && {
       largeFile: true
     }),
+    ...(widgets.length > 0 && {
+      widgets
+    }),
     ...((redoStack.length > 0 || undoStack.length > 0) && {
       lines,
       redoStack,
@@ -19118,6 +19147,7 @@ const commandMap = {
   'Editor.replaceRange': wrapCommand(replaceRange),
   'Editor.rerender': wrapCommand(rerender),
   'Editor.resize': wrapCommand(resize),
+  'Editor.restorePersistentWidgets': wrapCommand(restorePersistentWidgets),
   'Editor.revealProblem': wrapCommand(revealProblem),
   'Editor.save': save,
   'Editor.saveState': wrapGetter(saveState),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.72.8",
+  "version": "19.72.10",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"