@lvce-editor/editor-worker 7.1.0 → 7.3.0

package/dist/editorWorkerMain.js

@@ -1132,14 +1132,14 @@ const getModule$2 = id => {
 const applyWidgetChange = async (editor, widget, changes) => {
   const module = getModule$2(widget.id);
   if (changes.length === 1 && changes[0].origin === EditorType && module.handleEditorType) {
-    const newState = await module.handleEditorType(editor, widget.newState);
+    const newState = await module.handleEditorType(widget.newState);
     return {
       ...widget,
       newState
     };
   }
   if (changes.length === 1 && changes[0].origin === DeleteLeft && module.handleEditorDeleteLeft) {
-    const newState = await module.handleEditorDeleteLeft(editor, widget.newState);
+    const newState = await module.handleEditorDeleteLeft(widget.newState);
     return {
       ...widget,
       newState
@@ -7697,6 +7697,29 @@ const renderFull$4 = (oldState, newState) => {
   return commands;
 };
 
+const updateWidget = (editor, widgetId, newState) => {
+  // TODO avoid closure
+  const isWidget = widget => {
+    return widget.id === widgetId;
+  };
+  const childIndex = editor.widgets.findIndex(isWidget);
+  if (childIndex === -1) {
+    return editor;
+  }
+  // TODO scroll up/down if necessary
+  const childWidget = editor.widgets[childIndex];
+  const newWidget = {
+    ...childWidget,
+    oldState: childWidget.newState,
+    newState
+  };
+  const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
+  return {
+    ...editor,
+    widgets: newWidgets
+  };
+};
+
 const render$c = widget => {
   const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
@@ -7719,17 +7742,28 @@ const remove$7 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
 };
 const createFn = key => {
-  const fn = async (state, ...args) => {
+  const widgetId = Completion;
+  const isWidget = widget => {
+    return widget.id === widgetId;
+  };
+  const fn = async (editor, ...args) => {
+    const childIndex = editor.widgets.findIndex(isWidget);
+    // TODO scroll up/down if necessary
+    const childWidget = editor.widgets[childIndex];
+    const state = childWidget.newState;
     const {
       uid
     } = state;
     await invoke$3(`Completions.${key}`, uid, ...args);
     const diff = await invoke$3('Completions.diff2', uid);
     const commands = await invoke$3('Completions.render2', uid, diff);
-    return {
+    const newState = {
       ...state,
       commands
     };
+    const latest = get$4(editor.uid).newState;
+    const newEditor = updateWidget(latest, widgetId, newState);
+    return newEditor;
   };
   return fn;
 };
@@ -8021,26 +8055,6 @@ const getWidgetInvoke = widgetId => {
   }
 };
 
-const updateWidget = (editor, widgetId, newState) => {
-  // TODO avoid closure
-  const isWidget = widget => {
-    return widget.id === widgetId;
-  };
-  const childIndex = editor.widgets.findIndex(isWidget);
-  // TODO scroll up/down if necessary
-  const childWidget = editor.widgets[childIndex];
-  const newWidget = {
-    ...childWidget,
-    oldState: childWidget.newState,
-    newState
-  };
-  const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
-  return {
-    ...editor,
-    widgets: newWidgets
-  };
-};
-
 const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...params) => {
   const invoke = getWidgetInvoke(widgetId);
   const actualMethod = method.slice(name.length + 1);
@@ -9719,13 +9733,16 @@ const widgetCommands = {
   'FindWidget.focusReplaceAllButton': Find,
   'FindWidget.focusNextMatchButton': Find,
   'FindWidget.focusPreviousMatchButton': Find,
-  'FindWidget.focusCloseButton': Find,
-  'EditorCompletion.handleWheel': Completion,
-  'EditorCompletion.focusFirst': Completion,
-  'EditorCompletion.focusNext': Completion,
-  'EditorCompletion.focusPrevious': Completion,
-  'EditorCompletion.focusIndex': Completion,
-  'EditorCompletion.focusLast': Completion
+  'FindWidget.focusCloseButton': Find
+
+  // 'EditorCompletion.handleWheel': WidgetId.Completion,
+  // 'EditorCompletion.focusFirst': WidgetId.Completion,
+  // 'EditorCompletion.focusNext': WidgetId.Completion,
+  // 'EditorCompletion.focusPrevious': WidgetId.Completion,
+  // 'EditorCompletion.focusIndex': WidgetId.Completion,
+  // 'EditorCompletion.focusLast': WidgetId.Completion,
+  // 'EditorCompletion.selectCurrent': WidgetId.Completion,
+  // 'EditorCompletion.selectIndex': WidgetId.Completion,
 };
 
 // TODO wrap commands globally, not per editor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "7.1.0",
+  "version": "7.3.0",
   "description": "",
   "license": "MIT",
   "author": "Lvce Editor",