@lvce-editor/editor-worker 3.14.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);
 };
 
@@ -3627,7 +3630,7 @@ const handleDoubleClick = (editor, modifier, x, y) => {
 };
 
 const WhenExpressionEditorText = 12;
-const handleFocus$1 = editor => {
+const handleFocus = editor => {
   // TODO make change events functional,
   // when rendering, send focus changes to renderer worker
   invoke$3('Focus.setFocus', WhenExpressionEditorText);
@@ -3644,7 +3647,7 @@ const state$5 = {
     columnIndex: 0
   }
 };
-const getPosition$2 = () => {
+const getPosition$1 = () => {
   return state$5.position;
 };
 
@@ -3964,7 +3967,7 @@ const setPosition = position => {
 const getEditor$1 = () => {
   return state$3.currentEditor;
 };
-const getPosition$1 = () => {
+const getPosition = () => {
   return state$3.position;
 };
 const hasListener = () => {
@@ -4209,7 +4212,7 @@ const getNewSelections$5 = (anchor, position) => {
 
 // @ts-ignore
 const editorMoveSelection = (editor, position) => {
-  const anchor = getPosition$2();
+  const anchor = getPosition$1();
   const newSelections = getNewSelections$5(anchor, position);
   // TODO if selection equals previous selection -> do nothing
   return scheduleSelections(editor, newSelections);
@@ -4496,7 +4499,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex;
     const newMaxLineY = position.rowIndex + diff;
     const newDeltaY = position.rowIndex * rowHeight;
-    const anchor = getPosition$2();
+    const anchor = getPosition$1();
     const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
     return {
       ...editor,
@@ -4511,7 +4514,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex - diff;
     const newMaxLineY = position.rowIndex;
     const newDeltaY = newMinLineY * rowHeight;
-    const anchor = getPosition$2();
+    const anchor = getPosition$1();
     const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
     return {
       ...editor,
@@ -4528,7 +4531,7 @@ const continueScrollingAndMovingSelection = async () => {
   if (!editor) {
     return;
   }
-  const position = getPosition$1();
+  const position = getPosition();
   if (position.rowIndex === 0) {
     return;
   }
@@ -5169,22 +5172,14 @@ const findMatchesCaseInsensitive = (lines, searchString) => {
   return findRegexMatches(lines, regex);
 };
 
-const getFindWidgetHeight = replaceExpanded => {
-  const collapsedHeight = 30;
-  const expandedHeight = 60;
-  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
-  return newHeight;
-};
-
 const getMatchCount = matches => {
   return matches.length / 2;
 };
 
-const setFindWidgetFocus = async (state, focusKey) => {
+const setFindWidgetFocus = (state, focusKey) => {
   if (state.focus === focusKey) {
     return state;
   }
-  await setFocus(focusKey);
   return {
     ...state,
     focus: focusKey,
@@ -5192,20 +5187,183 @@ const setFindWidgetFocus = async (state, focusKey) => {
   };
 };
 
-const getPosition = editor => {
-  const width = 300;
-  const height = 30;
-  const paddingTop = 10;
-  const paddingRight = 20;
-  const x = editor.x + editor.width - width - paddingRight;
-  const y = editor.y + paddingTop;
+const focusCloseButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
+};
+
+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 = (editor, index) => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
+  const {
+    value,
+    matches,
+    matchIndex
+  } = findState;
+  if (index === matchIndex) {
+    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];
+  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
+  const newState = {
+    ...findState,
+    matchIndex: index
+  };
+  const newWidget = {
+    ...childWidget,
+    newState
+  };
+  const newWidgets = [...widgets.slice(0, childIndex), newWidget, ...widgets.slice(childIndex + 1)];
   return {
-    y,
-    x,
-    width,
-    height
+    ...editor,
+    selections: newSelections,
+    widgets: newWidgets
   };
 };
+const focusFirst$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
+  return focusIndex$1(editor, 0);
+};
+const focusLast = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
+  const {
+    matchCount
+  } = findState;
+  return focusIndex$1(editor, matchCount - 1);
+};
+const focusNext$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
+  const {
+    matchIndex,
+    matchCount
+  } = findState;
+  if (matchIndex === matchCount - 1) {
+    return focusFirst$1(editor);
+  }
+  return focusIndex$1(editor, matchIndex + 1);
+};
+const focusPrevious$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
+  const {
+    matchIndex
+  } = findState;
+  if (matchIndex === 0) {
+    return focusLast(editor);
+  }
+  return focusIndex$1(editor, matchIndex - 1);
+};
+
+const focusNextMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetNextMatchButton);
+};
+
+const focusPreviousMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetPreviousMatchButton);
+};
+
+const focusReplace = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplace);
+};
+
+const focusReplaceAllButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplaceAllButton);
+};
+
+const focusReplaceButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplaceButton);
+};
+
+const focusToggleReplaceButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetToggleReplace);
+};
+
+const handleBlur = async state => {
+  await setFocus(Empty);
+  return state;
+};
+
+const handleFindWidgetFocus = (state, focusKey) => {
+  if (state.focus === focusKey) {
+    return state;
+  }
+  return {
+    ...state,
+    focus: focusKey,
+    focusSource: User
+  };
+};
+
+const handleReplaceAllFocus = state => {
+  return handleFindWidgetFocus(state, FocusFindWidgetReplaceAllButton);
+};
+
+const handleReplaceFocus = state => {
+  return handleFindWidgetFocus(state, FocusFindWidgetReplace);
+};
+
+const getFindWidgetHeight = replaceExpanded => {
+  const collapsedHeight = 30;
+  const expandedHeight = 60;
+  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
+  return newHeight;
+};
+
+const toggleReplace = state => {
+  const newExpanded = !state.replaceExpanded;
+  const newHeight = getFindWidgetHeight(newExpanded);
+  return {
+    ...state,
+    replaceExpanded: !state.replaceExpanded,
+    height: newHeight
+  };
+};
+
 const loadContent$1 = editorId => {
   const editor = getEditor(editorId);
   const {
@@ -5250,82 +5408,6 @@ const refresh = (state, value = state.value) => {
 const handleInput = (state, value) => {
   return refresh(state, value);
 };
-const handleFocus = async state => {
-  if (state.focus === FindWidget) {
-    return state;
-  }
-  await setFocus(FindWidget);
-  return {
-    ...state,
-    focus: FindWidget
-  };
-};
-const handleBlur = async state => {
-  await setFocus(Empty);
-  return state;
-};
-const toggleReplace = state => {
-  const newExpanded = !state.replaceExpanded;
-  const newHeight = getFindWidgetHeight(newExpanded);
-  return {
-    ...state,
-    replaceExpanded: !state.replaceExpanded,
-    height: newHeight
-  };
-};
-
-// TODO this function should be synchronous
-const focusIndex$1 = async (state, index) => {
-  const {
-    value,
-    matches,
-    matchIndex
-  } = state;
-  if (index === matchIndex) {
-    return state;
-  }
-  // 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,
-    matchIndex: index
-  };
-};
-const focusFirst$1 = state => {
-  return focusIndex$1(state, 0);
-};
-const focusLast = state => {
-  const {
-    matchCount
-  } = state;
-  return focusIndex$1(state, matchCount - 1);
-};
-const focusNext$1 = state => {
-  const {
-    matchIndex,
-    matchCount
-  } = state;
-  if (matchIndex === matchCount - 1) {
-    return focusFirst$1(state);
-  }
-  return focusIndex$1(state, matchIndex + 1);
-};
-const focusPrevious$1 = state => {
-  const {
-    matchIndex
-  } = state;
-  if (matchIndex === 0) {
-    return focusLast(state);
-  }
-  return focusIndex$1(state, matchIndex - 1);
-};
 const close$1 = async state => {
   // TODO
   // await Viewlet.closeWidget(uid)
@@ -5344,55 +5426,25 @@ const handleToggleReplaceFocus = async state => {
     focus: FocusFindWidgetToggleReplace
   };
 };
-const handleReplaceFocus = async state => {
-  if (state.focus === FocusFindWidgetReplace) {
-    return state;
-  }
-  await setFocus(FocusFindWidgetReplace);
-  return {
-    ...state,
-    focus: FocusFindWidgetReplace,
-    focusSource: User
-  };
-};
-const focusReplace = state => {
-  return setFindWidgetFocus(state, FocusFindWidgetReplace);
-};
-const focusFind = state => {
-  return setFindWidgetFocus(state, FindWidget);
-};
 const handleReplaceInput = state => {
   // TODO
   return state;
 };
-const focusToggleReplace = async state => {
-  return setFindWidgetFocus(state, FocusFindWidgetToggleReplace);
-};
-const handleReplaceAllFocus = async state => {
-  if (state.focus === FocusFindWidgetReplaceAllButton) {
-    return state;
-  }
-  await setFocus(FocusFindWidgetReplaceAllButton);
+
+const getFindWidgetPosition = editor => {
+  const width = 300;
+  const height = 30;
+  const paddingTop = 10;
+  const paddingRight = 20;
+  const x = editor.x + editor.width - width - paddingRight;
+  const y = editor.y + paddingTop;
   return {
-    ...state,
-    focus: FocusFindWidgetReplaceAllButton
+    y,
+    x,
+    width,
+    height
   };
 };
-const focusReplaceButton = state => {
-  return setFindWidgetFocus(state, FocusFindWidgetReplaceButton);
-};
-const focusReplaceAllButton = state => {
-  return setFindWidgetFocus(state, FocusFindWidgetReplaceAllButton);
-};
-const focusPreviousMatchButton = state => {
-  return setFindWidgetFocus(state, FocusFindWidgetPreviousMatchButton);
-};
-const focusNextMatchButton = state => {
-  return setFindWidgetFocus(state, FocusFindWidgetNextMatchButton);
-};
-const focusCloseButton = state => {
-  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
-};
 
 const openFind2 = async editor => {
   const newStateGenerator = async state => {
@@ -5407,7 +5459,7 @@ const openFind2 = async editor => {
       y,
       width,
       height
-    } = getPosition(editor);
+    } = getFindWidgetPosition(editor);
     const latestState = {
       ...state,
       value,
@@ -7124,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);
 };
@@ -8714,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,
@@ -8817,7 +8857,7 @@ const commandMap = {
   'Editor.handleBlur': handleBlur$1,
   'Editor.handleContextMenu': handleContextMenu,
   'Editor.handleDoubleClick': handleDoubleClick,
-  'Editor.handleFocus': handleFocus$1,
+  'Editor.handleFocus': handleFocus,
   'Editor.handleMouseDown': handleMouseDown,
   'Editor.handleMouseMove': handleMouseMove,
   'Editor.handleMouseMoveWithAltKey': handleMouseMoveWithAltKey,
@@ -8915,9 +8955,9 @@ const commandMap = {
   'FindWidget.focusReplace': focusReplace,
   'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
   'FindWidget.focusReplaceButton': focusReplaceButton,
-  'FindWidget.focusToggleReplace': focusToggleReplace,
+  'FindWidget.focusToggleReplace': focusToggleReplaceButton,
   'FindWidget.handleBlur': handleBlur,
-  'FindWidget.handleFocus': handleFocus,
+  'FindWidget.handleFocus': handleFindWidgetFocus,
   'FindWidget.handleInput': handleInput,
   'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
@@ -10302,6 +10342,10 @@ const renderFocus = {
 
 const render$1 = [renderDetails, renderBounds, renderValue, renderFocus];
 const apply = (oldState, newState) => {
+  // TODO avoid side effect
+  if (oldState.focus !== newState.focus) {
+    setFocus(newState.focus);
+  }
   return renderParts(render$1, oldState, newState);
 };
 
@@ -10329,7 +10373,7 @@ const Commands = {
   'FindWidget.focusIndex': focusIndex$1,
   'FindWidget.focusLast': focusLast,
   'FindWidget.toggleReplace': toggleReplace,
-  'FindWidget.handleFocus': handleFocus,
+  'FindWidget.handleFocus': focusFind,
   'FindWidget.handleBlur': handleBlur
 };
 

package/package.json

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