@lvce-editor/find-widget-worker 3.24.0 → 3.24.1

package/dist/findWidgetWorkerMain.js

@@ -2548,20 +2548,6 @@ const handleSettingsChanged = async state => {
   };
 };
 
-const regexFlags = 'gi';
-const getSearchRegex = searchString => {
-  const escaped = escapeRegExpCharacters(searchString);
-  return new RegExp(escaped, regexFlags);
-};
-
-const findMatchesCaseInsensitive = (lines, searchString) => {
-  if (searchString.length === 0) {
-    return new Uint32Array([]);
-  }
-  const regex = getSearchRegex(searchString);
-  return findRegexMatches(lines, regex);
-};
-
 const getFindWidgetPosition = (editorX, editorY, editorWidth, width = 300) => {
   const height = 30;
   const paddingTop = 10;
@@ -2593,24 +2579,17 @@ const getSelections = async editorUid => {
   return selections;
 };
 
-const getSavedValue = savedState => {
-  if (savedState && savedState.value) {
-    return savedState.value;
-  }
-  return '';
-};
-const getSavedReplacement = savedState => {
-  if (savedState && savedState.replacement) {
-    return savedState.replacement;
-  }
-  return '';
-};
 const restoreState = savedState => {
-  const value = getSavedValue(savedState);
-  const replacement = getSavedReplacement(savedState);
   return {
-    replacement,
-    value
+    hasValue: typeof savedState?.value === 'string',
+    matchCase: savedState?.matchCase === true,
+    matchWholeWord: savedState?.matchWholeWord === true,
+    preserveCase: savedState?.preserveCase === true,
+    replaceExpanded: savedState?.replaceExpanded === true,
+    replacement: typeof savedState?.replacement === 'string' ? savedState.replacement : '',
+    useRegularExpression: savedState?.useRegularExpression === true,
+    value: typeof savedState?.value === 'string' ? savedState.value : '',
+    width: typeof savedState?.width === 'number' ? savedState.width : undefined
   };
 };
 
@@ -2624,31 +2603,48 @@ const loadContent = async (state, savedState) => {
     inputGap,
     inputLineHeight,
     inputPaddingBottom,
-    inputPaddingTop,
-    replaceExpanded
+    inputPaddingTop
   } = state;
   const fontSize = await getFontSize();
+  const restoredState = restoreState(savedState);
   const {
+    hasValue,
+    matchCase,
+    matchWholeWord,
+    preserveCase,
+    replaceExpanded,
     replacement,
-    value
-  } = restoreState(savedState);
+    useRegularExpression,
+    value,
+    width: savedWidth
+  } = restoredState;
   const lines = await getLines(editorUid);
   const selections = await getSelections(editorUid);
   const {
-    width,
+    width: defaultWidth,
     x,
     y
   } = getFindWidgetPosition(editorX, editorY, editorWidth);
   if (lines.length === 0) {
     return state;
   }
-  const actualValue = value || getSelectedText(lines, selections);
-  const matches = findMatchesCaseInsensitive(lines, actualValue);
+  const actualValue = hasValue ? value : getSelectedText(lines, selections);
+  const {
+    matches
+  } = findMatches(lines, actualValue, {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
+  });
   const matchCount = getMatchCount(matches);
+  let width = defaultWidth;
+  if (typeof savedWidth === 'number' && savedWidth > 0) {
+    width = editorWidth > 0 ? Math.min(savedWidth, editorWidth) : savedWidth;
+  }
   const {
     height,
     inputHeight
-  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
+  } = measureInputHeight(actualValue, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
   return {
     ...state,
     focus: FocusSearchInput,
@@ -2657,12 +2653,17 @@ const loadContent = async (state, savedState) => {
     height,
     inputSource: Script$1,
     lines,
+    matchCase,
     matchCount,
     matches,
     matchIndex: 0,
+    matchWholeWord,
+    preserveCase,
+    replaceExpanded,
     replacement,
     searchInputHeight: inputHeight,
     selections,
+    useRegularExpression,
     value: actualValue,
     version: 1,
     width,
@@ -3736,6 +3737,7 @@ const saveState = state => {
   const {
     matchCase,
     matchWholeWord,
+    preserveCase,
     replaceExpanded,
     replacement,
     useRegularExpression,
@@ -3745,6 +3747,7 @@ const saveState = state => {
   return {
     matchCase,
     matchWholeWord,
+    preserveCase,
     replaceExpanded,
     replacement,
     useRegularExpression,

package/package.json

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