@lvce-editor/find-widget-worker 2.5.0 → 2.7.0

package/dist/findWidgetWorkerMain.js

@@ -889,10 +889,11 @@ const create$2 = () => {
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
+          oldState,
           newState
         } = states[uid];
         const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
+        if (oldState === newerState || newState === newerState) {
           return;
         }
         const latest = states[uid];
@@ -2343,6 +2344,7 @@ const SearchFieldButton = 'SearchFieldButton';
 const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
 const SearchFieldButtons = 'SearchFieldButtons';
 const SearchFieldError = 'SearchFieldError';
+const SearchFieldFocused = 'SearchFieldFocused';
 const SearchToggleButton = 'SearchToggleButton';
 const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
 const Viewlet = 'Viewlet';
@@ -2453,8 +2455,17 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
   return dom;
 };
 
-const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matchCount, hasValue, hasError) => {
-  const extraClassName = hasError ? SearchFieldError : '';
+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,
@@ -2466,15 +2477,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 = () => {
@@ -2516,12 +2528,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) => {
@@ -2533,6 +2545,7 @@ const getMatchCountText = (matchIndex, matchCount) => {
 
 const renderContent = (oldState, newState) => {
   const {
+    focus,
     uid,
     matchCount,
     value,
@@ -2555,7 +2568,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.5.0",
+  "version": "2.7.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",