@lvce-editor/find-widget-worker 1.20.0 → 1.22.0

package/dist/findWidgetWorkerMain.js

@@ -989,24 +989,28 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
   return state;
 };
 
-const isEqual$6 = (oldState, newState) => {
+const isEqual$7 = (oldState, newState) => {
   return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
 };
 
-const isEqual$5 = (oldState, newState) => {
+const isEqual$6 = (oldState, newState) => {
   return newState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x;
 };
 
-const isEqual$4 = (oldState, newState) => {
+const isEqual$5 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
+const isEqual$4 = (oldState, newState) => {
+  return oldState.focused === newState.focused && oldState.focus === newState.focus;
+};
+
 const isEqual$3 = (oldState, newState) => {
   return oldState.focused === newState.focused;
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.version === newState.version && oldState.replaceExpanded === newState.replaceExpanded && oldState.matchCount === newState.matchCount && oldState.matchIndex === newState.matchIndex;
+  return oldState.version === newState.version && oldState.replaceExpanded === newState.replaceExpanded && oldState.matchCount === newState.matchCount && oldState.matchIndex === newState.matchIndex && oldState.matchCase === newState.matchCase && oldState.matchWholeWord === newState.matchWholeWord && oldState.useRegularExpression === newState.useRegularExpression && oldState.preserveCase === newState.preserveCase;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -1046,11 +1050,26 @@ const SetCss = 'Viewlet.setCss';
 const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
+const FocusFindWidgetCloseButton$1 = 48;
+const FocusIgnoreFiles = 1012;
+const FocusSearchExcludeInput = 1008;
+const FocusSearchIncludeInput = 1007;
+const FocusSearchInput = 21;
+const FocusSearchMatchCase = 32;
+const FocusSearchOpenEditors = 1011;
+const FocusSearchPreserveCase = 36;
+const FocusSearchRegex = 33;
+const FocusSearchReplaceAll = 35;
+const FocusSearchReplaceInput = 31;
+const FocusSearchWholeWord = 34;
+const FocusToggleDetails = 1010;
+const FocusToggleReplace = 1020;
+
 const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.value === newState.value;
 };
 
-const modules = [isEqual$4, isEqual$2, isEqual$6, isEqual$1, isEqual$3, isEqual$3, isEqual, isEqual$5];
+const modules = [isEqual$5, isEqual$2, isEqual$7, isEqual$1, isEqual$3, isEqual$4, isEqual, isEqual$6];
 const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus, RenderValue, RenderCss];
 
 const diff = (oldState, newState) => {
@@ -1627,6 +1646,108 @@ const toggleReplace$1 = state => {
   };
 };
 
+const focusElement = (state, whenExpression) => {
+  return {
+    ...state,
+    focus: whenExpression,
+    focusSource: Script
+  };
+};
+
+const getNextFocus = (focus, replaceExpanded) => {
+  switch (focus) {
+    case FocusToggleReplace:
+      return FocusSearchInput;
+    case FocusSearchInput:
+      if (replaceExpanded) {
+        return FocusSearchReplaceInput;
+      }
+      return FocusSearchMatchCase;
+    case FocusSearchMatchCase:
+      return FocusSearchWholeWord;
+    case FocusSearchWholeWord:
+      return FocusSearchRegex;
+    case FocusSearchRegex:
+      if (replaceExpanded) {
+        return FocusSearchPreserveCase;
+      }
+      return FocusFindWidgetCloseButton$1;
+    case FocusSearchReplaceInput:
+      return FocusSearchMatchCase;
+    case FocusSearchPreserveCase:
+      return FocusSearchReplaceAll;
+    case FocusSearchReplaceAll:
+      return FocusToggleDetails;
+    case FocusSearchIncludeInput:
+      return FocusSearchOpenEditors;
+    case FocusSearchOpenEditors:
+      return FocusSearchExcludeInput;
+    case FocusSearchExcludeInput:
+      return FocusIgnoreFiles;
+    case FocusToggleDetails:
+      return FocusSearchIncludeInput;
+    default:
+      return focus;
+  }
+};
+
+const focusNextElement = state => {
+  const {
+    focus,
+    replaceExpanded
+  } = state;
+  const nextFocus = getNextFocus(focus, replaceExpanded);
+  return focusElement(state, nextFocus);
+};
+
+const getPreviousFocus = (focus, replaceExpanded) => {
+  switch (focus) {
+    case FocusSearchInput:
+      return FocusToggleReplace;
+    case FocusSearchMatchCase:
+      if (replaceExpanded) {
+        return FocusSearchReplaceInput;
+      }
+      return FocusSearchInput;
+    case FocusSearchWholeWord:
+      return FocusSearchMatchCase;
+    case FocusSearchRegex:
+      return FocusSearchWholeWord;
+    case FocusSearchPreserveCase:
+      return FocusSearchRegex;
+    case FocusSearchReplaceInput:
+      return FocusSearchInput;
+    case FocusSearchReplaceAll:
+      return FocusSearchPreserveCase;
+    case FocusToggleDetails:
+      if (replaceExpanded) {
+        return FocusSearchReplaceAll;
+      }
+      return FocusSearchRegex;
+    case FocusSearchOpenEditors:
+      return FocusSearchIncludeInput;
+    case FocusSearchExcludeInput:
+      return FocusSearchOpenEditors;
+    case FocusIgnoreFiles:
+      return FocusSearchExcludeInput;
+    case FocusSearchIncludeInput:
+      return FocusToggleDetails;
+    case FocusFindWidgetCloseButton$1:
+      return FocusSearchRegex;
+    default:
+      return focus;
+  }
+};
+
+const focusPreviousElement = state => {
+  const {
+    focus,
+    replaceExpanded
+  } = state;
+  const previousFocus = getPreviousFocus(focus, replaceExpanded);
+  return focusElement(state, previousFocus);
+};
+
 const handleReplaceInput = (state, value, inputSource = User) => {
   return {
     ...state,
@@ -1735,6 +1856,7 @@ const loadContent = async (state, savedState) => {
   const matchCount = getMatchCount(matches);
   return {
     ...state,
+    focus: FocusSearchInput,
     focused: true,
     height,
     inputSource: Script,
@@ -2262,11 +2384,39 @@ const renderEventListeners = state => {
   return [SetEventListeners, uid, eventListeners];
 };
 
+const getFocusSelector = focusKey => {
+  switch (focusKey) {
+    case FocusSearchInput:
+      return SearchValue;
+    case FocusSearchReplaceInput:
+      return ReplaceValue;
+    case FocusSearchMatchCase:
+      return MatchCase$2;
+    case FocusSearchPreserveCase:
+      return PreserveCase$1;
+    case FocusSearchRegex:
+      return UseRegularExpression$2;
+    case FocusSearchWholeWord:
+      return MatchWholeWord$2;
+    case FocusSearchReplaceAll:
+      return ReplaceAll$2;
+    case FocusToggleReplace:
+      return ToggleReplace$1;
+    case FocusFindWidgetCloseButton$1:
+      return Close$2;
+    default:
+      return '';
+  }
+};
+
 const renderFocus = (oldState, newState) => {
   const {
-    uid
+    uid,
+    focus
   } = newState;
-  return [/* method */FocusSelector, uid, `[name="search-value"]`];
+  const name = getFocusSelector(focus);
+  const selector = `[name="${name}"]`;
+  return [FocusSelector, uid, selector];
 };
 
 const FocusFindWidget = 16;
@@ -2374,10 +2524,13 @@ const commandMap = {
   'FindWidget.dispose': dispose$1,
   'FindWidget.focusCloseButton': wrapCommand(focusCloseButton),
   'FindWidget.focusFirst': wrapCommand(focusFirst),
+  'FindWidget.focusElement': wrapCommand(focusElement),
   'FindWidget.focusIndex': wrapCommand(focusIndex),
   'FindWidget.focusLast': wrapCommand(focusLast),
   'FindWidget.focusNext': wrapCommand(focusNext),
   'FindWidget.focusPrevious': wrapCommand(focusPrevious),
+  'FindWidget.focusNextElement': wrapCommand(focusNextElement),
+  'FindWidget.focusPreviousElement': wrapCommand(focusPreviousElement),
   'FindWidget.focusReplace': wrapCommand(focusReplace),
   'FindWidget.focusReplaceAllButton': wrapCommand(focusReplaceAllButton),
   'FindWidget.getCommandIds': getCommandIds,

package/package.json

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