@lvce-editor/find-widget-worker 3.13.0 → 3.13.1

package/dist/findWidgetWorkerMain.js

@@ -889,6 +889,7 @@ const SetCss = 'Viewlet.setCss';
 const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
+const Empty = 0;
 const FocusFindWidget$1 = 16;
 const FocusFindWidgetCloseButton$1 = 48;
 const FocusFindWidgetNextMatchButton$1 = 49;
@@ -1209,11 +1210,14 @@ const isEqual$6 = (oldState, newState) => {
 };
 
 const isEqual$5 = (oldState, newState) => {
+  if (newState.focusSource === User) {
+    return true;
+  }
   return oldState.focused === newState.focused && oldState.focus === newState.focus && oldState.focusVersion === newState.focusVersion;
 };
 
 const isEqual$4 = (oldState, newState) => {
-  return oldState.focused === newState.focused;
+  return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
 const isEqual$3 = (oldState, newState) => {
@@ -1279,9 +1283,9 @@ const disposeInstance = instanceId => {
   return disposeInstance$1(instanceId);
 };
 
-const FindWidget$1 = 16;
 const FocusFindWidgetCloseButton = 48;
 const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetOptions = 44;
 const FocusFindWidgetPreviousMatchButton = 50;
 const FocusFindWidgetReplace = 43;
 const FocusFindWidgetReplaceAllButton = 47;
@@ -1755,6 +1759,9 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, pr
       startOffset
     });
   }
+  if (replaceAll) {
+    edits.reverse();
+  }
   return edits;
 };
 
@@ -1842,6 +1849,10 @@ const replaceAll$1 = async state => {
 
 const getClickHandler = name => {
   switch (name) {
+    case FocusNext:
+      return focusNext;
+    case FocusPrevious:
+      return focusPrevious;
     case MatchCase$2:
       return toggleMatchCase;
     case MatchWholeWord$2:
@@ -1859,13 +1870,35 @@ const getClickHandler = name => {
   }
 };
 
-const handleClickButton = async (state, name) => {
-  const fn = getClickHandler(name);
-  return fn(state);
-};
-
-const handleClickClose = state => {
-  return close$1(state);
+const getFindWidgetFocusKey = name => {
+  switch (name) {
+    case Close$2:
+      return FocusFindWidgetCloseButton$1;
+    case FocusNext:
+      return FocusFindWidgetNextMatchButton$1;
+    case FocusPrevious:
+      return FocusFindWidgetPreviousMatchButton$1;
+    case MatchCase$2:
+      return FocusSearchMatchCase;
+    case MatchWholeWord$2:
+      return FocusSearchWholeWord;
+    case PreserveCase$1:
+      return FocusSearchPreserveCase;
+    case Replace$2:
+      return FocusFindWidgetReplaceButton$1;
+    case ReplaceAll$2:
+      return FocusFindWidgetReplaceAllButton$1;
+    case ReplaceValue:
+      return FocusSearchReplaceInput;
+    case SearchValue:
+      return FocusSearchInput;
+    case ToggleReplace$1:
+      return FocusToggleReplace;
+    case UseRegularExpression$2:
+      return FocusSearchRegex;
+    default:
+      return Empty;
+  }
 };
 
 const handleFindWidgetFocus = (state, focusKey) => {
@@ -1882,13 +1915,25 @@ const handleFindWidgetFocus = (state, focusKey) => {
   };
 };
 
-const handleFindFocus = state => {
-  return handleFindWidgetFocus(state, FindWidget$1);
+const handleClickButton = async (state, name) => {
+  const fn = getClickHandler(name);
+  const newState = await fn(state);
+  const focusKey = getFindWidgetFocusKey(name);
+  return handleFindWidgetFocus(newState, focusKey);
+};
+
+const handleClickClose = state => {
+  return close$1(state);
+};
+
+const handleFindFocus = (state, name) => {
+  const focusKey = getFindWidgetFocusKey(name);
+  return handleFindWidgetFocus(state, focusKey);
 };
 
 // TODO maybe use one handleFocus function with a name parameter
 const handleReplaceFocus = state => {
-  return handleFindWidgetFocus(state, FocusFindWidgetReplace);
+  return handleFindWidgetFocus(state, FocusSearchReplaceInput);
 };
 
 const handleResizerPointerDown = async (state, eventX, eventY) => {
@@ -1935,7 +1980,7 @@ const handleResizerPointerUp = async (state, eventX, eventY) => {
 };
 
 const handleToggleReplaceFocus = state => {
-  return handleFindWidgetFocus(state, FocusFindWidgetToggleReplace);
+  return handleFindWidgetFocus(state, FocusToggleReplace);
 };
 
 const toggleReplace$1 = state => {
@@ -1969,6 +2014,19 @@ const focusElement = (state, whenExpression) => {
 
 const getNextFocus = (focus, replaceExpanded) => {
   switch (focus) {
+    case FocusFindWidgetCloseButton$1:
+      if (replaceExpanded) {
+        return FocusFindWidgetReplaceButton$1;
+      }
+      return FocusToggleReplace;
+    case FocusFindWidgetNextMatchButton$1:
+      return FocusFindWidgetCloseButton$1;
+    case FocusFindWidgetPreviousMatchButton$1:
+      return FocusFindWidgetNextMatchButton$1;
+    case FocusFindWidgetReplaceAllButton$1:
+      return FocusToggleReplace;
+    case FocusFindWidgetReplaceButton$1:
+      return FocusFindWidgetReplaceAllButton$1;
     case FocusSearchExcludeInput:
       return FocusIgnoreFiles;
     case FocusSearchIncludeInput:
@@ -1983,12 +2041,12 @@ const getNextFocus = (focus, replaceExpanded) => {
     case FocusSearchOpenEditors:
       return FocusSearchExcludeInput;
     case FocusSearchPreserveCase:
-      return FocusSearchReplaceAll;
+      return FocusFindWidgetPreviousMatchButton$1;
     case FocusSearchRegex:
       if (replaceExpanded) {
         return FocusSearchPreserveCase;
       }
-      return FocusFindWidgetCloseButton$1;
+      return FocusFindWidgetPreviousMatchButton$1;
     case FocusSearchReplaceAll:
       return FocusToggleDetails;
     case FocusSearchReplaceInput:
@@ -2016,7 +2074,18 @@ const focusNextElement = state => {
 const getPreviousFocus = (focus, replaceExpanded) => {
   switch (focus) {
     case FocusFindWidgetCloseButton$1:
+      return FocusFindWidgetNextMatchButton$1;
+    case FocusFindWidgetNextMatchButton$1:
+      return FocusFindWidgetPreviousMatchButton$1;
+    case FocusFindWidgetPreviousMatchButton$1:
+      if (replaceExpanded) {
+        return FocusSearchPreserveCase;
+      }
       return FocusSearchRegex;
+    case FocusFindWidgetReplaceAllButton$1:
+      return FocusFindWidgetReplaceButton$1;
+    case FocusFindWidgetReplaceButton$1:
+      return FocusFindWidgetCloseButton$1;
     case FocusIgnoreFiles:
       return FocusSearchExcludeInput;
     case FocusSearchExcludeInput:
@@ -2047,6 +2116,11 @@ const getPreviousFocus = (focus, replaceExpanded) => {
         return FocusSearchReplaceAll;
       }
       return FocusSearchRegex;
+    case FocusToggleReplace:
+      if (replaceExpanded) {
+        return FocusFindWidgetReplaceAllButton$1;
+      }
+      return FocusFindWidgetCloseButton$1;
     default:
       return focus;
   }
@@ -2061,6 +2135,18 @@ const focusPreviousElement = state => {
   return focusElement(state, previousFocus);
 };
 
+const focusContexts = [FocusFindWidget$1, FocusFindWidgetReplace$1, FocusFindWidgetOptions, FocusFindWidgetPreviousMatchButton$1, FocusFindWidgetNextMatchButton$1, FocusFindWidgetCloseButton$1, FocusFindWidgetReplaceButton$1, FocusFindWidgetReplaceAllButton$1, FocusFindWidgetToggleReplace];
+const getFocusNavigationKeyBindings = () => {
+  return focusContexts.flatMap(when => [{
+    command: 'FindWidget.focusNextElement',
+    key: Tab,
+    when
+  }, {
+    command: 'FindWidget.focusPreviousElement',
+    key: Shift | Tab,
+    when
+  }]);
+};
 const getKeyBindings = () => {
   return [{
     command: 'FindWidget.close',
@@ -2086,18 +2172,6 @@ const getKeyBindings = () => {
     command: 'FindWidget.focusNext',
     key: F4,
     when: FocusFindWidget$1
-  }, {
-    command: 'FindWidget.focusToggleReplace',
-    key: Shift | Tab,
-    when: FocusFindWidget$1
-  }, {
-    command: 'FindWidget.focusReplace',
-    key: Tab,
-    when: FocusFindWidget$1
-  }, {
-    command: 'FindWidget.focusPreviousMatchButton',
-    key: Tab,
-    when: FocusFindWidgetReplace$1
   }, {
     command: 'FindWidget.replace',
     key: Enter,
@@ -2106,51 +2180,19 @@ const getKeyBindings = () => {
     command: 'FindWidget.replaceAll',
     key: Alt | CtrlCmd | Enter,
     when: FocusFindWidgetReplace$1
-  }, {
-    command: 'FindWidget.focusNextMatchButton',
-    key: Tab,
-    when: FocusFindWidgetPreviousMatchButton$1
-  }, {
-    command: 'FindWidget.focusReplace',
-    key: Shift | Tab,
-    when: FocusFindWidgetPreviousMatchButton$1
-  }, {
-    command: 'FindWidget.focusPreviousMatchButton',
-    key: Shift | Tab,
-    when: FocusFindWidgetNextMatchButton$1
-  }, {
-    command: 'FindWidget.focusCloseButton',
-    key: Tab,
-    when: FocusFindWidgetNextMatchButton$1
-  }, {
-    command: 'FindWidget.focusNextMatchButton',
-    key: Shift | Tab,
-    when: FocusFindWidgetCloseButton$1
-  }, {
-    command: 'FindWidget.focusReplaceButton',
-    key: Tab,
-    when: FocusFindWidgetCloseButton$1
-  }, {
-    command: 'FindWidget.focusFind',
-    key: Shift | Tab,
-    when: FocusFindWidgetReplace$1
-  }, {
-    command: 'FindWidget.focusReplaceAllButton',
-    key: Tab,
-    when: FocusFindWidgetReplaceButton$1
-  }, {
-    command: 'FindWidget.focusCloseButton',
-    key: Shift | Tab,
-    when: FocusFindWidgetReplaceButton$1
-  }, {
-    command: 'FindWidget.focusReplaceButton',
-    key: Shift | Tab,
-    when: FocusFindWidgetReplaceAllButton$1
-  }];
+  }, ...getFocusNavigationKeyBindings()];
 };
 
 const handleInput = (state, value, inputSource = User$1) => {
-  return refresh(state, value, inputSource);
+  const newState = refresh(state, value, inputSource);
+  if (inputSource !== User$1) {
+    return newState;
+  }
+  return {
+    ...newState,
+    focus: FocusSearchInput,
+    focusSource: User
+  };
 };
 
 const handleReplaceInput = (state, value, inputSource = User$1) => {
@@ -2432,13 +2474,13 @@ const getFindWidgetButtons = (findButtonsEnabled, replaceButtonsEnabled, matchCa
     icon: ArrowUp,
     label: previousMatch(),
     name: FocusPrevious,
-    onClick: HandleClickPreviousMatch
+    onClick: HandleClickButton
   }, {
     disabled: !findButtonsEnabled,
     icon: ArrowDown,
     label: nextMatch(),
     name: FocusNext,
-    onClick: HandleClickNextMatch
+    onClick: HandleClickButton
   }, {
     disabled: false,
     icon: Close,
@@ -2662,7 +2704,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replace
     childCount: 1 + replaceButtons.length,
     className: FindWidgetReplace,
     type: Div
-  }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus, extraClassName, replaceInputFocused), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
+  }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, replaceFieldButtons, [], HandleReplaceFocus, extraClassName, replaceInputFocused), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
 };
 
 const resizerNode = {
@@ -2844,6 +2886,14 @@ const getFocusSelector = focusKey => {
   switch (focusKey) {
     case FocusFindWidgetCloseButton$1:
       return Close$2;
+    case FocusFindWidgetNextMatchButton$1:
+      return FocusNext;
+    case FocusFindWidgetPreviousMatchButton$1:
+      return FocusPrevious;
+    case FocusFindWidgetReplaceAllButton$1:
+      return ReplaceAll$2;
+    case FocusFindWidgetReplaceButton$1:
+      return Replace$2;
     case FocusSearchInput:
       return SearchValue;
     case FocusSearchMatchCase:
@@ -2877,8 +2927,24 @@ const renderFocus = (oldState, newState) => {
 
 const FocusFindWidget = 16;
 
+const optionFocusContexts = [FocusSearchMatchCase, FocusSearchPreserveCase, FocusSearchRegex, FocusSearchWholeWord];
 const renderFocusContext = (oldState, newState) => {
-  return [/* method */SetFocusContext, FocusFindWidget];
+  const {
+    focus
+  } = newState;
+  if (focus === FocusSearchReplaceInput) {
+    return [/* method */SetFocusContext, FocusFindWidgetReplace];
+  }
+  if (focus === FocusSearchInput || !focus) {
+    return [/* method */SetFocusContext, FocusFindWidget];
+  }
+  if (focus === FocusToggleReplace) {
+    return [/* method */SetFocusContext, FocusFindWidgetToggleReplace];
+  }
+  if (optionFocusContexts.includes(focus)) {
+    return [/* method */SetFocusContext, FocusFindWidgetOptions];
+  }
+  return [/* method */SetFocusContext, focus];
 };
 
 const renderReplaceValue = (oldState, newState) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/find-widget-worker",
-  "version": "3.13.0",
+  "version": "3.13.1",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",