x-ui-design 0.6.31 → 0.6.33

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

@@ -1,57 +1,9 @@
-import React, { ReactElement, ReactNode } from 'react';
-import { OptionType, SelectProps } from '../../types/select';
+import React, { ReactElement } from 'react';
+import { SelectProps } from '../../types/select';
 import './style.css';
-declare const Select: React.NamedExoticComponent<import("../../types").DefaultProps & {
-    id?: string;
-    searchValue?: string;
-    onSearch?: (value: string) => void;
-    autoClearSearchValue?: boolean;
-    onSelect?: (value: import("../../types").RuleTypes, option?: OptionType) => void;
-    onDeselect?: (value: string, option?: OptionType) => void;
-    filterOption?: boolean | ((input: string, option: OptionType) => boolean);
-    optionFilterProp?: string;
-    options?: OptionType[];
-    children?: ReactNode;
-    defaultActiveFirstOption?: boolean;
-    listHeight?: number;
-    menuItemSelectedIcon?: ReactNode;
-    mode?: "default" | "multiple" | "tags";
-    value?: import("../../types").RuleTypes;
-    defaultValue?: import("../../types").RuleTypes;
-    maxCount?: number;
-    onChange?: (e: import("../../types").RuleTypes, option?: OptionType) => void;
-    onClose?: () => void;
-    disabled?: boolean;
-    loading?: boolean;
-    placeholder?: string;
-    allowClear?: boolean;
-    filterable?: boolean;
-    defaultOpen?: boolean;
-    size?: "small" | "middle" | "large";
-    onClear?: () => void;
-    error?: boolean;
-    showSearch?: boolean;
-    tagRender?: ((props: import("../../types/select").CustomTagProps) => ReactElement) | undefined;
-    maxTagPlaceholder?: ReactNode | ((omittedValues: import("../../types/select").DisplayValueType[]) => ReactNode);
-    dropdownClassName?: string;
-    showArrow?: boolean;
-    onBlur?: React.FocusEventHandler<HTMLElement> | undefined;
-    onDropdownVisibleChange?: ((open: boolean, selected: import("../../types").RuleType) => void) | undefined;
-    showAction?: ("click" | "focus")[] | undefined;
-    suffixIcon?: ReactNode;
-    searchIcon?: ReactNode;
-    open?: boolean;
-    notFoundContent?: ReactNode;
-    getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;
-    dropdownRender?: (menu: ReactNode) => ReactNode;
-    feedbackIcons?: boolean;
-    placement?: "bottomLeft" | "bottomRight" | "topLeft" | "topRight";
-    removeIcon?: ReactNode;
-    maxTagCount?: number | "responsive";
-    ref?: React.ForwardedRef<HTMLDivElement>;
-    closeFromParent?: boolean;
-}> & {
-    readonly type: ({ prefixCls, id, searchValue, autoClearSearchValue, filterOption, optionFilterProp, children, options, listHeight, menuItemSelectedIcon, mode, value, defaultValue, maxCount, disabled, loading, placeholder, allowClear, filterable, defaultOpen, size, error, dropdownClassName, className, suffixIcon, searchIcon, style, showSearch, open, closeFromParent, showArrow, notFoundContent, noStyle, feedbackIcons, placement, removeIcon, maxTagCount, onSearch, onSelect, onDeselect, onClear, onChange, onClose, tagRender, getPopupContainer, dropdownRender, onDropdownVisibleChange, ref }: SelectProps) => ReactElement;
+declare const Select: {
+    ({ prefixCls, id, searchValue, autoClearSearchValue, filterOption, optionFilterProp, children, options, listHeight, menuItemSelectedIcon, mode, value, defaultValue, maxCount, disabled, loading, placeholder, allowClear, filterable, defaultOpen, size, error, dropdownClassName, className, suffixIcon, searchIcon, style, showSearch, open, closeFromParent, showArrow, notFoundContent, noStyle, feedbackIcons, placement, removeIcon, maxTagCount, onSearch, onSelect, onDeselect, onClear, onChange, onClose, tagRender, getPopupContainer, dropdownRender, onDropdownVisibleChange, ref }: SelectProps): ReactElement;
+    displayName: string;
 } & {
     Option: React.FC<import("../../types/select").OptionProps>;
 };

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

@@ -35,56 +35,7 @@ declare const Textarea: import("react").ComponentType<import("@/types/input").Te
 declare const Radio: import("react").ComponentType<import("@/types/radio").RadioProps>;
 declare const RadioButton: import("react").ComponentType<import("@/types/radio").RadioButtonProps>;
 declare const RadioGroup: import("react").ComponentType<import("@/types/radio").RadioGroupProps>;
-declare const Select: import("react").ComponentType<import("@/types").DefaultProps & {
-    id?: string;
-    searchValue?: string;
-    onSearch?: (value: string) => void;
-    autoClearSearchValue?: boolean;
-    onSelect?: (value: import("@/types").RuleTypes, option?: import("@/types/select").OptionType) => void;
-    onDeselect?: (value: string, option?: import("@/types/select").OptionType) => void;
-    filterOption?: boolean | ((input: string, option: import("@/types/select").OptionType) => boolean);
-    optionFilterProp?: string;
-    options?: import("@/types/select").OptionType[];
-    children?: import("react").ReactNode;
-    defaultActiveFirstOption?: boolean;
-    listHeight?: number;
-    menuItemSelectedIcon?: import("react").ReactNode;
-    mode?: "default" | "multiple" | "tags";
-    value?: import("@/types").RuleTypes;
-    defaultValue?: import("@/types").RuleTypes;
-    maxCount?: number;
-    onChange?: (e: import("@/types").RuleTypes, option?: import("@/types/select").OptionType) => void;
-    onClose?: () => void;
-    disabled?: boolean;
-    loading?: boolean;
-    placeholder?: string;
-    allowClear?: boolean;
-    filterable?: boolean;
-    defaultOpen?: boolean;
-    size?: "small" | "middle" | "large";
-    onClear?: () => void;
-    error?: boolean;
-    showSearch?: boolean;
-    tagRender?: ((props: import("@/types/select").CustomTagProps) => import("react").ReactElement) | undefined;
-    maxTagPlaceholder?: import("react").ReactNode | ((omittedValues: import("@/types/select").DisplayValueType[]) => import("react").ReactNode);
-    dropdownClassName?: string;
-    showArrow?: boolean;
-    onBlur?: import("react").FocusEventHandler<HTMLElement> | undefined;
-    onDropdownVisibleChange?: ((open: boolean, selected: import("@/types").RuleType) => void) | undefined;
-    showAction?: ("click" | "focus")[] | undefined;
-    suffixIcon?: import("react").ReactNode;
-    searchIcon?: import("react").ReactNode;
-    open?: boolean;
-    notFoundContent?: import("react").ReactNode;
-    getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;
-    dropdownRender?: (menu: import("react").ReactNode) => import("react").ReactNode;
-    feedbackIcons?: boolean;
-    placement?: "bottomLeft" | "bottomRight" | "topLeft" | "topRight";
-    removeIcon?: import("react").ReactNode;
-    maxTagCount?: number | "responsive";
-    ref?: import("react").ForwardedRef<HTMLDivElement>;
-    closeFromParent?: boolean;
-}>;
+declare const Select: import("react").ComponentType<import("@/types/select").SelectProps>;
 declare const Option: import("react").ComponentType<import("@/types/select").OptionProps>;
 declare const Tag: import("react").ComponentType<import("@/types/select").CustomTagProps>;
 declare const Skeleton: import("react").ComponentType<import("./types/skeleton").SkeletonProps>;

package/dist/index.d.ts

@@ -139,56 +139,7 @@ declare const Textarea: react.ComponentType<__types_input.TextareaProps>;
 declare const Radio: react.ComponentType<__types_radio.RadioProps>;
 declare const RadioButton: react.ComponentType<__types_radio.RadioButtonProps>;
 declare const RadioGroup: react.ComponentType<__types_radio.RadioGroupProps>;
-declare const Select: react.ComponentType<__types.DefaultProps & {
-    id?: string;
-    searchValue?: string;
-    onSearch?: (value: string) => void;
-    autoClearSearchValue?: boolean;
-    onSelect?: (value: __types.RuleTypes, option?: __types_select.OptionType) => void;
-    onDeselect?: (value: string, option?: __types_select.OptionType) => void;
-    filterOption?: boolean | ((input: string, option: __types_select.OptionType) => boolean);
-    optionFilterProp?: string;
-    options?: __types_select.OptionType[];
-    children?: react.ReactNode;
-    defaultActiveFirstOption?: boolean;
-    listHeight?: number;
-    menuItemSelectedIcon?: react.ReactNode;
-    mode?: "default" | "multiple" | "tags";
-    value?: __types.RuleTypes;
-    defaultValue?: __types.RuleTypes;
-    maxCount?: number;
-    onChange?: (e: __types.RuleTypes, option?: __types_select.OptionType) => void;
-    onClose?: () => void;
-    disabled?: boolean;
-    loading?: boolean;
-    placeholder?: string;
-    allowClear?: boolean;
-    filterable?: boolean;
-    defaultOpen?: boolean;
-    size?: "small" | "middle" | "large";
-    onClear?: () => void;
-    error?: boolean;
-    showSearch?: boolean;
-    tagRender?: ((props: __types_select.CustomTagProps) => react.ReactElement) | undefined;
-    maxTagPlaceholder?: react.ReactNode | ((omittedValues: __types_select.DisplayValueType[]) => react.ReactNode);
-    dropdownClassName?: string;
-    showArrow?: boolean;
-    onBlur?: react.FocusEventHandler<HTMLElement> | undefined;
-    onDropdownVisibleChange?: ((open: boolean, selected: __types.RuleType) => void) | undefined;
-    showAction?: ("click" | "focus")[] | undefined;
-    suffixIcon?: react.ReactNode;
-    searchIcon?: react.ReactNode;
-    open?: boolean;
-    notFoundContent?: react.ReactNode;
-    getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;
-    dropdownRender?: (menu: react.ReactNode) => react.ReactNode;
-    feedbackIcons?: boolean;
-    placement?: "bottomLeft" | "bottomRight" | "topLeft" | "topRight";
-    removeIcon?: react.ReactNode;
-    maxTagCount?: number | "responsive";
-    ref?: react.ForwardedRef<HTMLDivElement>;
-    closeFromParent?: boolean;
-}>;
+declare const Select: react.ComponentType<__types_select.SelectProps>;
 declare const Option: react.ComponentType<__types_select.OptionProps>;
 declare const Tag: react.ComponentType<__types_select.CustomTagProps>;
 declare const Skeleton: react.ComponentType<SkeletonProps>;

package/dist/index.esm.js

@@ -780,6 +780,13 @@ const useForm = ({
   async function validateFields(nameList) {
     const fieldsToValidate = nameList || Object.keys(formRef.current[stepRef.current]);
     const results = await Promise.all(fieldsToValidate.map(name => validateField(name)));
+    const errorFields = formInstance.getFieldsError().filter(e => e.errors.length);
+    if (errorFields.length) {
+      formHandlersRef.current.onFinishFailed?.({
+        values: formInstance.getFieldsValue(),
+        errorFields
+      });
+    }
     if (_scrollToFirstError.current) {
       const firstErrorContent = document.querySelectorAll('.xUi-form-item-has-error')?.[0];
       if (firstErrorContent) {
@@ -823,14 +830,7 @@ const useForm = ({
     return (await validateFields()) ? (() => {
       formHandlersRef.current.onFinish?.(formData);
       return formData;
-    })() : (() => {
-      const errorFields = formInstance.getFieldsError().filter(e => e.errors.length);
-      formHandlersRef.current.onFinishFailed?.({
-        values: formInstance.getFieldsValue(),
-        errorFields
-      });
-      return undefined;
-    })();
+    })() : undefined;
   }
   function subscribeToField(name, callback) {
     if (!fieldSubscribers.current[name]) {
@@ -3365,7 +3365,7 @@ function getTextFromNode(node) {
   }
   return '';
 }
-const SelectComponent = /*#__PURE__*/memo(({
+const SelectComponent = ({
   prefixCls = prefixClsSelect,
   id,
   searchValue = '',
@@ -3694,9 +3694,7 @@ const SelectComponent = /*#__PURE__*/memo(({
     }
     return options || [];
   }, []);
-  const extractedOptions = useMemo(() => {
-    return children ? extractOptions(children) : Array.isArray(options) ? options : [];
-  }, [children, options]);
+  const extractedOptions = children ? extractOptions(children) : Array.isArray(options) ? options : [];
   const triggerNode = useMemo(() => {
     return selectRef.current?.querySelector(`.${prefixCls}-trigger`);
   }, [prefixCls]);
@@ -3934,7 +3932,7 @@ const SelectComponent = /*#__PURE__*/memo(({
   }, ArrowContainer, error && feedbackIcons ? /*#__PURE__*/React.createElement(ErrorIcon, null) : null), loading && /*#__PURE__*/React.createElement("span", {
     className: `${prefixCls}-loading`
   }, /*#__PURE__*/React.createElement(LoadingIcon, null)))), getPopupContainer?.(triggerNode) ? /*#__PURE__*/createPortal(dropdownContent, getPopupContainer(triggerNode)) : dropdownContent);
-});
+};
 SelectComponent.displayName = 'Select';
 const Select = Object.assign(SelectComponent, {
   Option