@lvce-editor/find-widget-worker 3.7.4 → 3.8.0

package/dist/findWidgetWorkerMain.js

@@ -854,6 +854,7 @@ const createMockRpc = ({
   return mockRpc;
 };
 
+const Alert = 'alert';
 const CheckBox = 'checkbox';
 const Group = 'group';
 const None = 'none';
@@ -2416,7 +2417,7 @@ const ViewletFindWidget = 'ViewletFindWidget';
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
-    className: `${MaskIcon} MaskIcon${icon}`,
+    className: mergeClassNames(MaskIcon, `MaskIcon${icon}`),
     role: None,
     type
   };
@@ -2430,10 +2431,7 @@ const getIconButtonVirtualDom = iconButton => {
     name,
     onClick
   } = iconButton;
-  let className = IconButton;
-  if (disabled) {
-    className += ' ' + IconButtonDisabled;
-  }
+  const className = mergeClassNames(IconButton, disabled ? IconButtonDisabled : '');
   return [{
     ariaLabel: label,
     childCount: 1,
@@ -2454,14 +2452,20 @@ const getFindMatchCountClassName = (matchCount, hasValue) => {
   return FindWidgetMatchCount;
 };
 
-const getMatchCountVirtualDom = (matchCountText, matchCount, hasValue) => {
+const getMatchCountVirtualDom = (matchCountText, matchCount, hasValue, hasError = false) => {
   return [{
     childCount: 1,
     className: getFindMatchCountClassName(matchCount, hasValue),
+    ...(hasError && {
+      id: 'FindWidgetInputError',
+      role: Alert
+    }),
     type: Div
   }, text(matchCountText)];
 };
 
+const Focusable = 0;
+
 const checkedClassName = mergeClassNames(SearchFieldButton, SearchFieldButtonChecked);
 const unCheckedClassName = SearchFieldButton;
 const getSearchFieldButtonVirtualDom = button => {
@@ -2479,7 +2483,7 @@ const getSearchFieldButtonVirtualDom = button => {
     name,
     onClick,
     role: CheckBox,
-    tabIndex: 0,
+    tabIndex: Focusable,
     title,
     type: Button
   }, {
@@ -2489,7 +2493,7 @@ const getSearchFieldButtonVirtualDom = button => {
   }];
 };
 
-const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus, extraClassName, autofocus = false) => {
+const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus, extraClassName, autofocus = false, ariaDescribedBy = '', ariaInvalid = '') => {
   if (outsideButtons.length > 0) {
     throw new Error('outsideButtons are deprecated');
   }
@@ -2511,6 +2515,12 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
     type: TextArea,
     ...(autofocus && {
       autofocus: true
+    }),
+    ...(ariaDescribedBy && {
+      ariaDescribedBy
+    }),
+    ...(ariaInvalid && {
+      ariaInvalid
     })
   }, {
     childCount: insideButtons.length,
@@ -2520,6 +2530,11 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
   return dom;
 };
 
+const findWidgetFindNode = {
+  childCount: 2,
+  className: FindWidgetFind,
+  type: Div
+};
 const getExtraClassName = (hasError, inputFocused) => {
   if (hasError) {
     return SearchFieldError;
@@ -2531,15 +2546,11 @@ const getExtraClassName = (hasError, inputFocused) => {
 };
 const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matchCount, hasValue, hasError, inputFocused) => {
   const extraClassName = getExtraClassName(hasError, inputFocused);
-  return [{
-    childCount: 2,
-    className: FindWidgetFind,
-    type: Div
-  }, ...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, fieldButtons, [], HandleFocus, extraClassName, inputFocused), {
+  return [findWidgetFindNode, ...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, fieldButtons, [], HandleFocus, extraClassName, inputFocused, hasError ? 'FindWidgetInputError' : '', hasError ? 'true' : ''), {
     childCount: 1 + buttons.length,
     className: 'FindWidgetActions',
     type: Div
-  }, ...getMatchCountVirtualDom(matchCountText, matchCount, hasValue), ...buttons.flatMap(getIconButtonVirtualDom)];
+  }, ...getMatchCountVirtualDom(matchCountText, matchCount, hasValue, hasError), ...buttons.flatMap(getIconButtonVirtualDom)];
 };
 
 const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replaceFieldButtons, replaceInputFocused) => {
@@ -2554,17 +2565,19 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replace
   }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus, extraClassName, replaceInputFocused), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
 };
 
+const resizerNode = {
+  childCount: 1,
+  className: Resizer,
+  onPointerDown: HandleResizerPointerDown,
+  type: Div
+};
+const resizerHighlightNode = {
+  childCount: 0,
+  className: ResizerHighlight,
+  type: Div
+};
 const getResizerVirtualDom = () => {
-  return [{
-    childCount: 1,
-    className: Resizer,
-    onPointerDown: HandleResizerPointerDown,
-    type: Div
-  }, {
-    childCount: 0,
-    className: ResizerHighlight,
-    type: Div
-  }];
+  return [resizerNode, resizerHighlightNode];
 };
 
 const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
@@ -2621,7 +2634,7 @@ const renderContent = (oldState, newState) => {
     useRegularExpression,
     value
   } = newState;
-  const matchCountText = getMatchCountText(newState.matchIndex, newState.matchCount);
+  const matchCountText = inputErrorMessage || getMatchCountText(newState.matchIndex, newState.matchCount);
   const {
     findButtonsEnabled,
     replaceButtonsEnabled

package/package.json

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