@lvce-editor/find-widget-worker 3.2.0 → 3.4.0

package/dist/findWidgetWorkerMain.js

@@ -374,7 +374,7 @@ const callbacks = Object.create(null);
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -527,7 +527,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -834,6 +834,34 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$1$1
 };
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
+
+const CheckBox = 'checkbox';
+const Group = 'group';
+const None = 'none';
+
+const Button = 1;
+const Div = 4;
+const Text = 12;
+const TextArea = 62;
 
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -887,7 +915,11 @@ const set$2 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$2 = rpcId => {
   return {
     async dispose() {
@@ -906,6 +938,18 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$2(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$2(rpcId, rpc);
     }
@@ -1293,11 +1337,12 @@ const findRegexMatches = (lines, regex) => {
   return new Uint32Array(matches);
 };
 
+const emptyMatches$1 = new Uint32Array([]);
 const findMatches = (lines, searchString, options) => {
   if (searchString.length === 0) {
     return {
       error: '',
-      matches: new Uint32Array([])
+      matches: emptyMatches$1
     };
   }
   const {
@@ -1307,7 +1352,7 @@ const findMatches = (lines, searchString, options) => {
   if (error) {
     return {
       error,
-      matches: new Uint32Array([])
+      matches: emptyMatches$1
     };
   }
   const matches = findRegexMatches(lines, regex);
@@ -1602,6 +1647,43 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, pr
   return edits;
 };
 
+const getLines = async editorUid => {
+  const lines = await getLines$1(editorUid);
+  return lines;
+};
+
+const updateAfterReplace = async (state, matchIndex) => {
+  const {
+    editorUid,
+    matchCase,
+    matchWholeWord,
+    useRegularExpression,
+    value
+  } = state;
+  const options = {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
+  };
+  const newLines = await getLines(editorUid);
+  const {
+    error,
+    matches: newMatches
+  } = findMatches(newLines, value, options);
+  const newMatchCount = getMatchCount(newMatches);
+
+  // Keep matchIndex in bounds, or reset to 0 if no matches remain
+  const newMatchIndex = newMatchCount === 0 ? 0 : Math.min(matchIndex, newMatchCount - 1);
+  return {
+    ...state,
+    inputErrorMessage: error,
+    lines: newLines,
+    matchCount: newMatchCount,
+    matches: newMatches,
+    matchIndex: newMatchIndex
+  };
+};
+
 const replace$1 = async state => {
   const {
     editorUid,
@@ -1622,12 +1704,10 @@ const replace$1 = async state => {
   };
   const edits = getEdits(matches, value, replacement, matchIndex, false, lines, preserveCase, options);
   await applyEdits(editorUid, edits);
-  return {
-    ...state
-  };
+  return updateAfterReplace(state, matchIndex);
 };
 
-const replaceAll$1 = state => {
+const replaceAll$1 = async state => {
   const {
     editorUid,
     lines,
@@ -1645,10 +1725,8 @@ const replaceAll$1 = state => {
     useRegularExpression
   };
   const edits = getEdits(matches, value, replacement, 0, true, lines, preserveCase, options);
-  void applyEdits(editorUid, edits);
-  return {
-    ...state
-  };
+  await applyEdits(editorUid, edits);
+  return updateAfterReplace(state, 0);
 };
 
 const getClickHandler = name => {
@@ -1993,11 +2071,6 @@ const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
   };
 };
 
-const getLines = async editorUid => {
-  const lines = await getLines$1(editorUid);
-  return lines;
-};
-
 const getSelectedText = (lines, selections) => {
   if (selections.length === 0) {
     return '';
@@ -2284,24 +2357,15 @@ const getFindWidgetButtonsEnabled = (matchCount, value) => {
   };
 };
 
-const CheckBox = 'checkbox';
-const Group = 'group';
-const None = 'none';
-
-const Button = 1;
-const Div = 4;
-const Text = 12;
-const TextArea = 62;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
@@ -2407,7 +2471,7 @@ const getSearchFieldButtonVirtualDom = button => {
   }];
 };
 
-const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus, extraClassName) => {
+const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus, extraClassName, autofocus = false) => {
   const dom = [{
     childCount: 2,
     className: mergeClassNames(SearchField, extraClassName),
@@ -2423,7 +2487,10 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
     onInput,
     placeholder,
     spellcheck: false,
-    type: TextArea
+    type: TextArea,
+    ...(autofocus ? {
+      autofocus: true
+    } : {})
   }, {
     childCount: insideButtons.length,
     className: SearchFieldButtons,
@@ -2450,7 +2517,7 @@ const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matc
     childCount: 2,
     className: FindWidgetFind,
     type: Div
-  }, ...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, fieldButtons, [], HandleFocus, extraClassName), {
+  }, ...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, fieldButtons, [], HandleFocus, extraClassName, inputFocused), {
     childCount: 1 + buttons.length,
     className: 'FindWidgetActions',
     type: Div
@@ -2466,7 +2533,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replace
     childCount: 1 + replaceButtons.length,
     className: FindWidgetReplace,
     type: Div
-  }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus, extraClassName), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
+  }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus, extraClassName, replaceInputFocused), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
 };
 
 const getResizerVirtualDom = () => {

package/package.json

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