@lvce-editor/find-widget-worker 2.4.0 → 2.6.0

package/dist/findWidgetWorkerMain.js

@@ -1222,7 +1222,7 @@ const isEqual$4 = (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;
+  return oldState.inputErrorMessage === newState.inputErrorMessage && oldState.matchCase === newState.matchCase && oldState.matchCount === newState.matchCount && oldState.matchIndex === newState.matchIndex && oldState.matchWholeWord === newState.matchWholeWord && oldState.preserveCase === newState.preserveCase && oldState.replaceExpanded === newState.replaceExpanded && oldState.useRegularExpression === newState.useRegularExpression && oldState.version === newState.version;
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -1422,8 +1422,15 @@ const findMatches = (lines, searchString, options) => {
     };
   }
   const {
-    regex
+    regex,
+    error
   } = buildRegex(searchString, options);
+  if (error) {
+    return {
+      matches: new Uint32Array([]),
+      error
+    };
+  }
   const matches = findRegexMatches(lines, regex);
   return {
     matches,
@@ -1573,7 +1580,46 @@ const applyEdits = async (editorId, edits) => {
   await invoke('Editor.applyDocumentEdits', editorId, edits);
 };
 
-const getEdits = (matches, value, replacement, startIndex, replaceAll, lines) => {
+/**
+ * Preserves the case pattern of the original text when replacing.
+ * Supports uppercase, lowercase, PascalCase, and camelCase patterns.
+ */
+const preserveCase$1 = (originalText, replacementText) => {
+  if (originalText.length === 0 || replacementText.length === 0) {
+    return replacementText;
+  }
+
+  // Check if original text is all uppercase
+  if (originalText === originalText.toUpperCase()) {
+    return replacementText.toUpperCase();
+  }
+
+  // Check if original text is all lowercase
+  if (originalText === originalText.toLowerCase()) {
+    return replacementText.toLowerCase();
+  }
+
+  // Check if original text is PascalCase (first letter uppercase, rest lowercase or mixed)
+  if (originalText[0] === originalText[0].toUpperCase()) {
+    // Check if it's pure PascalCase (first uppercase, rest lowercase)
+    const restOfText = originalText.slice(1);
+    if (restOfText === restOfText.toLowerCase()) {
+      return replacementText[0].toUpperCase() + replacementText.slice(1).toLowerCase();
+    }
+    // Mixed case - preserve the pattern as much as possible
+    return replacementText[0].toUpperCase() + replacementText.slice(1).toLowerCase();
+  }
+
+  // Check if original text is camelCase (first letter lowercase, rest mixed)
+  if (originalText[0] === originalText[0].toLowerCase()) {
+    return replacementText[0].toLowerCase() + replacementText.slice(1).toLowerCase();
+  }
+
+  // Default fallback - return replacement as-is
+  return replacementText;
+};
+
+const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, preserveCaseOption = false) => {
   if (value.length === 0 || matches.length === 0) {
     return [];
   }
@@ -1586,6 +1632,12 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines) =>
     const startColumnIndex = matches[i * 2 + 1];
     const endColumnIndex = startColumnIndex + value.length;
 
+    // Get the original text that was matched
+    const originalText = lines[rowIndex].slice(startColumnIndex, endColumnIndex);
+
+    // Apply case preservation if enabled
+    const finalReplacement = preserveCaseOption ? preserveCase$1(originalText, replacement) : replacement;
+
     // Convert row/column positions to character offsets
     let startOffset = 0;
     for (let row = 0; row < rowIndex; row++) {
@@ -1600,7 +1652,7 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines) =>
     edits.push({
       startOffset,
       endOffset,
-      inserted: replacement,
+      inserted: finalReplacement,
       origin: 'find-widget.replace'
     });
   }
@@ -1614,9 +1666,10 @@ const replace$1 = async state => {
     replacement,
     matchIndex,
     editorUid,
-    lines
+    lines,
+    preserveCase
   } = state;
-  const edits = getEdits(matches, value, replacement, matchIndex, false, lines);
+  const edits = getEdits(matches, value, replacement, matchIndex, false, lines, preserveCase);
   await applyEdits(editorUid, edits);
   // TODO ask editor worker to apply edit
   // TODO ask editor worker for new lines?
@@ -1631,9 +1684,10 @@ const replaceAll$1 = state => {
     value,
     replacement,
     editorUid,
-    lines
+    lines,
+    preserveCase
   } = state;
-  const edits = getEdits(matches, value, replacement, 0, true, lines);
+  const edits = getEdits(matches, value, replacement, 0, true, lines, preserveCase);
   void applyEdits(editorUid, edits);
   return {
     ...state
@@ -2270,6 +2324,7 @@ const text = data => {
   };
 };
 
+const FindWidget = 'FindWidget';
 const FindWidgetFind = 'FindWidgetFind';
 const FindWidgetMatchCount = 'FindWidgetMatchCount';
 const FindWidgetMatchCountEmpty = 'FindWidgetMatchCountEmpty';
@@ -2278,21 +2333,22 @@ const FindWidgetRight = 'FindWidgetRight';
 const IconButton = 'IconButton';
 const IconButtonDisabled = 'IconButtonDisabled';
 const MaskIcon = 'MaskIcon';
+const MaskIconChevronDown = 'MaskIconChevronDown';
+const MaskIconChevronRight = 'MaskIconChevronRight';
 const MultilineInputBox = 'MultilineInputBox';
+const Resizer = 'Resizer';
+const ResizerHighlight = 'ResizerHighlight';
 const SearchField = 'SearchField';
 const SearchFieldButton = 'SearchFieldButton';
 const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
 const SearchFieldButtons = 'SearchFieldButtons';
+const SearchFieldError = 'SearchFieldError';
+const SearchFieldFocused = 'SearchFieldFocused';
+const SearchToggleButton = 'SearchToggleButton';
+const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
 const Viewlet = 'Viewlet';
 const ViewletFind = 'ViewletFind';
-const FindWidget = 'FindWidget';
 const ViewletFindWidget = 'ViewletFindWidget';
-const Resizer = 'Resizer';
-const ResizerHighlight = 'ResizerHighlight';
-const SearchToggleButton = 'SearchToggleButton';
-const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
-const MaskIconChevronDown = 'MaskIconChevronDown';
-const MaskIconChevronRight = 'MaskIconChevronRight';
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
@@ -2370,15 +2426,15 @@ const getSearchFieldButtonVirtualDom = button => {
   }];
 };
 
-const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus = '', extraClassName = '') => {
+const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus, extraClassName) => {
   const dom = [{
     type: Div,
-    className: SearchField,
+    className: mergeClassNames(SearchField, extraClassName),
     role: None,
     childCount: 2
   }, {
     type: TextArea,
-    className: mergeClassNames(MultilineInputBox, extraClassName),
+    className: MultilineInputBox,
     spellcheck: false,
     autocapitalize: 'off',
     autocorrect: 'off',
@@ -2398,8 +2454,17 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
   return dom;
 };
 
-const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matchCount, hasValue, hasError) => {
-  const extraClassName = hasError ? `InputValidationError` : '';
+const getExtraClassName = (hasError, inputFocused) => {
+  if (hasError) {
+    return SearchFieldError;
+  }
+  if (inputFocused) {
+    return SearchFieldFocused;
+  }
+  return '';
+};
+const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matchCount, hasValue, hasError, inputFocused) => {
+  const extraClassName = getExtraClassName(hasError, inputFocused);
   return [{
     type: Div,
     className: FindWidgetFind,
@@ -2411,15 +2476,16 @@ const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matc
   }, ...getMatchCountVirtualDom(matchCountText, matchCount, hasValue), ...buttons.flatMap(getIconButtonVirtualDom)];
 };
 
-const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replaceFieldButtons) => {
+const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replaceFieldButtons, replaceInputFocused) => {
   if (!replaceExpanded) {
     return [];
   }
+  const extraClassName = replaceInputFocused ? SearchFieldFocused : '';
   return [{
     type: Div,
     className: FindWidgetReplace,
     childCount: 1 + replaceButtons.length
-  }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
+  }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus, extraClassName), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
 };
 
 const getResizerVirtualDom = () => {
@@ -2461,12 +2527,12 @@ const parentNode = {
   childCount: 3,
   role: Group
 };
-const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, findFieldButtons, replaceButtons, replaceFieldButtons, matchCount, value, hasError) => {
+const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, findFieldButtons, replaceButtons, replaceFieldButtons, matchCount, value, hasError, inputFocused, replaceInputFocused) => {
   return [parentNode, ...getResizerVirtualDom(), ...getSearchToggleButtonVirtualDom(replaceExpanded, 'handleClickToggleReplace'), {
     type: Div,
     className: FindWidgetRight,
     childCount: replaceExpanded ? 2 : 1
-  }, ...getFindWidgetFindVirtualDom(matchCountText, findButtons, findFieldButtons, matchCount, Boolean(value), hasError), ...getFindWidgetReplaceVirtualDom(replaceExpanded, replaceButtons)];
+  }, ...getFindWidgetFindVirtualDom(matchCountText, findButtons, findFieldButtons, matchCount, Boolean(value), hasError, inputFocused), ...getFindWidgetReplaceVirtualDom(replaceExpanded, replaceButtons, replaceFieldButtons, replaceInputFocused)];
 };
 
 const getMatchCountText = (matchIndex, matchCount) => {
@@ -2478,6 +2544,7 @@ const getMatchCountText = (matchIndex, matchCount) => {
 
 const renderContent = (oldState, newState) => {
   const {
+    focus,
     uid,
     matchCount,
     value,
@@ -2500,7 +2567,9 @@ const renderContent = (oldState, newState) => {
     replaceFieldButtons
   } = getFindWidgetButtons(findButtonsEnabled, replaceButtonsEnabled, matchCase, matchWholeWord, useRegularExpression, preserveCase);
   const hasError = Boolean(inputErrorMessage);
-  const dom = getFindWidgetVirtualDom(matchCountText, replaceExpanded, findButtons, findFieldButtons, replaceButtons, replaceFieldButtons, matchCount, value, hasError);
+  const inputFocused = focus === FocusSearchInput;
+  const replaceInputFocused = focus === FocusSearchReplaceInput;
+  const dom = getFindWidgetVirtualDom(matchCountText, replaceExpanded, findButtons, findFieldButtons, replaceButtons, replaceFieldButtons, matchCount, value, hasError, inputFocused, replaceInputFocused);
   return [SetDom2, uid, dom];
 };
 

package/package.json

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