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

package/dist/findWidgetWorkerMain.js

@@ -859,9 +859,11 @@ const create$2 = () => {
 const {
   get: get$1,
   set: set$1,
-  wrapCommand
+  wrapCommand,
+  dispose: dispose$1
 } = create$2();
 
+const Script$1 = 2;
 const Unknown = 0;
 
 const create$1 = (uid, x, y, width, height, parentUid) => {
@@ -891,29 +893,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 +926,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 +958,29 @@ const diff2 = uid => {
   return diffResult;
 };
 
+const dispose = uid => {
+  return dispose$1(uid);
+};
+
+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) => {
@@ -1008,6 +1042,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,
@@ -1016,11 +1058,63 @@ const handleBlur = async state => {
   };
 };
 
-const handleClickClose = state => {
-  // TODO ask editor worker to dispose widget
+const rpcs = Object.create(null);
+const set$a = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
+};
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+
+const create = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$a(rpcId, rpc);
+    }
+  };
+};
+const EditorWorker$1 = 99;
+const {
+  invoke: invoke$9,
+  set: set$9
+} = create(EditorWorker$1);
+const EditorWorker = {
+  __proto__: null,
+  invoke: invoke$9,
+  set: set$9
+};
+
+const {
+  invoke,
+  set} = EditorWorker;
+
+const close$1 = async state => {
+  const {
+    editorUid
+  } = state;
+  // @ts-ignore
+  await invoke('Editor.closeFind2', editorUid);
   return state;
 };
 
+const handleClickClose = state => {
+  return close$1(state);
+};
+
 const findRegexMatches = (lines, regex) => {
   if (!regex.global) {
     throw new Error('regex must be global');
@@ -1079,7 +1173,8 @@ const refresh$1 = (state, value) => {
     matches,
     matchIndex: 0,
     matchCount,
-    value
+    value,
+    inputSource: User
   };
 };
 
@@ -1132,50 +1227,6 @@ const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
   };
 };
 
-const rpcs = Object.create(null);
-const set$a = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get = id => {
-  return rpcs[id];
-};
-
-/* eslint-disable  @typescript-eslint/explicit-function-return-type */
-
-const create = rpcId => {
-  return {
-    // @ts-ignore
-    invoke(method, ...params) {
-      const rpc = get(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    set(rpc) {
-      set$a(rpcId, rpc);
-    }
-  };
-};
-const EditorWorker$1 = 99;
-const {
-  invoke: invoke$9,
-  set: set$9
-} = create(EditorWorker$1);
-const EditorWorker = {
-  __proto__: null,
-  invoke: invoke$9,
-  set: set$9
-};
-
-const {
-  invoke,
-  set} = EditorWorker;
-
 const getLines = async editorUid => {
   // @ts-ignore
   const lines = await invoke('Editor.getLines2', editorUid);
@@ -1183,6 +1234,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);
@@ -1208,11 +1268,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 {
@@ -1228,7 +1284,8 @@ const loadContent = async state => {
     height,
     lines,
     selections,
-    focused: true
+    focused: true,
+    inputSource: Script
   };
 };
 
@@ -1318,6 +1375,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';
@@ -1389,6 +1449,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(' ');
@@ -1519,13 +1583,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,
@@ -1549,7 +1611,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
   });
@@ -1664,6 +1726,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:
@@ -1678,6 +1748,8 @@ const getRenderer = diffType => {
       return renderFocusContext;
     case RenderFocus:
       return renderFocus;
+    case RenderValue:
+      return renderValue;
     default:
       throw new Error('unknown renderer');
   }
@@ -1709,11 +1781,15 @@ const terminate = () => {
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
+  'FindWidget.dispose': dispose,
+  '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.5.0",
+  "version": "1.7.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",