@lvce-editor/find-widget-worker 1.3.0 → 1.5.0

package/dist/findWidgetWorkerMain.js

@@ -906,7 +906,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.version === newState.version;
+  return oldState.focused === newState.focused;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -922,9 +922,10 @@ const RenderEventListeners = 11;
 const RenderUid = 12;
 const RenderContent = 13;
 const RenderFocusContext = 14;
+const RenderFocus = 15;
 
-const modules = [isEqual$3, isEqual$1, isEqual$4, isEqual, isEqual$2];
-const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext];
+const modules = [isEqual$3, isEqual$1, isEqual$4, isEqual, isEqual$2, isEqual$2];
+const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -973,7 +974,10 @@ const focusIndex = (state, index) => {
   //   newState,
   // }
   // const newWidgets = [...widgets.slice(0, childIndex), newWidget, ...widgets.slice(childIndex + 1)]
-  return state;
+  return {
+    ...state,
+    matchIndex: index
+  };
 };
 const focusFirst = state => {
   return focusIndex(state, 0);
@@ -1095,11 +1099,14 @@ const getFindWidgetHeight = replaceExpanded => {
 };
 
 const toggleReplace = state => {
-  const newExpanded = !state.replaceExpanded;
+  const {
+    replaceExpanded
+  } = state;
+  const newExpanded = !replaceExpanded;
   const newHeight = getFindWidgetHeight(newExpanded);
   return {
     ...state,
-    replaceExpanded: !state.replaceExpanded,
+    replaceExpanded: newExpanded,
     height: newHeight
   };
 };
@@ -1218,7 +1225,10 @@ const loadContent = async state => {
     x,
     y,
     width,
-    height
+    height,
+    lines,
+    selections,
+    focused: true
   };
 };
 
@@ -1265,45 +1275,41 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-/**
- * @enum {string}
- */
-const UiStrings = {
-  MatchOf: '{PH1} of {PH2}',
-  NoResults: 'No Results',
-  Close: 'Close',
-  PreviousMatch: 'Previous Match',
-  NextMatch: 'Next Match',
-  Find: 'Find',
-  Replace: 'Replace',
-  ReplaceAll: 'Replace All'
-};
+const MatchOf = '{PH1} of {PH2}';
+const NoResults = 'No Results';
+const Close$2 = 'Close';
+const PreviousMatch = 'Previous Match';
+const NextMatch = 'Next Match';
+const Find$1 = 'Find';
+const Replace$2 = 'Replace';
+const ReplaceAll$2 = 'Replace All';
+
 const noResults = () => {
-  return i18nString(UiStrings.NoResults);
+  return i18nString(NoResults);
 };
 const matchOf = (matchIndex, matchCount) => {
-  return i18nString(UiStrings.MatchOf, {
+  return i18nString(MatchOf, {
     PH1: matchIndex,
     PH2: matchCount
   });
 };
 const previousMatch = () => {
-  return i18nString(UiStrings.PreviousMatch);
+  return i18nString(PreviousMatch);
 };
 const nextMatch = () => {
-  return i18nString(UiStrings.NextMatch);
+  return i18nString(NextMatch);
 };
 const close = () => {
-  return i18nString(UiStrings.Close);
+  return i18nString(Close$2);
 };
 const find = () => {
-  return i18nString(UiStrings.Find);
+  return i18nString(Find$1);
 };
 const replace = () => {
-  return i18nString(UiStrings.Replace);
+  return i18nString(Replace$2);
 };
 const replaceAll = () => {
-  return i18nString(UiStrings.ReplaceAll);
+  return i18nString(ReplaceAll$2);
 };
 
 const ArrowDown = 'ArrowDown';
@@ -1637,6 +1643,13 @@ const renderEventListeners = state => {
   return [SetEventListeners, uid, eventListeners];
 };
 
+const renderFocus = (oldState, newState) => {
+  const {
+    uid
+  } = newState;
+  return [/* method */'Viewlet.focusSelector', uid, `[name="search-value"]`];
+};
+
 const FocusFindWidget = 16;
 
 const renderFocusContext = (oldState, newState) => {
@@ -1663,6 +1676,8 @@ const getRenderer = diffType => {
       return renderUid;
     case RenderFocusContext:
       return renderFocusContext;
+    case RenderFocus:
+      return renderFocus;
     default:
       throw new Error('unknown renderer');
   }
@@ -1694,19 +1709,19 @@ const terminate = () => {
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
-  'FindWidget.focusFirst': focusFirst,
-  'FindWidget.focusIndex': focusIndex,
-  'FindWidget.focusLast': focusLast,
-  'FindWidget.focusNext': focusNext,
-  'FindWidget.focusPrevious': focusPrevious,
+  'FindWidget.focusFirst': wrapCommand(focusFirst),
+  'FindWidget.focusIndex': wrapCommand(focusIndex),
+  'FindWidget.focusLast': wrapCommand(focusLast),
+  'FindWidget.focusNext': wrapCommand(focusNext),
+  'FindWidget.focusPrevious': wrapCommand(focusPrevious),
   'FindWidget.getCommandIds': getCommandIds,
-  'FindWidget.handleBlur': handleBlur,
-  'FindWidget.handleClickClose': handleClickClose,
-  'FindWidget.handleInput': handleInput,
+  'FindWidget.handleBlur': wrapCommand(handleBlur),
+  'FindWidget.handleClickClose': wrapCommand(handleClickClose),
+  'FindWidget.handleInput': wrapCommand(handleInput),
   'FindWidget.loadContent': wrapCommand(loadContent),
   'FindWidget.render2': render2,
   'FindWidget.terminate': terminate,
-  'FindWidget.toggleReplace': toggleReplace
+  'FindWidget.toggleReplace': wrapCommand(toggleReplace)
 };
 
 const listen = async () => {

package/package.json

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