@lvce-editor/editor-worker 3.15.0 → 3.16.0

package/dist/editorWorkerMain.js

@@ -2431,6 +2431,9 @@ const setAdditionalFocus = async focusKey => {
 };
 
 const setFocus = async focusKey => {
+  if (!focusKey) {
+    return;
+  }
   await invoke$3('Focus.setFocus', focusKey);
 };
 
@@ -5192,58 +5195,108 @@ const focusFind = state => {
   return setFindWidgetFocus(state, FindWidget);
 };
 
+const getWidgetState = (editor, id) => {
+  const {
+    widgets
+  } = editor;
+  for (const widget of widgets) {
+    if (widget.id === id) {
+      return widget.newState;
+    }
+  }
+  return undefined;
+};
+
+const getFindState = editor => {
+  return getWidgetState(editor, Find);
+};
+
+const isFind = widget => {
+  return widget.id === Find;
+};
 // TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
-const focusIndex$1 = async (state, index) => {
+const focusIndex$1 = (editor, index) => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     value,
     matches,
     matchIndex
-  } = state;
+  } = findState;
   if (index === matchIndex) {
-    return state;
+    return editor;
   }
+  const {
+    widgets
+  } = editor;
+  const childIndex = widgets.findIndex(isFind);
+  const childWidget = widgets[childIndex];
+
   // TODO find next match and highlight it
   const matchRowIndex = matches[index * 2];
   const matchColumnIndex = matches[index * 2 + 1];
-  // @ts-ignore
   const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
-  // TODO set selections synchronously and render input match index,
-  // input value and new selections at the same time
-  // TODO
-  await invoke$3('Editor.setSelections', newSelections);
-  return {
-    ...state,
+  const newState = {
+    ...findState,
     matchIndex: index
   };
+  const newWidget = {
+    ...childWidget,
+    newState
+  };
+  const newWidgets = [...widgets.slice(0, childIndex), newWidget, ...widgets.slice(childIndex + 1)];
+  return {
+    ...editor,
+    selections: newSelections,
+    widgets: newWidgets
+  };
 };
-const focusFirst$1 = state => {
-  return focusIndex$1(state, 0);
+const focusFirst$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
+  return focusIndex$1(editor, 0);
 };
-const focusLast = state => {
+const focusLast = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     matchCount
-  } = state;
-  return focusIndex$1(state, matchCount - 1);
+  } = findState;
+  return focusIndex$1(editor, matchCount - 1);
 };
-const focusNext$1 = state => {
+const focusNext$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     matchIndex,
     matchCount
-  } = state;
+  } = findState;
   if (matchIndex === matchCount - 1) {
-    return focusFirst$1(state);
+    return focusFirst$1(editor);
   }
-  return focusIndex$1(state, matchIndex + 1);
+  return focusIndex$1(editor, matchIndex + 1);
 };
-const focusPrevious$1 = state => {
+const focusPrevious$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     matchIndex
-  } = state;
+  } = findState;
   if (matchIndex === 0) {
-    return focusLast(state);
+    return focusLast(editor);
   }
-  return focusIndex$1(state, matchIndex - 1);
+  return focusIndex$1(editor, matchIndex - 1);
 };
 
 const focusNextMatchButton = state => {
@@ -7123,18 +7176,6 @@ const closeDetails = editor => {
   };
 };
 
-const getWidgetState = (editor, id) => {
-  const {
-    widgets
-  } = editor;
-  for (const widget of widgets) {
-    if (widget.id === id) {
-      return widget.newState;
-    }
-  }
-  return undefined;
-};
-
 const getCompletionState = editor => {
   return getWidgetState(editor, Completion);
 };
@@ -8713,12 +8754,12 @@ const wrapWidgetCommand = (widgetId, fn) => {
 const widgetCommands = {
   'ColorPicker.handleSliderPointerDown': ColorPicker$1,
   'ColorPicker.handleSliderPointerMove': ColorPicker$1,
-  'FindWidget.focusNext': Find,
-  'FindWidget.focusPrevious': Find,
+  // 'FindWidget.focusNext': WidgetId.Find,
+  // 'FindWidget.focusPrevious': WidgetId.Find,
   'FindWidget.close': Find,
-  'FindWidget.focusIndex': Find,
-  'FindWidget.focusFirst': Find,
-  'FindWidget.focusLast': Find,
+  // 'FindWidget.focusIndex': WidgetId.Find,
+  // 'FindWidget.focusFirst': WidgetId.Find,
+  // 'FindWidget.focusLast': WidgetId.Find,
   'FindWidget.toggleReplace': Find,
   'FindWidget.handleFocus': Find,
   'FindWidget.handleBlur': Find,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",