@lvce-editor/editor-worker 3.11.0 → 3.12.0

package/dist/editorWorkerMain.js

@@ -2506,6 +2506,8 @@ const CompletionDetail = 999;
 const Empty = 0;
 const FindWidgetToggleReplace = 42;
 const FindWidgetReplace = 43;
+const FindWidgetReplaceAll = 46;
+const FindWidgetClose = 47;
 
 const newStateGenerator = state => {
   return loadContent$3(state);
@@ -5097,7 +5099,8 @@ const create$1 = () => {
       width: 0,
       height: 0,
       focused: false,
-      focusSource: Unknown$1
+      focusSource: Unknown$1,
+      focus: 0
     },
     newState: {
       value: '',
@@ -5117,7 +5120,8 @@ const create$1 = () => {
       width: 0,
       height: 0,
       focused: true,
-      focusSource: Unknown$1
+      focusSource: Unknown$1,
+      focus: 0
     }
   };
   return widget;
@@ -5137,6 +5141,9 @@ const getSearchRegex = searchString => {
 };
 
 const findRegexMatches = (lines, regex) => {
+  if (!regex.global) {
+    throw new Error(`regex must be global`);
+  }
   const {
     length
   } = lines;
@@ -5163,6 +5170,13 @@ 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;
 };
@@ -5230,28 +5244,22 @@ const handleInput = (state, value) => {
   return refresh(state, value);
 };
 const handleFocus = async state => {
-  if (state.focus === 'find') {
+  if (state.focus === FindWidget) {
     return state;
   }
   await setFocus(FindWidget);
   return {
     ...state,
-    focus: 'find'
+    focus: FindWidget
   };
 };
 const handleBlur = async state => {
   await setFocus(Empty);
   return state;
 };
-const getHeight = replaceExpanded => {
-  const collapsedHeight = 30;
-  const expandedHeight = 60;
-  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
-  return newHeight;
-};
 const toggleReplace = state => {
   const newExpanded = !state.replaceExpanded;
-  const newHeight = getHeight(newExpanded);
+  const newHeight = getFindWidgetHeight(newExpanded);
   return {
     ...state,
     replaceExpanded: !state.replaceExpanded,
@@ -5319,14 +5327,24 @@ const close$1 = async state => {
     disposed: true
   };
 };
+const handleToggleReplaceFocus = async state => {
+  if (state.focus === FindWidgetToggleReplace) {
+    return state;
+  }
+  await setFocus(FindWidgetToggleReplace);
+  return {
+    ...state,
+    focus: FindWidgetToggleReplace
+  };
+};
 const handleReplaceFocus = async state => {
-  if (state.focus === 'replaceInput') {
+  if (state.focus === FindWidgetReplace) {
     return state;
   }
   await setFocus(FindWidgetReplace);
   return {
     ...state,
-    focus: 'replaceInput',
+    focus: FindWidgetReplace,
     focusSource: User
   };
 };
@@ -5334,7 +5352,7 @@ const focusReplace = state => {
   // TODO
   return {
     ...state,
-    focus: 'replace',
+    focus: FindWidgetReplace,
     focusSource: Script
   };
 };
@@ -5342,7 +5360,7 @@ const focusFind = state => {
   // TODO
   return {
     ...state,
-    focus: 'find',
+    focus: FindWidget,
     focusSource: Script
   };
 };
@@ -5354,10 +5372,20 @@ const focusToggleReplace = async state => {
   await setFocus(FindWidgetToggleReplace);
   return {
     ...state,
-    focus: 'toggleReplace',
+    focus: FindWidgetToggleReplace,
     focusSource: Script
   };
 };
+const handleReplaceAllFocus = async state => {
+  if (state.focus === FindWidgetReplaceAll) {
+    return state;
+  }
+  await setFocus(FindWidgetReplaceAll);
+  return {
+    ...state,
+    focus: FindWidgetReplaceAll
+  };
+};
 
 const openFind2 = async editor => {
   const newStateGenerator = async state => {
@@ -5385,7 +5413,7 @@ const openFind2 = async editor => {
       height,
       editorUid: editor.uid || editor.id,
       focusSource: Script,
-      focus: 'find'
+      focus: FindWidget
     };
     return latestState;
   };
@@ -8863,21 +8891,23 @@ const commandMap = {
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
   'FindWidget.close': close$1,
+  'FindWidget.focusFind': focusFind,
   'FindWidget.focusFirst': focusFirst$1,
   'FindWidget.focusIndex': focusIndex$1,
   'FindWidget.focusLast': focusLast,
   'FindWidget.focusNext': focusNext$1,
   'FindWidget.focusPrevious': focusPrevious$1,
+  'FindWidget.focusReplace': focusReplace,
+  'FindWidget.focusToggleReplace': focusToggleReplace,
   'FindWidget.handleBlur': handleBlur,
   'FindWidget.handleFocus': handleFocus,
   'FindWidget.handleInput': handleInput,
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
+  'FindWidget.handleReplaceInput': handleReplaceInput,
   'FindWidget.loadContent': loadContent$1,
   'FindWidget.toggleReplace': toggleReplace,
-  'FindWidget.focusReplace': focusReplace,
-  'FindWidget.focusFind': focusFind,
-  'FindWidget.handleReplaceInput': handleReplaceInput,
-  'FindWidget.focusToggleReplace': focusToggleReplace,
+  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
+  'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
@@ -9951,6 +9981,24 @@ const replaceAll = () => {
   return i18nString(UiStrings.ReplaceAll);
 };
 
+// TODO always focus element by name
+const getFindWidgetFocusSelector = focus => {
+  switch (focus) {
+    case FindWidget:
+      return `[name="search-value"]`;
+    case FindWidgetReplace:
+      return '[name="replace-value"]';
+    case FindWidgetReplaceAll:
+      return `[name="replaceAll"]`;
+    case FindWidgetClose:
+      return `[name="close"]`;
+    case FindWidgetToggleReplace:
+      return `[name="ToggleReplace"]`;
+    default:
+      return '';
+  }
+};
+
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -10068,7 +10116,8 @@ const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
     name: 'ToggleReplace',
     childCount: 1,
     'data-command': 'toggleReplace',
-    onClick
+    onClick,
+    onFocus: 'handleToggleReplaceFocus'
   }, {
     type: Div,
     className: `MaskIcon ${replaceExpanded ? 'MaskIconChevronDown' : 'MaskIconChevronRight'}`,
@@ -10170,27 +10219,12 @@ const renderBounds = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-
-// TODO always focus element by name
-// TODO use numeric key
-const getKey = focus => {
-  switch (focus) {
-    case 'find':
-      return `[name="search-value"]`;
-    case 'replace':
-      return '[name="replace-value"]';
-    case 'toggleReplace':
-      return `[name="toggleReplace"]`;
-    default:
-      return '';
-  }
-};
 const renderFocus = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused && oldState.focus === newState.focus && oldState.focusSource === newState.focusSource;
   },
   apply(oldState, newState) {
-    const key = getKey(newState.focus || '');
+    const key = getFindWidgetFocusSelector(newState.focus);
     return ['focus', key, newState.focusSource];
   }
 };

package/package.json

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