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

package/dist/findWidgetWorkerMain.js

@@ -981,36 +981,74 @@ 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) => {
+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 setSelections = async (editorUid, selections) => {
+  // @ts-ignore
+  await invoke('Editor.setSelections2', editorUid, selections);
+};
+
+const focusIndex = async (state, index) => {
   const {
-    matchIndex
+    matchIndex,
+    matches,
+    editorUid,
+    value
   } = state;
   if (index === matchIndex) {
     return state;
   }
-  // TODO update editor
-  // const { widgets } = editor
-  // const childIndex = widgets.findIndex(isFind)
-  // const childWidget = widgets[childIndex]
-
   // // TODO find next match and highlight it
-  // const matchRowIndex = matches[index * 2]
-  // const matchColumnIndex = matches[index * 2 + 1]
-  // const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length])
-  // const newState: FindWidgetState = {
-  //   ...findState,
-  //   matchIndex: index,
-  // }
-  // const newWidget = {
-  //   ...childWidget,
-  //   newState,
-  // }
-  // const newWidgets = [...widgets.slice(0, childIndex), newWidget, ...widgets.slice(childIndex + 1)]
+  const matchRowIndex = matches[index * 2];
+  const matchColumnIndex = matches[index * 2 + 1];
+  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
+  await setSelections(editorUid, newSelections);
   return {
     ...state,
-    matchIndex: index
+    matchIndex: index,
+    selections: [...newSelections]
   };
 };
 const focusFirst = state => {
@@ -1058,50 +1096,6 @@ const handleBlur = async state => {
   };
 };
 
-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
@@ -1137,11 +1131,9 @@ const findRegexMatches = (lines, regex) => {
   return new Uint32Array(matches);
 };
 
-// copied from https://github.com/microsoft/vscode/tree/main/src/vs/base/common/strings.ts by Microsoft (License MIT)
-
-const RE_ESCAPE = /[\\\{\}\*\+\?\|\^\$\.\[\]\(\)]/g;
 const escapeRegExpCharacters = value => {
-  return value.replaceAll(RE_ESCAPE, String.raw`\$&`);
+  // @ts-ignore
+  return RegExp.escape(value);
 };
 
 const regexFlags = 'gi';
@@ -1289,6 +1281,10 @@ const loadContent = async state => {
   };
 };
 
+const preventDefaultBrowserFind = state => {
+  return state;
+};
+
 const SetBounds = 'Viewlet.setBounds';
 const SetDom2 = 'Viewlet.setDom2';
 const SetUid = 'Viewlet.setUid';
@@ -1307,7 +1303,6 @@ const renderBounds = (oldState, newState) => {
 
 const HandleBlur = 'handleBlur';
 const HandleClickClose = 'handleClickClose';
-const HandleClickFocusPreviousMatch = 'handleClickFocusPreviousMatch';
 const HandleClickNextMatch = 'handleClickNextMatch';
 const HandleClickPreviousMatch = 'handleClickPreviousMatch';
 const HandleClickReplace = 'handleClickReplace';
@@ -1660,11 +1655,11 @@ const getEventListeners = (uid, widgetId) => {
     name: HandleClickClose,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickClose', 0, widgetId]
   }, {
-    name: HandleClickFocusPreviousMatch,
-    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickPreviousMatch', 0, widgetId]
+    name: HandleClickPreviousMatch,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.focusPrevious', 0, widgetId]
   }, {
     name: HandleClickNextMatch,
-    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickNextMatch', 0, widgetId]
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.focusNext', 0, widgetId]
   }, {
     name: HandleClickReplace,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickReplace', 0, widgetId]
@@ -1795,6 +1790,7 @@ const commandMap = {
   'FindWidget.handleClickClose': wrapCommand(handleClickClose),
   'FindWidget.handleInput': wrapCommand(handleInput),
   'FindWidget.loadContent': wrapCommand(loadContent),
+  'FindWidget.preventDefaultBrowserFind': wrapCommand(preventDefaultBrowserFind),
   'FindWidget.render2': render2,
   'FindWidget.terminate': terminate,
   'FindWidget.toggleReplace': wrapCommand(toggleReplace)

package/package.json

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