x-ui-design 0.2.91 → 0.2.93

package/dist/esm/types/components/Select/Select.d.ts

@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react';
+import React, { ReactElement, ReactNode } from 'react';
 import { OptionType } from '../../types/select';
 import './style.css';
 declare const Select: React.ForwardRefExoticComponent<import("../../types").DefaultProps & {
@@ -11,10 +11,10 @@ declare const Select: React.ForwardRefExoticComponent<import("../../types").Defa
     filterOption?: boolean | ((input: string, option: OptionType) => boolean);
     optionFilterProp?: string;
     options?: OptionType[];
-    children?: React.ReactNode;
+    children?: ReactNode;
     defaultActiveFirstOption?: boolean;
     listHeight?: number;
-    menuItemSelectedIcon?: React.ReactNode;
+    menuItemSelectedIcon?: ReactNode;
     mode?: "default" | "multiple" | "tags";
     value?: import("../../types").RuleTypes;
     defaultValue?: import("../../types").RuleTypes;
@@ -31,20 +31,20 @@ declare const Select: React.ForwardRefExoticComponent<import("../../types").Defa
     error?: boolean;
     showSearch?: boolean;
     tagRender?: ((props: import("../../types/select").CustomTagProps) => ReactElement) | undefined;
-    maxTagPlaceholder?: React.ReactNode | ((omittedValues: import("../../types/select").DisplayValueType[]) => React.ReactNode);
+    maxTagPlaceholder?: ReactNode | ((omittedValues: import("../../types/select").DisplayValueType[]) => ReactNode);
     dropdownClassName?: string;
     showArrow?: boolean;
     onBlur?: React.FocusEventHandler<HTMLElement> | undefined;
     onDropdownVisibleChange?: ((open: boolean) => void) | undefined;
     showAction?: ("click" | "focus")[] | undefined;
-    suffixIcon?: React.ReactNode;
+    suffixIcon?: ReactNode;
     open?: boolean;
-    notFoundContent?: React.ReactNode;
+    notFoundContent?: ReactNode;
     getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;
-    dropdownRender?: (menu: React.ReactNode) => React.ReactNode;
+    dropdownRender?: (menu: ReactNode) => ReactNode;
     feedbackIcons?: boolean;
     placement?: "bottomLeft" | "bottomRight" | "topLeft" | "topRight";
-    removeIcon?: React.ReactNode;
+    removeIcon?: ReactNode;
 } & React.RefAttributes<HTMLDivElement>> & {
     Option: React.FC<import("../../types/select").OptionProps>;
 };

package/dist/esm/types/types/form.d.ts

@@ -83,7 +83,7 @@ export interface FormItemChildComponentProps {
 export interface FormInstance {
     submit: () => Promise<Record<string, RuleTypes> | undefined>;
     setFields: (fields: FieldData[]) => void;
-    resetFields: (nameList?: string[], showError?: boolean) => void;
+    resetFields: (nameList?: string[], showError?: boolean | null) => void;
     getFieldError: (name: string) => string[];
     registerField: (name: string, rules?: RuleObject[]) => void;
     setFieldValue: (name: string, value: RuleTypes) => void;

package/dist/index.esm.js

@@ -1,6 +1,7 @@
 import require$$1 from 'react/jsx-runtime';
 import React$1, { useRef, useState, useContext, useMemo, useEffect, Children, isValidElement, Fragment, createContext, forwardRef, useImperativeHandle, cloneElement, useCallback } from 'react';
 import { createPortal } from 'react-dom';
+import ReactDOMServer from 'react-dom/server';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -638,12 +639,18 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange) => {
       errors: err
     }));
   }
-  function setFieldValue(name, value, errors, reset) {
-    if (!reset && ([undefined, null].includes(value) || formRef.current[name] === value)) {
+  function setFieldValue(name, value, errors, reset = null) {
+    if (!reset && reset !== null && ([undefined, null].includes(value) || formRef.current[name] === value)) {
       return;
     }
     formRef.current[name] = value;
     touchedFieldsRef.current.add(name);
+    if (reset === null) {
+      setErrors({
+        [name]: []
+      });
+      return;
+    }
     if (!errors?.length) {
       validateField(name).then(() => {
         const allValues = getFieldsValue();
@@ -737,37 +744,23 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange) => {
     const results = await Promise.all(fieldsToValidate.map(name => validateField(name)));
     return results.every(valid => valid);
   }
-  function resetFields(nameList, showError = false) {
+  function resetFields(nameList, showError = true) {
     if (nameList?.length) {
       nameList.forEach(name => {
         formRef.current[name] = initialValues[name];
         touchedFieldsRef.current.delete(name);
         delete warningsRef.current[name];
-        if (showError) {
-          setErrors(prev => ({
-            ...prev,
-            [name]: []
-          }));
-          setFieldValue(name, initialValues[name], undefined, true);
-        } else {
-          setFieldValue(name, initialValues[name], undefined, true);
-          setErrors(prev => ({
-            ...prev,
-            [name]: []
-          }));
-        }
+        setErrors(prev => ({
+          ...prev,
+          [name]: []
+        }));
+        setFieldValue(name, initialValues[name], undefined, showError);
       });
     } else {
       touchedFieldsRef.current.clear();
       warningsRef.current = {};
       Object.keys(formRef.current).forEach(name => {
-        setFieldValue(name, initialValues[name], undefined, true);
-        if (!showError) {
-          setErrors(prev => ({
-            ...prev,
-            [name]: []
-          }));
-        }
+        setFieldValue(name, initialValues[name], undefined, showError);
       });
     }
     formSubscribers.current.forEach(callback => callback(getFieldsValue()));
@@ -2929,6 +2922,16 @@ styleInject(css_248z$5);
 const LIST_HEIGHT = 200;
 const PADDING_PLACEMENT = 18;
 const PADDING_TAG_INPUT = 4;
+function getTextFromNode(node) {
+  if (typeof node === 'string' || typeof node === 'number') {
+    return node.toString();
+  }
+  if (/*#__PURE__*/React$1.isValidElement(node)) {
+    const html = ReactDOMServer.renderToStaticMarkup(node);
+    return html.replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
+  }
+  return '';
+}
 const SelectComponent = /*#__PURE__*/forwardRef(({
   prefixCls = prefixClsSelect,
   id,
@@ -3146,10 +3149,10 @@ const SelectComponent = /*#__PURE__*/forwardRef(({
     if (filterOption === false) {
       return true;
     }
-    const valueToCheck = `${['string', 'number'].includes(typeof option.children) ? option.children :
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
-    option[optionFilterProp] || option.value}`;
+    const optionFilterPropValue = option[optionFilterProp];
+    const valueToCheck = optionFilterProp && typeof optionFilterPropValue === 'string' ? String(optionFilterPropValue) : getTextFromNode(option.children) || String(option.value);
     return valueToCheck.toLowerCase().includes(searchQuery.toLowerCase());
   });
   const handleTriggerClick = () => {
@@ -3173,10 +3176,10 @@ const SelectComponent = /*#__PURE__*/forwardRef(({
       children,
       className = '',
       ...props
-    }) => {
+    }, index) => {
       const isSelected = hasMode ? selected.includes(props.value) : props.value === selected;
       return /*#__PURE__*/React$1.createElement(Option, _extends({
-        key: `${props.value}`
+        key: `${props.value}_${index}`
       }, props, {
         selected: isSelected,
         className: clsx([className, {