@lvce-editor/find-widget-worker 2.0.0 → 2.2.0

package/dist/findWidgetWorkerMain.js

@@ -997,44 +997,34 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
   return state;
 };
 
-const isEqual$7 = (oldState, newState) => {
+const isEqual$8 = (oldState, newState) => {
   return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
 };
 
-const isEqual$6 = (oldState, newState) => {
+const isEqual$7 = (oldState, newState) => {
   return newState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.inputHeight === newState.inputHeight;
 };
 
-const isEqual$5 = (oldState, newState) => {
+const isEqual$6 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
-const isEqual$4 = (oldState, newState) => {
+const isEqual$5 = (oldState, newState) => {
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
-const isEqual$3 = (oldState, newState) => {
+const isEqual$4 = (oldState, newState) => {
   return oldState.focused === newState.focused;
 };
 
-const isEqual$2 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return oldState.version === newState.version && oldState.replaceExpanded === newState.replaceExpanded && oldState.matchCount === newState.matchCount && oldState.matchIndex === newState.matchIndex && oldState.matchCase === newState.matchCase && oldState.matchWholeWord === newState.matchWholeWord && oldState.useRegularExpression === newState.useRegularExpression && oldState.preserveCase === newState.preserveCase;
 };
 
-const isEqual$1 = (oldState, newState) => {
+const isEqual$2 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
-const RenderBounds = 8;
-const RenderCss = 10;
-const RenderEventListeners = 11;
-const RenderUid = 12;
-const RenderContent = 13;
-const RenderFocusContext = 14;
-const RenderFocus = 15;
-const RenderValue = 16;
-const RenderReplaceValue = 17;
-
 const CheckBox = 'checkbox';
 const Group = 'group';
 const None = 'none';
@@ -1088,12 +1078,26 @@ const FocusSearchWholeWord = 34;
 const FocusToggleDetails = 1010;
 const FocusToggleReplace = 1020;
 
+const isEqual$1 = (oldState, newState) => {
+  return newState.inputSource === User || oldState.replacement === newState.replacement;
+};
+
+const RenderBounds = 8;
+const RenderCss = 10;
+const RenderEventListeners = 11;
+const RenderUid = 12;
+const RenderContent = 13;
+const RenderFocusContext = 14;
+const RenderFocus = 15;
+const RenderValue = 16;
+const RenderReplaceValue = 17;
+
 const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.value === newState.value;
 };
 
-const modules = [isEqual$5, isEqual$2, isEqual$7, isEqual$1, isEqual$3, isEqual$4, isEqual, isEqual$6];
-const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus, RenderValue, RenderCss];
+const modules = [isEqual$6, isEqual$3, isEqual$8, isEqual$2, isEqual$4, isEqual$5, isEqual, isEqual$1, isEqual$7];
+const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus, RenderValue, RenderReplaceValue, RenderCss];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1540,7 +1544,7 @@ const applyEdits = async (editorId, edits) => {
   await invoke('Editor.applyDocumentEdits', editorId, edits);
 };
 
-const getEdits = (matches, value, replacement, startIndex, replaceAll) => {
+const getEdits = (matches, value, replacement, startIndex, replaceAll, lines) => {
   if (value.length === 0 || matches.length === 0) {
     return [];
   }
@@ -1552,17 +1556,22 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll) => {
     const rowIndex = matches[i * 2];
     const startColumnIndex = matches[i * 2 + 1];
     const endColumnIndex = startColumnIndex + value.length;
+
+    // Convert row/column positions to character offsets
+    let startOffset = 0;
+    for (let row = 0; row < rowIndex; row++) {
+      startOffset += lines[row].length + 1; // +1 for newline character
+    }
+    startOffset += startColumnIndex;
+    let endOffset = 0;
+    for (let row = 0; row < rowIndex; row++) {
+      endOffset += lines[row].length + 1; // +1 for newline character
+    }
+    endOffset += endColumnIndex;
     edits.push({
-      start: {
-        rowIndex,
-        columnIndex: startColumnIndex
-      },
-      end: {
-        rowIndex,
-        columnIndex: endColumnIndex
-      },
-      inserted: [replacement],
-      deleted: [value],
+      startOffset,
+      endOffset,
+      inserted: replacement,
       origin: 'find-widget.replace'
     });
   }
@@ -1575,9 +1584,10 @@ const replace$1 = async state => {
     value,
     replacement,
     matchIndex,
-    editorUid
+    editorUid,
+    lines
   } = state;
-  const edits = getEdits(matches, value, replacement, matchIndex, false);
+  const edits = getEdits(matches, value, replacement, matchIndex, false, lines);
   await applyEdits(editorUid, edits);
   // TODO ask editor worker to apply edit
   // TODO ask editor worker for new lines?
@@ -1591,9 +1601,10 @@ const replaceAll$1 = state => {
     matches,
     value,
     replacement,
-    editorUid
+    editorUid,
+    lines
   } = state;
-  const edits = getEdits(matches, value, replacement, 0, true);
+  const edits = getEdits(matches, value, replacement, 0, true, lines);
   void applyEdits(editorUid, edits);
   return {
     ...state
@@ -2720,7 +2731,8 @@ const commandMap = {
   'FindWidget.terminate': terminate,
   'FindWidget.toggleMatchCase': wrapCommand(toggleMatchCase),
   'FindWidget.toggleReplace': wrapCommand(toggleReplace$1),
-  'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression)
+  'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression),
+  'FindWidget.togglePreserveCase': wrapCommand(togglePreserveCase)
 };
 
 const listen = async () => {

package/package.json

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