@lvce-editor/editor-worker 3.10.0 → 3.12.0

package/dist/editorWorkerMain.js

@@ -121,7 +121,7 @@ const IconButtonDisabled = 'IconButtonDisabled';
 const IconButton = 'IconButton';
 const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
-const FindWidgetReplace = 'FindWidgetReplace';
+const FindWidgetReplace$1 = 'FindWidgetReplace';
 const FindWidgetFind = 'FindWidgetFind';
 const FindWidgetMatchCount = 'FindWidgetMatchCount';
 const FindWidgetRight = 'FindWidgetRight';
@@ -2503,6 +2503,11 @@ const ColorPicker = 41;
 const FindWidget = 16;
 const EditorCompletion = 9;
 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);
@@ -5068,6 +5073,10 @@ const openCompletion = async editor => {
   };
 };
 
+const User = 1;
+const Script = 2;
+const Unknown$1 = 0;
+
 const create$1 = () => {
   const uid = create$4();
   const widget = {
@@ -5089,7 +5098,9 @@ const create$1 = () => {
       y: 0,
       width: 0,
       height: 0,
-      focused: false
+      focused: false,
+      focusSource: Unknown$1,
+      focus: 0
     },
     newState: {
       value: '',
@@ -5108,7 +5119,9 @@ const create$1 = () => {
       y: 0,
       width: 0,
       height: 0,
-      focused: true
+      focused: true,
+      focusSource: Unknown$1,
+      focus: 0
     }
   };
   return widget;
@@ -5128,6 +5141,9 @@ const getSearchRegex = searchString => {
 };
 
 const findRegexMatches = (lines, regex) => {
+  if (!regex.global) {
+    throw new Error(`regex must be global`);
+  }
   const {
     length
   } = lines;
@@ -5154,10 +5170,21 @@ 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 setFocus = async focusKey => {
+  await invoke$3('Focus.setFocus', focusKey);
+};
+
 const getPosition = editor => {
   const width = 300;
   const height = 30;
@@ -5217,20 +5244,22 @@ const handleInput = (state, value) => {
   return refresh(state, value);
 };
 const handleFocus = async state => {
-  const FindWidget = 16;
-  await invoke$3('Focus.setFocus', FindWidget);
-  return state;
+  if (state.focus === FindWidget) {
+    return state;
+  }
+  await setFocus(FindWidget);
+  return {
+    ...state,
+    focus: FindWidget
+  };
 };
 const handleBlur = async state => {
-  const Empty = 0;
-  await invoke$3('Focus.setFocus', Empty);
+  await setFocus(Empty);
   return state;
 };
 const toggleReplace = state => {
   const newExpanded = !state.replaceExpanded;
-  const collapsedHeight = 30;
-  const expandedHeight = 60;
-  const newHeight = newExpanded ? expandedHeight : collapsedHeight;
+  const newHeight = getFindWidgetHeight(newExpanded);
   return {
     ...state,
     replaceExpanded: !state.replaceExpanded,
@@ -5298,6 +5327,65 @@ 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 === FindWidgetReplace) {
+    return state;
+  }
+  await setFocus(FindWidgetReplace);
+  return {
+    ...state,
+    focus: FindWidgetReplace,
+    focusSource: User
+  };
+};
+const focusReplace = state => {
+  // TODO
+  return {
+    ...state,
+    focus: FindWidgetReplace,
+    focusSource: Script
+  };
+};
+const focusFind = state => {
+  // TODO
+  return {
+    ...state,
+    focus: FindWidget,
+    focusSource: Script
+  };
+};
+const handleReplaceInput = state => {
+  // TODO
+  return state;
+};
+const focusToggleReplace = async state => {
+  await setFocus(FindWidgetToggleReplace);
+  return {
+    ...state,
+    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 => {
@@ -5323,7 +5411,9 @@ const openFind2 = async editor => {
       y,
       width,
       height,
-      editorUid: editor.uid || editor.id
+      editorUid: editor.uid || editor.id,
+      focusSource: Script,
+      focus: FindWidget
     };
     return latestState;
   };
@@ -8628,7 +8718,10 @@ const widgetCommands = {
   'FindWidget.handleToggleReplaceFocus': Find,
   'FindWidget.handleInput': Find,
   'FindWidget.handleReplaceInput': Find,
-  'FindWidget.handleReplaceFocus': Find
+  'FindWidget.handleReplaceFocus': Find,
+  'FindWidget.focusFind': Find,
+  'FindWidget.focusToggleReplace': Find,
+  'FindWidget.focusReplace': Find
 };
 
 // TODO wrap commands globally, not per editor
@@ -8797,17 +8890,24 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent,
   '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.handleInput': handleInput,
-  'FindWidget.handleFocus': handleFocus,
+  'FindWidget.focusReplace': focusReplace,
+  'FindWidget.focusToggleReplace': focusToggleReplace,
   'FindWidget.handleBlur': handleBlur,
-  'FindWidget.toggleReplace': toggleReplace,
-  'FindWidget.close': close$1,
+  'FindWidget.handleFocus': handleFocus,
+  'FindWidget.handleInput': handleInput,
+  'FindWidget.handleReplaceFocus': handleReplaceFocus,
+  'FindWidget.handleReplaceInput': handleReplaceInput,
   'FindWidget.loadContent': loadContent$1,
+  'FindWidget.toggleReplace': toggleReplace,
+  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
+  'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
@@ -9881,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,
@@ -9981,7 +10099,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
   if (replaceExpanded) {
     dom.push({
       type: Div,
-      className: FindWidgetReplace,
+      className: FindWidgetReplace$1,
       childCount: 1 + replaceButtons.length
     }, ...getSearchFieldVirtualDom('replace-value', replace(), 'handleReplaceInput', [], [], 'handleReplaceFocus'), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
@@ -9995,9 +10113,11 @@ const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
     title: 'Toggle Replace',
     ariaLabel: 'Toggle Replace',
     ariaExpanded: replaceExpanded,
+    name: 'ToggleReplace',
     childCount: 1,
     'data-command': 'toggleReplace',
-    onClick
+    onClick,
+    onFocus: 'handleToggleReplaceFocus'
   }, {
     type: Div,
     className: `MaskIcon ${replaceExpanded ? 'MaskIconChevronDown' : 'MaskIconChevronRight'}`,
@@ -10101,10 +10221,11 @@ const renderBounds = {
 };
 const renderFocus = {
   isEqual(oldState, newState) {
-    return oldState.focused === newState.focused;
+    return oldState.focused === newState.focused && oldState.focus === newState.focus && oldState.focusSource === newState.focusSource;
   },
   apply(oldState, newState) {
-    return ['focus', newState.focused];
+    const key = getFindWidgetFocusSelector(newState.focus);
+    return ['focus', key, newState.focusSource];
   }
 };
 // const getAriaLabel = (state: FindWidgetState) => {

package/package.json

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