@lvce-editor/find-widget-worker 1.4.0 → 1.6.0

package/dist/findWidgetWorkerMain.js

@@ -862,6 +862,7 @@ const {
   wrapCommand
 } = create$2();
 
+const Script$1 = 2;
 const Unknown = 0;
 
 const create$1 = (uid, x, y, width, height, parentUid) => {
@@ -891,29 +892,30 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     editorX: x,
     editorY: y,
     editorWidth: width,
-    editorHeight: height
+    editorHeight: height,
+    inputSource: 0
   };
   set$1(uid, state, state);
   return state;
 };
 
-const isEqual$4 = (oldState, newState) => {
+const isEqual$5 = (oldState, newState) => {
   return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
 };
 
-const isEqual$3 = (oldState, newState) => {
+const isEqual$4 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
-const isEqual$2 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return oldState.focused === newState.focused;
 };
 
-const isEqual$1 = (oldState, newState) => {
+const isEqual$2 = (oldState, newState) => {
   return oldState.version === newState.version && oldState.replaceExpanded === newState.replaceExpanded && oldState.matchCount === newState.matchCount && oldState.matchIndex === newState.matchIndex;
 };
 
-const isEqual = (oldState, newState) => {
+const isEqual$1 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
@@ -923,9 +925,17 @@ const RenderUid = 12;
 const RenderContent = 13;
 const RenderFocusContext = 14;
 const RenderFocus = 15;
+const RenderValue = 16;
 
-const modules = [isEqual$3, isEqual$1, isEqual$4, isEqual, isEqual$2, isEqual$2];
-const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus];
+const Script = 1;
+const User = 2;
+
+const isEqual = (oldState, newState) => {
+  return newState.inputSource === User || oldState.value === newState.value;
+};
+
+const modules = [isEqual$4, isEqual$2, isEqual$5, isEqual$1, isEqual$3, isEqual$3, isEqual];
+const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus, RenderValue];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -947,6 +957,25 @@ const diff2 = uid => {
   return diffResult;
 };
 
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+
+const setFindWidgetFocus = (state, focusKey) => {
+  if (state.focus === focusKey) {
+    return state;
+  }
+  return {
+    ...state,
+    focus: focusKey,
+    focusSource: Script$1
+  };
+};
+
+const focusCloseButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
+};
+
 // TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
 const focusIndex = (state, index) => {
@@ -974,7 +1003,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);
@@ -1005,6 +1037,14 @@ const focusPrevious = state => {
   return focusIndex(state, matchIndex - 1);
 };
 
+const focusReplace = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplace);
+};
+
+const focusReplaceAllButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplaceAllButton);
+};
+
 const handleBlur = async state => {
   return {
     ...state,
@@ -1076,7 +1116,8 @@ const refresh$1 = (state, value) => {
     matches,
     matchIndex: 0,
     matchCount,
-    value
+    value,
+    inputSource: User
   };
 };
 
@@ -1180,6 +1221,15 @@ const getLines = async editorUid => {
   return lines;
 };
 
+const getSelectedText = (lines, selections) => {
+  const startRowIndex = selections[0];
+  const startColumnIndex = selections[1];
+  const endColumnIndex = selections[3];
+  const line = lines[startRowIndex];
+  const value = line.slice(startColumnIndex, endColumnIndex);
+  return value;
+};
+
 const getSelections = async editorUid => {
   // @ts-ignore
   const selections = await invoke('Editor.getSelections2', editorUid);
@@ -1205,11 +1255,7 @@ const loadContent = async state => {
   if (lines.length === 0) {
     return state;
   }
-  const startRowIndex = selections[0];
-  const startColumnIndex = selections[1];
-  const endColumnIndex = selections[3];
-  const line = lines[startRowIndex];
-  const value = line.slice(startColumnIndex, endColumnIndex);
+  const value = getSelectedText(lines, selections);
   const matches = findMatchesCaseInsensitive(lines, value);
   const matchCount = getMatchCount(matches);
   return {
@@ -1225,7 +1271,8 @@ const loadContent = async state => {
     height,
     lines,
     selections,
-    focused: true
+    focused: true,
+    inputSource: Script
   };
 };
 
@@ -1272,45 +1319,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';
@@ -1319,6 +1362,9 @@ const Close$1 = 'Close';
 const Replace$1 = 'Replace';
 const ReplaceAll$1 = 'ReplaceAll';
 
+const ToggleReplace = 'ToggleReplace';
+const SearchValue = 'search-value';
+const ReplaceValue = 'replace-value';
 const ReplaceAll = 'ReplaceAll';
 const Close = 'Close';
 const FocusNext = 'FocusNext';
@@ -1390,6 +1436,10 @@ const SearchField = 'SearchField';
 const SearchFieldButton = 'SearchFieldButton';
 const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
 const SearchFieldButtons = 'SearchFieldButtons';
+const Viewlet = 'Viewlet';
+const ViewletFind = 'ViewletFind';
+const FindWidget = 'FindWidget';
+const ViewletFindWidget = 'ViewletFindWidget';
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -1520,13 +1570,11 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
       type: Div,
       className: FindWidgetReplace,
       childCount: 1 + replaceButtons.length
-    }, ...getSearchFieldVirtualDom('replace-value', replace(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
+    }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
   return dom;
 };
 
-const ToggleReplace = 'ToggleReplace';
-
 const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
   return [{
     type: Button,
@@ -1550,7 +1598,7 @@ const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, r
   const dom = [];
   dom.push({
     type: Div,
-    className: 'Viewlet ViewletFind ViewletFindWidget FindWidget',
+    className: mergeClassNames(Viewlet, ViewletFind, ViewletFindWidget, FindWidget),
     childCount: 2,
     role: Group
   });
@@ -1665,6 +1713,14 @@ const renderUid = (oldState, newState) => {
   return [SetUid, uid, editorUid];
 };
 
+const renderValue = (oldState, newState) => {
+  const {
+    uid,
+    value
+  } = newState;
+  return [/* method */'Viewlet.setValueByName', uid, SearchValue, value];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderContent:
@@ -1679,6 +1735,8 @@ const getRenderer = diffType => {
       return renderFocusContext;
     case RenderFocus:
       return renderFocus;
+    case RenderValue:
+      return renderValue;
     default:
       throw new Error('unknown renderer');
   }
@@ -1710,11 +1768,14 @@ const terminate = () => {
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
+  'FindWidget.focusCloseButton': wrapCommand(focusCloseButton),
   'FindWidget.focusFirst': wrapCommand(focusFirst),
   'FindWidget.focusIndex': wrapCommand(focusIndex),
   'FindWidget.focusLast': wrapCommand(focusLast),
   'FindWidget.focusNext': wrapCommand(focusNext),
   'FindWidget.focusPrevious': wrapCommand(focusPrevious),
+  'FindWidget.focusReplace': wrapCommand(focusReplace),
+  'FindWidget.focusReplaceAllButton': wrapCommand(focusReplaceAllButton),
   'FindWidget.getCommandIds': getCommandIds,
   'FindWidget.handleBlur': wrapCommand(handleBlur),
   'FindWidget.handleClickClose': wrapCommand(handleClickClose),

package/package.json

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