@lvce-editor/editor-worker 3.14.0 → 3.15.0

package/dist/editorWorkerMain.js

@@ -3627,7 +3627,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 +3644,7 @@ const state$5 = {
     columnIndex: 0
   }
 };
-const getPosition$2 = () => {
+const getPosition$1 = () => {
   return state$5.position;
 };
 
@@ -3964,7 +3964,7 @@ const setPosition = position => {
 const getEditor$1 = () => {
   return state$3.currentEditor;
 };
-const getPosition$1 = () => {
+const getPosition = () => {
   return state$3.position;
 };
 const hasListener = () => {
@@ -4209,7 +4209,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 +4496,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 +4511,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 +4528,7 @@ const continueScrollingAndMovingSelection = async () => {
   if (!editor) {
     return;
   }
-  const position = getPosition$1();
+  const position = getPosition();
   if (position.rowIndex === 0) {
     return;
   }
@@ -5169,22 +5169,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,88 +5184,15 @@ 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;
-  return {
-    y,
-    x,
-    width,
-    height
-  };
-};
-const loadContent$1 = editorId => {
-  const editor = getEditor(editorId);
-  const {
-    selections,
-    lines
-  } = editor;
-  const startRowIndex = selections[0];
-  const startColumnIndex = selections[1];
-  const endColumnIndex = selections[3];
-  const line = lines[startRowIndex];
-  const value = line.slice(startColumnIndex, endColumnIndex);
-  const matches = findMatchesCaseInsensitive(lines, value);
-  const matchCount = getMatchCount(matches);
-  return {
-    value,
-    matches,
-    matchIndex: 0,
-    matchCount,
-    editorUid: editor.uid
-  };
-};
-const refresh = (state, value = state.value) => {
-  // TODO get focused editor
-  const {
-    editorUid
-  } = state;
-  // highlight locations that match value
-  const editor = getEditor(editorUid);
-  const {
-    lines
-  } = editor;
-  const matches = findMatchesCaseInsensitive(lines, value);
-  const matchCount = getMatchCount(matches);
-  return {
-    ...state,
-    matches,
-    matchIndex: 0,
-    matchCount,
-    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 focusCloseButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
 };
-const toggleReplace = state => {
-  const newExpanded = !state.replaceExpanded;
-  const newHeight = getFindWidgetHeight(newExpanded);
-  return {
-    ...state,
-    replaceExpanded: !state.replaceExpanded,
-    height: newHeight
-  };
+
+const focusFind = state => {
+  return setFindWidgetFocus(state, FindWidget);
 };
 
+// TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
 const focusIndex$1 = async (state, index) => {
   const {
@@ -5326,6 +5245,116 @@ const focusPrevious$1 = state => {
   }
   return focusIndex$1(state, 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 {
+    selections,
+    lines
+  } = editor;
+  const startRowIndex = selections[0];
+  const startColumnIndex = selections[1];
+  const endColumnIndex = selections[3];
+  const line = lines[startRowIndex];
+  const value = line.slice(startColumnIndex, endColumnIndex);
+  const matches = findMatchesCaseInsensitive(lines, value);
+  const matchCount = getMatchCount(matches);
+  return {
+    value,
+    matches,
+    matchIndex: 0,
+    matchCount,
+    editorUid: editor.uid
+  };
+};
+const refresh = (state, value = state.value) => {
+  // TODO get focused editor
+  const {
+    editorUid
+  } = state;
+  // highlight locations that match value
+  const editor = getEditor(editorUid);
+  const {
+    lines
+  } = editor;
+  const matches = findMatchesCaseInsensitive(lines, value);
+  const matchCount = getMatchCount(matches);
+  return {
+    ...state,
+    matches,
+    matchIndex: 0,
+    matchCount,
+    value
+  };
+};
+const handleInput = (state, value) => {
+  return refresh(state, value);
+};
 const close$1 = async state => {
   // TODO
   // await Viewlet.closeWidget(uid)
@@ -5344,55 +5373,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 +5406,7 @@ const openFind2 = async editor => {
       y,
       width,
       height
-    } = getPosition(editor);
+    } = getFindWidgetPosition(editor);
     const latestState = {
       ...state,
       value,
@@ -8817,7 +8816,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 +8914,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 +10301,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 +10332,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.15.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",