@canlooks/can-ui 0.0.128 → 0.0.129

package/dist/cjs/components/select/select.d.ts

@@ -1,10 +1,9 @@
 import { ReactElement } from 'react';
 import { SelectBaseMultipleProps, SelectBaseOwnProps, SelectBaseSingleProps } from '../selectBase';
 import { MenuOptionType, OptionsBaseSharedProps } from '../optionsBase';
-import { InputBaseProps } from '../inputBase';
 import { Id } from '../../types';
 import { MenuItem } from '../menuItem';
-export interface SelectOwnProps<O extends MenuOptionType> extends SelectBaseOwnProps, OptionsBaseSharedProps<O>, Omit<InputBaseProps<'input'>, 'children' | 'placeholder' | 'defaultValue' | 'value' | 'onChange'> {
+export interface SelectOwnProps<O extends MenuOptionType> extends SelectBaseOwnProps, OptionsBaseSharedProps<O> {
 }
 export interface SelectSingleProps<O extends MenuOptionType, V extends Id = Id> extends SelectOwnProps<O>, SelectBaseSingleProps<V> {
 }

package/dist/cjs/components/select/select.js

@@ -7,11 +7,12 @@ const selectBase_1 = require("../selectBase");
 const optionsBase_1 = require("../optionsBase");
 const menuItem_1 = require("../menuItem");
 const selectionContext_1 = require("../selectionContext");
-exports.Select = (0, react_1.memo)(({ inputProps, popperProps, popperRef, defaultOpen = false, open, onOpenChange, placeholder = '请选择', sizeAdaptable = true, disabled, readOnly, searchable, defaultSearchValue = '', searchValue, onSearchChange, searchInputProps, children, 
+exports.Select = (0, react_1.memo)(({ children, 
 // 从SelectableProps继承
-multiple = false, defaultValue, value, onChange, renderBackfill, 
+multiple = false, // 同时转发至<SelectBase/>
+defaultValue, value, onChange, renderBackfill, // 同时转发至<SelectBase/>
 // 从OptionsBaseSharedProps继承
-showCheckbox = multiple, loading = false, options, labelKey = 'label', primaryKey = 'value', searchTokenKey = 'searchToken', filterPredicate, ...inputBaseProps }) => {
+showCheckbox = multiple, loading = false, options, labelKey = 'label', primaryKey = 'value', searchTokenKey = 'searchToken', filterPredicate, ...props }) => {
     const optionsArr = options || react_1.Children.map(children, c => {
         return (0, react_1.isValidElement)(c) ? c.props : c;
     }) || void 0;
@@ -24,33 +25,14 @@ showCheckbox = multiple, loading = false, options, labelKey = 'label', primaryKe
     }, [optionsArr, primaryKey]);
     const [innerValue, toggleSelected, setInnerValue] = (0, selectionContext_1.useFlatSelection)({ multiple, defaultValue, value, onChange });
     const onClear = () => {
+        props.onClear?.();
         setInnerValue(multiple ? [] : void 0);
     };
-    return ((0, jsx_runtime_1.jsx)(selectBase_1.SelectBase, { ...{
-            inputProps,
-            popperProps,
-            popperRef,
-            defaultOpen,
-            open,
-            onOpenChange,
-            placeholder,
-            sizeAdaptable,
-            disabled,
-            readOnly,
-            searchable,
-            defaultSearchValue,
-            searchValue,
-            onSearchChange,
-            searchInputProps,
-            multiple,
-            renderBackfill,
-        }, _internalProps: {
-            inputBaseProps,
+    return ((0, jsx_runtime_1.jsx)(selectBase_1.SelectBase, { ...props, multiple: multiple, renderBackfill: renderBackfill, onClear: onClear, _internalProps: {
             labelKey,
             optionsMap,
             innerValue,
             onToggleSelected: toggleSelected,
-            onClear,
             renderPopperContent: (searchValue, onToggleSelected) => ((0, jsx_runtime_1.jsx)(optionsBase_1.OptionsBase, { selectedValue: innerValue, searchValue,
                 onToggleSelected,
                 showCheckbox,

package/dist/cjs/components/selectBase/selectBase.d.ts

@@ -3,7 +3,7 @@ import { ComponentProps, ReactNode, Ref } from 'react';
 import { PopperProps, PopperRef } from '../popper';
 import { InputProps } from '../input';
 import { Id, SelectableMultipleProps, SelectableSingleProps } from '../../types';
-export type SelectBaseOwnProps = {
+export interface SelectBaseOwnProps extends Omit<InputBaseProps<'input'>, 'children' | 'placeholder' | 'defaultValue' | 'value' | 'onChange' | 'onToggle'> {
     /** <select />内部由<input />实现 */
     inputProps?: ComponentProps<'input'>;
     popperProps?: PopperProps;
@@ -21,7 +21,7 @@ export type SelectBaseOwnProps = {
     searchValue?: string;
     onSearchChange?(searchValue: string): void;
     searchInputProps?: InputProps;
-};
+}
 export interface SelectBaseSingleProps<V extends Id = Id> extends SelectBaseOwnProps, SelectableSingleProps<V> {
     renderBackfill?(selectedValue: V | undefined): ReactNode;
 }
@@ -29,15 +29,13 @@ export interface SelectBaseMultipleProps<V extends Id = Id> extends SelectBaseOw
     renderBackfill?(selectedValue: V[] | undefined): ReactNode;
 }
 export type SelectBaseProps<V extends Id = Id> = SelectBaseSingleProps<V> | SelectBaseMultipleProps<V>;
-export declare function SelectBase({ inputProps, popperProps, popperRef, defaultOpen, open, onOpenChange, placeholder, sizeAdaptable, disabled, readOnly, loading, searchable, defaultSearchValue, searchValue, onSearchChange, searchInputProps, multiple, renderBackfill, _internalProps: { inputBaseProps, labelKey, optionsMap, innerValue, onToggleSelected, onClear, renderPopperContent }, }: Omit<SelectBaseProps, 'defaultValue' | 'value' | 'onChange'> & {
+export declare function SelectBase({ inputProps, popperProps, popperRef, defaultOpen, open, onOpenChange, placeholder, sizeAdaptable, disabled, readOnly, loading, searchable, defaultSearchValue, searchValue, onSearchChange, searchInputProps, multiple, renderBackfill, _internalProps: { labelKey, optionsMap, innerValue, onToggleSelected, renderPopperContent }, ...props }: Omit<SelectBaseProps, 'defaultValue' | 'value' | 'onChange'> & {
     /** @private 内部使用的属性 */
     _internalProps: {
-        inputBaseProps?: Omit<InputBaseProps<'input'>, 'children'>;
         labelKey: keyof any;
         optionsMap: Map<Id, any>;
         innerValue: (Id & Id[]) | undefined;
         onToggleSelected(value: Id): void;
-        onClear: (() => void) | undefined;
         renderPopperContent(searchValue: string, toggleSelected: (value: Id) => void): ReactNode;
     };
 }): import("@emotion/react/jsx-runtime").JSX.Element;

package/dist/cjs/components/selectBase/selectBase.js

@@ -16,7 +16,7 @@ const loadingIndicator_1 = require("../loadingIndicator");
 const faChevronDown_1 = require("@fortawesome/free-solid-svg-icons/faChevronDown");
 function SelectBase({ inputProps, popperProps, popperRef, defaultOpen = false, open, onOpenChange, placeholder = '请选择', sizeAdaptable = true, disabled, readOnly, loading = false, searchable, defaultSearchValue = '', searchValue, onSearchChange, searchInputProps, 
 // 从SelectableProps继承
-multiple = false, renderBackfill, _internalProps: { inputBaseProps, labelKey, optionsMap, innerValue, onToggleSelected, onClear, renderPopperContent }, }) {
+multiple = false, renderBackfill, _internalProps: { labelKey, optionsMap, innerValue, onToggleSelected, renderPopperContent }, ...props }) {
     const [innerOpen, _setInnerOpen] = (0, utils_1.useControlled)(defaultOpen, open, onOpenChange);
     const setInnerOpen = (open) => {
         _setInnerOpen(open);
@@ -86,13 +86,12 @@ multiple = false, renderBackfill, _internalProps: { inputBaseProps, labelKey, op
             onOpenChange: openChangeHandler,
             onOpenChangeEnd: openChangeEnd,
             onPointerDown: e => e.preventDefault()
-        }), children: (0, jsx_runtime_1.jsx)(inputBase_1.InputBase, { clearable: multiple, ...(0, utils_1.mergeComponentProps)(inputBaseProps, {
+        }), children: (0, jsx_runtime_1.jsx)(inputBase_1.InputBase, { clearable: multiple, ...(0, utils_1.mergeComponentProps)(props, {
                 css: selectBase_style_1.style,
                 className: selectBase_style_1.classes.root,
                 disabled,
                 readOnly,
                 value: innerValue,
-                onClear,
                 onBlur
             }), "data-focused": innerOpen.current, children: inputBaseProps => (0, jsx_runtime_1.jsxs)("div", { className: selectBase_style_1.classes.contentWrap, children: [(0, utils_1.isNoValue)(innerValue)
                         ? (0, jsx_runtime_1.jsx)("div", { className: selectBase_style_1.classes.placeholder, children: placeholder })

package/dist/cjs/components/selectionContext/selectionHook.d.ts

@@ -1,8 +1,9 @@
 import { Dispatch, SetStateAction } from 'react';
 import { ISelectionContext, OptionType, SelectionContextProps } from './selectionContext';
 import { Id, SelectableProps } from '../../types';
-export declare function useSelection<O extends OptionType<V>, V extends Id = Id>(props: SelectionContextProps<O, V>): ISelectionContext<O, V>;
-export type UseFlatSelectionParams<V extends Id = Id> = SelectableProps<V> & {
+export declare function useSelection<O extends OptionType<V>, V extends Id = Id>({ ...props }: SelectionContextProps<O, V>): ISelectionContext<O, V>;
+export type UseFlatSelectionParams<V extends Id = Id> = Omit<SelectableProps<V>, 'multiple'> & {
+    multiple?: boolean;
     disabled?: boolean;
     clearable?: boolean;
 };

package/dist/cjs/components/selectionContext/selectionHook.js

@@ -5,7 +5,7 @@ exports.useFlatSelection = useFlatSelection;
 const utils_1 = require("../../utils");
 const react_1 = require("react");
 const selectionContext_1 = require("./selectionContext");
-function useSelection(props) {
+function useSelection({ ...props }) {
     props.primaryKey ??= 'id';
     props.childrenKey ??= 'children';
     props.relation ??= 'dependent';

package/dist/cjs/components/tree/tree.d.ts

@@ -12,7 +12,7 @@ export type SortInfo<V extends Id = Id> = {
     destination: V;
     placement: SortPlacement;
 };
-export interface TreeBaseProps<N extends NodeType<V>, V extends Id = Id> extends Omit<SelectionContextBaseProps<N, V>, 'options'>, Omit<DivProps, 'defaultValue' | 'onChange' | 'onToggle'> {
+export interface TreeSharedProps<N extends NodeType<V>, V extends Id = Id> extends Omit<SelectionContextBaseProps<N, V>, 'options'> {
     nodes?: N[];
     /** 默认为`label` */
     labelKey?: keyof N;
@@ -33,6 +33,8 @@ export interface TreeBaseProps<N extends NodeType<V>, V extends Id = Id> extends
     /** 是否显示拖拽把手，默认为`true` */
     showDragHandle?: boolean;
     onSort?(info: SortInfo<V>): void;
+}
+export interface TreeBaseProps<N extends NodeType<V>, V extends Id = Id> extends TreeSharedProps<N, V>, Omit<DivProps, 'defaultValue' | 'onChange' | 'onToggle'> {
     searchable?: boolean;
     searchInputProps?: InputProps;
     defaultSearchValue?: string;

package/dist/cjs/components/treeSelect/treeSelect.d.ts

@@ -1,18 +1,10 @@
 import { ReactElement } from 'react';
-import { NodeType, TreeBaseProps, TreeNode } from '../tree';
+import { NodeType, TreeNode, TreeProps, TreeSharedProps } from '../tree';
 import { Id } from '../../types';
 import { SelectBaseMultipleProps, SelectBaseOwnProps, SelectBaseSingleProps } from '../selectBase';
-import { InputBaseProps } from '../inputBase';
-export interface TreeSelectOwnProps<N extends NodeType<V>, V extends Id = Id> extends SelectBaseOwnProps, Omit<TreeBaseProps<N, V>, 'prefix'> {
+export interface TreeSelectOwnProps<N extends NodeType<V>, V extends Id = Id> extends SelectBaseOwnProps, TreeSharedProps<N, V> {
     options?: N[];
-    inputBaseProps?: InputBaseProps<'input'>;
-    variant?: InputBaseProps<'input'>['variant'];
-    size?: InputBaseProps<'input'>['size'];
-    shape?: InputBaseProps<'input'>['shape'];
-    color?: InputBaseProps<'input'>['color'];
-    prefix?: InputBaseProps<'input'>['prefix'];
-    suffix?: InputBaseProps<'input'>['suffix'];
-    onClear?: InputBaseProps<'input'>['onClear'];
+    treeProps?: TreeProps<N, V>;
 }
 export interface TreeSelectSingleProps<N extends NodeType<V>, V extends Id = Id> extends TreeSelectOwnProps<N, V>, SelectBaseSingleProps<V> {
 }

package/dist/cjs/components/treeSelect/treeSelect.js

@@ -7,14 +7,16 @@ const tree_1 = require("../tree");
 const selectBase_1 = require("../selectBase");
 const selectionContext_1 = require("../selectionContext");
 const placeholder_1 = require("../placeholder");
-exports.TreeSelect = (0, react_1.memo)(({ inputProps, popperProps, popperRef, defaultOpen = false, open, onOpenChange, sizeAdaptable = true, searchable, defaultSearchValue = '', searchValue, onSearchChange, searchInputProps, options, nodes, children, 
+exports.TreeSelect = (0, react_1.memo)(({ options, children, treeProps, 
+// 从TreeSharedProps继承
+nodes, labelKey = 'label', searchTokenKey, showLine, indent, renderExpandIcon, showCheckbox, readOnly, // 同时转发至<InputBase/>, <SelectBase/>
+clickLabelToExpand, defaultExpanded, expanded, onExpandedChange, sortable, showDragHandle, onSort, primaryKey = 'value', childrenKey = 'children', relation = 'dependent', integration = 'shallowest', clearable, // 同时转发至<InputBase/>, <SelectBase/>
+disabled, // 同时转发至<InputBase/>, <SelectBase/>
+onToggle, 
 // 从SelectableProps继承
-multiple = false, defaultValue, value, onChange, renderBackfill, 
-// 以下属性转发至<InputBase/>
-inputBaseProps, variant = 'outlined', size = 'medium', shape = 'square', color = 'primary', prefix, suffix, placeholder = '请选择', disabled, readOnly, autoFocus, clearable = multiple, onClear, loading = false, ...treeProps }) => {
-    treeProps.labelKey ??= 'label';
-    treeProps.primaryKey ??= 'value';
-    treeProps.childrenKey ??= 'children';
+multiple = false, // 同时转发至<Tree/>, <SelectBase/>
+defaultValue, // 同时转发至<Tree/>
+value, onChange, renderBackfill, ...props }) => {
     const actualOptions = (0, react_1.useMemo)(() => {
         if (options) {
             return options;
@@ -38,58 +40,47 @@ inputBaseProps, variant = 'outlined', size = 'medium', shape = 'square', color =
     }, [options, nodes, children]);
     const { value: innerValue, setValue: setInnerValue, toggleSelected, optionsMap } = (0, selectionContext_1.useSelection)({
         options: actualOptions,
-        primaryKey: treeProps.primaryKey,
-        childrenKey: treeProps.childrenKey,
+        primaryKey,
+        childrenKey,
         clearable: multiple,
-        multiple,
+        multiple: multiple,
         defaultValue,
         value,
         onChange
     });
-    const clearHandler = () => {
-        onClear?.();
+    const onClear = () => {
+        props.onClear?.();
         setInnerValue(multiple ? [] : void 0);
     };
-    return ((0, jsx_runtime_1.jsx)(selectBase_1.SelectBase, { ...{
-            inputProps,
-            popperProps,
-            popperRef,
-            defaultOpen,
-            open,
-            onOpenChange,
-            placeholder,
-            sizeAdaptable,
-            disabled,
-            readOnly,
-            searchable,
-            defaultSearchValue,
-            searchValue,
-            onSearchChange,
-            searchInputProps,
-            multiple,
-            renderBackfill
-        }, _internalProps: {
-            inputBaseProps: {
-                ...inputBaseProps,
-                variant,
-                size,
-                shape,
-                color,
-                prefix,
-                suffix,
-                disabled,
-                readOnly,
-                autoFocus,
-                clearable,
-            },
-            labelKey: treeProps.labelKey,
+    return ((0, jsx_runtime_1.jsx)(selectBase_1.SelectBase, { ...props, readOnly: readOnly, clearable: clearable, disabled: disabled, multiple: multiple, renderBackfill: renderBackfill, onClear: onClear, _internalProps: {
+            labelKey,
             optionsMap,
             innerValue,
             onToggleSelected: toggleSelected,
-            onClear: clearHandler,
             renderPopperContent: (searchValue, toggleSelected) => {
                 return actualOptions?.length
-                    ? (0, jsx_runtime_1.jsx)(tree_1.Tree, { ...treeProps, nodes: actualOptions, searchable: false, searchValue: searchValue, value: innerValue, onToggle: (checked, value) => toggleSelected(value), multiple: multiple, disabled: disabled, readOnly: readOnly })
+                    ? (0, jsx_runtime_1.jsx)(tree_1.Tree, { ...treeProps, nodes,
+                        labelKey,
+                        searchTokenKey,
+                        showLine,
+                        indent,
+                        renderExpandIcon,
+                        showCheckbox,
+                        readOnly,
+                        clickLabelToExpand,
+                        defaultExpanded,
+                        expanded,
+                        onExpandedChange,
+                        sortable,
+                        showDragHandle,
+                        onSort,
+                        primaryKey,
+                        childrenKey,
+                        relation,
+                        integration,
+                        clearable,
+                        disabled,
+                        onToggle, multiple: multiple, nodes: actualOptions, searchable: false, searchValue: searchValue, value: innerValue, onToggle: (checked, value) => toggleSelected(value) })
                     : (0, jsx_runtime_1.jsx)(placeholder_1.Placeholder, {});
             }
         } }));

package/dist/cjs/types.d.ts

@@ -65,9 +65,4 @@ export type SelectableMultipleProps<T> = {
     value?: T[];
     onChange?(value: T[]): void;
 };
-export type SelectableProps<T> = {
-    multiple?: boolean;
-    defaultValue?: T | T[];
-    value?: T | T[];
-    onChange?(value: T | T[]): void;
-};
+export type SelectableProps<T> = SelectableSingleProps<T> | SelectableMultipleProps<T>;

package/dist/esm/components/select/select.d.ts

@@ -1,10 +1,9 @@
 import { ReactElement } from 'react';
 import { SelectBaseMultipleProps, SelectBaseOwnProps, SelectBaseSingleProps } from '../selectBase';
 import { MenuOptionType, OptionsBaseSharedProps } from '../optionsBase';
-import { InputBaseProps } from '../inputBase';
 import { Id } from '../../types';
 import { MenuItem } from '../menuItem';
-export interface SelectOwnProps<O extends MenuOptionType> extends SelectBaseOwnProps, OptionsBaseSharedProps<O>, Omit<InputBaseProps<'input'>, 'children' | 'placeholder' | 'defaultValue' | 'value' | 'onChange'> {
+export interface SelectOwnProps<O extends MenuOptionType> extends SelectBaseOwnProps, OptionsBaseSharedProps<O> {
 }
 export interface SelectSingleProps<O extends MenuOptionType, V extends Id = Id> extends SelectOwnProps<O>, SelectBaseSingleProps<V> {
 }

package/dist/esm/components/select/select.js

@@ -4,11 +4,12 @@ import { SelectBase } from '../selectBase';
 import { OptionsBase } from '../optionsBase';
 import { MenuItem } from '../menuItem';
 import { useFlatSelection } from '../selectionContext';
-export const Select = memo(({ inputProps, popperProps, popperRef, defaultOpen = false, open, onOpenChange, placeholder = '请选择', sizeAdaptable = true, disabled, readOnly, searchable, defaultSearchValue = '', searchValue, onSearchChange, searchInputProps, children, 
+export const Select = memo(({ children, 
 // 从SelectableProps继承
-multiple = false, defaultValue, value, onChange, renderBackfill, 
+multiple = false, // 同时转发至<SelectBase/>
+defaultValue, value, onChange, renderBackfill, // 同时转发至<SelectBase/>
 // 从OptionsBaseSharedProps继承
-showCheckbox = multiple, loading = false, options, labelKey = 'label', primaryKey = 'value', searchTokenKey = 'searchToken', filterPredicate, ...inputBaseProps }) => {
+showCheckbox = multiple, loading = false, options, labelKey = 'label', primaryKey = 'value', searchTokenKey = 'searchToken', filterPredicate, ...props }) => {
     const optionsArr = options || Children.map(children, c => {
         return isValidElement(c) ? c.props : c;
     }) || void 0;
@@ -21,33 +22,14 @@ showCheckbox = multiple, loading = false, options, labelKey = 'label', primaryKe
     }, [optionsArr, primaryKey]);
     const [innerValue, toggleSelected, setInnerValue] = useFlatSelection({ multiple, defaultValue, value, onChange });
     const onClear = () => {
+        props.onClear?.();
         setInnerValue(multiple ? [] : void 0);
     };
-    return (_jsx(SelectBase, { ...{
-            inputProps,
-            popperProps,
-            popperRef,
-            defaultOpen,
-            open,
-            onOpenChange,
-            placeholder,
-            sizeAdaptable,
-            disabled,
-            readOnly,
-            searchable,
-            defaultSearchValue,
-            searchValue,
-            onSearchChange,
-            searchInputProps,
-            multiple,
-            renderBackfill,
-        }, _internalProps: {
-            inputBaseProps,
+    return (_jsx(SelectBase, { ...props, multiple: multiple, renderBackfill: renderBackfill, onClear: onClear, _internalProps: {
             labelKey,
             optionsMap,
             innerValue,
             onToggleSelected: toggleSelected,
-            onClear,
             renderPopperContent: (searchValue, onToggleSelected) => (_jsx(OptionsBase, { selectedValue: innerValue, searchValue,
                 onToggleSelected,
                 showCheckbox,

package/dist/esm/components/selectBase/selectBase.d.ts

@@ -3,7 +3,7 @@ import { ComponentProps, ReactNode, Ref } from 'react';
 import { PopperProps, PopperRef } from '../popper';
 import { InputProps } from '../input';
 import { Id, SelectableMultipleProps, SelectableSingleProps } from '../../types';
-export type SelectBaseOwnProps = {
+export interface SelectBaseOwnProps extends Omit<InputBaseProps<'input'>, 'children' | 'placeholder' | 'defaultValue' | 'value' | 'onChange' | 'onToggle'> {
     /** <select />内部由<input />实现 */
     inputProps?: ComponentProps<'input'>;
     popperProps?: PopperProps;
@@ -21,7 +21,7 @@ export type SelectBaseOwnProps = {
     searchValue?: string;
     onSearchChange?(searchValue: string): void;
     searchInputProps?: InputProps;
-};
+}
 export interface SelectBaseSingleProps<V extends Id = Id> extends SelectBaseOwnProps, SelectableSingleProps<V> {
     renderBackfill?(selectedValue: V | undefined): ReactNode;
 }
@@ -29,15 +29,13 @@ export interface SelectBaseMultipleProps<V extends Id = Id> extends SelectBaseOw
     renderBackfill?(selectedValue: V[] | undefined): ReactNode;
 }
 export type SelectBaseProps<V extends Id = Id> = SelectBaseSingleProps<V> | SelectBaseMultipleProps<V>;
-export declare function SelectBase({ inputProps, popperProps, popperRef, defaultOpen, open, onOpenChange, placeholder, sizeAdaptable, disabled, readOnly, loading, searchable, defaultSearchValue, searchValue, onSearchChange, searchInputProps, multiple, renderBackfill, _internalProps: { inputBaseProps, labelKey, optionsMap, innerValue, onToggleSelected, onClear, renderPopperContent }, }: Omit<SelectBaseProps, 'defaultValue' | 'value' | 'onChange'> & {
+export declare function SelectBase({ inputProps, popperProps, popperRef, defaultOpen, open, onOpenChange, placeholder, sizeAdaptable, disabled, readOnly, loading, searchable, defaultSearchValue, searchValue, onSearchChange, searchInputProps, multiple, renderBackfill, _internalProps: { labelKey, optionsMap, innerValue, onToggleSelected, renderPopperContent }, ...props }: Omit<SelectBaseProps, 'defaultValue' | 'value' | 'onChange'> & {
     /** @private 内部使用的属性 */
     _internalProps: {
-        inputBaseProps?: Omit<InputBaseProps<'input'>, 'children'>;
         labelKey: keyof any;
         optionsMap: Map<Id, any>;
         innerValue: (Id & Id[]) | undefined;
         onToggleSelected(value: Id): void;
-        onClear: (() => void) | undefined;
         renderPopperContent(searchValue: string, toggleSelected: (value: Id) => void): ReactNode;
     };
 }): import("@emotion/react/jsx-runtime").JSX.Element;

package/dist/esm/components/selectBase/selectBase.js

@@ -13,7 +13,7 @@ import { LoadingIndicator } from '../loadingIndicator';
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons/faChevronDown';
 export function SelectBase({ inputProps, popperProps, popperRef, defaultOpen = false, open, onOpenChange, placeholder = '请选择', sizeAdaptable = true, disabled, readOnly, loading = false, searchable, defaultSearchValue = '', searchValue, onSearchChange, searchInputProps, 
 // 从SelectableProps继承
-multiple = false, renderBackfill, _internalProps: { inputBaseProps, labelKey, optionsMap, innerValue, onToggleSelected, onClear, renderPopperContent }, }) {
+multiple = false, renderBackfill, _internalProps: { labelKey, optionsMap, innerValue, onToggleSelected, renderPopperContent }, ...props }) {
     const [innerOpen, _setInnerOpen] = useControlled(defaultOpen, open, onOpenChange);
     const setInnerOpen = (open) => {
         _setInnerOpen(open);
@@ -83,13 +83,12 @@ multiple = false, renderBackfill, _internalProps: { inputBaseProps, labelKey, op
             onOpenChange: openChangeHandler,
             onOpenChangeEnd: openChangeEnd,
             onPointerDown: e => e.preventDefault()
-        }), children: _jsx(InputBase, { clearable: multiple, ...mergeComponentProps(inputBaseProps, {
+        }), children: _jsx(InputBase, { clearable: multiple, ...mergeComponentProps(props, {
                 css: style,
                 className: classes.root,
                 disabled,
                 readOnly,
                 value: innerValue,
-                onClear,
                 onBlur
             }), "data-focused": innerOpen.current, children: inputBaseProps => _jsxs("div", { className: classes.contentWrap, children: [isNoValue(innerValue)
                         ? _jsx("div", { className: classes.placeholder, children: placeholder })

package/dist/esm/components/selectionContext/selectionHook.d.ts

@@ -1,8 +1,9 @@
 import { Dispatch, SetStateAction } from 'react';
 import { ISelectionContext, OptionType, SelectionContextProps } from './selectionContext';
 import { Id, SelectableProps } from '../../types';
-export declare function useSelection<O extends OptionType<V>, V extends Id = Id>(props: SelectionContextProps<O, V>): ISelectionContext<O, V>;
-export type UseFlatSelectionParams<V extends Id = Id> = SelectableProps<V> & {
+export declare function useSelection<O extends OptionType<V>, V extends Id = Id>({ ...props }: SelectionContextProps<O, V>): ISelectionContext<O, V>;
+export type UseFlatSelectionParams<V extends Id = Id> = Omit<SelectableProps<V>, 'multiple'> & {
+    multiple?: boolean;
     disabled?: boolean;
     clearable?: boolean;
 };

package/dist/esm/components/selectionContext/selectionHook.js

@@ -1,7 +1,7 @@
 import { isSelected, isUnset, toArray, useControlled, useDerivedState, useSync } from '../../utils';
 import { useCallback, useMemo, useRef } from 'react';
 import { useSelectionContext } from './selectionContext';
-export function useSelection(props) {
+export function useSelection({ ...props }) {
     props.primaryKey ??= 'id';
     props.childrenKey ??= 'children';
     props.relation ??= 'dependent';

package/dist/esm/components/tree/tree.d.ts

@@ -12,7 +12,7 @@ export type SortInfo<V extends Id = Id> = {
     destination: V;
     placement: SortPlacement;
 };
-export interface TreeBaseProps<N extends NodeType<V>, V extends Id = Id> extends Omit<SelectionContextBaseProps<N, V>, 'options'>, Omit<DivProps, 'defaultValue' | 'onChange' | 'onToggle'> {
+export interface TreeSharedProps<N extends NodeType<V>, V extends Id = Id> extends Omit<SelectionContextBaseProps<N, V>, 'options'> {
     nodes?: N[];
     /** 默认为`label` */
     labelKey?: keyof N;
@@ -33,6 +33,8 @@ export interface TreeBaseProps<N extends NodeType<V>, V extends Id = Id> extends
     /** 是否显示拖拽把手，默认为`true` */
     showDragHandle?: boolean;
     onSort?(info: SortInfo<V>): void;
+}
+export interface TreeBaseProps<N extends NodeType<V>, V extends Id = Id> extends TreeSharedProps<N, V>, Omit<DivProps, 'defaultValue' | 'onChange' | 'onToggle'> {
     searchable?: boolean;
     searchInputProps?: InputProps;
     defaultSearchValue?: string;

package/dist/esm/components/treeSelect/treeSelect.d.ts

@@ -1,18 +1,10 @@
 import { ReactElement } from 'react';
-import { NodeType, TreeBaseProps, TreeNode } from '../tree';
+import { NodeType, TreeNode, TreeProps, TreeSharedProps } from '../tree';
 import { Id } from '../../types';
 import { SelectBaseMultipleProps, SelectBaseOwnProps, SelectBaseSingleProps } from '../selectBase';
-import { InputBaseProps } from '../inputBase';
-export interface TreeSelectOwnProps<N extends NodeType<V>, V extends Id = Id> extends SelectBaseOwnProps, Omit<TreeBaseProps<N, V>, 'prefix'> {
+export interface TreeSelectOwnProps<N extends NodeType<V>, V extends Id = Id> extends SelectBaseOwnProps, TreeSharedProps<N, V> {
     options?: N[];
-    inputBaseProps?: InputBaseProps<'input'>;
-    variant?: InputBaseProps<'input'>['variant'];
-    size?: InputBaseProps<'input'>['size'];
-    shape?: InputBaseProps<'input'>['shape'];
-    color?: InputBaseProps<'input'>['color'];
-    prefix?: InputBaseProps<'input'>['prefix'];
-    suffix?: InputBaseProps<'input'>['suffix'];
-    onClear?: InputBaseProps<'input'>['onClear'];
+    treeProps?: TreeProps<N, V>;
 }
 export interface TreeSelectSingleProps<N extends NodeType<V>, V extends Id = Id> extends TreeSelectOwnProps<N, V>, SelectBaseSingleProps<V> {
 }

package/dist/esm/components/treeSelect/treeSelect.js

@@ -4,14 +4,16 @@ import { Tree, TreeNode } from '../tree';
 import { SelectBase } from '../selectBase';
 import { useSelection } from '../selectionContext';
 import { Placeholder } from '../placeholder';
-export const TreeSelect = memo(({ inputProps, popperProps, popperRef, defaultOpen = false, open, onOpenChange, sizeAdaptable = true, searchable, defaultSearchValue = '', searchValue, onSearchChange, searchInputProps, options, nodes, children, 
+export const TreeSelect = memo(({ options, children, treeProps, 
+// 从TreeSharedProps继承
+nodes, labelKey = 'label', searchTokenKey, showLine, indent, renderExpandIcon, showCheckbox, readOnly, // 同时转发至<InputBase/>, <SelectBase/>
+clickLabelToExpand, defaultExpanded, expanded, onExpandedChange, sortable, showDragHandle, onSort, primaryKey = 'value', childrenKey = 'children', relation = 'dependent', integration = 'shallowest', clearable, // 同时转发至<InputBase/>, <SelectBase/>
+disabled, // 同时转发至<InputBase/>, <SelectBase/>
+onToggle, 
 // 从SelectableProps继承
-multiple = false, defaultValue, value, onChange, renderBackfill, 
-// 以下属性转发至<InputBase/>
-inputBaseProps, variant = 'outlined', size = 'medium', shape = 'square', color = 'primary', prefix, suffix, placeholder = '请选择', disabled, readOnly, autoFocus, clearable = multiple, onClear, loading = false, ...treeProps }) => {
-    treeProps.labelKey ??= 'label';
-    treeProps.primaryKey ??= 'value';
-    treeProps.childrenKey ??= 'children';
+multiple = false, // 同时转发至<Tree/>, <SelectBase/>
+defaultValue, // 同时转发至<Tree/>
+value, onChange, renderBackfill, ...props }) => {
     const actualOptions = useMemo(() => {
         if (options) {
             return options;
@@ -35,58 +37,47 @@ inputBaseProps, variant = 'outlined', size = 'medium', shape = 'square', color =
     }, [options, nodes, children]);
     const { value: innerValue, setValue: setInnerValue, toggleSelected, optionsMap } = useSelection({
         options: actualOptions,
-        primaryKey: treeProps.primaryKey,
-        childrenKey: treeProps.childrenKey,
+        primaryKey,
+        childrenKey,
         clearable: multiple,
-        multiple,
+        multiple: multiple,
         defaultValue,
         value,
         onChange
     });
-    const clearHandler = () => {
-        onClear?.();
+    const onClear = () => {
+        props.onClear?.();
         setInnerValue(multiple ? [] : void 0);
     };
-    return (_jsx(SelectBase, { ...{
-            inputProps,
-            popperProps,
-            popperRef,
-            defaultOpen,
-            open,
-            onOpenChange,
-            placeholder,
-            sizeAdaptable,
-            disabled,
-            readOnly,
-            searchable,
-            defaultSearchValue,
-            searchValue,
-            onSearchChange,
-            searchInputProps,
-            multiple,
-            renderBackfill
-        }, _internalProps: {
-            inputBaseProps: {
-                ...inputBaseProps,
-                variant,
-                size,
-                shape,
-                color,
-                prefix,
-                suffix,
-                disabled,
-                readOnly,
-                autoFocus,
-                clearable,
-            },
-            labelKey: treeProps.labelKey,
+    return (_jsx(SelectBase, { ...props, readOnly: readOnly, clearable: clearable, disabled: disabled, multiple: multiple, renderBackfill: renderBackfill, onClear: onClear, _internalProps: {
+            labelKey,
             optionsMap,
             innerValue,
             onToggleSelected: toggleSelected,
-            onClear: clearHandler,
             renderPopperContent: (searchValue, toggleSelected) => {
                 return actualOptions?.length
-                    ? _jsx(Tree, { ...treeProps, nodes: actualOptions, searchable: false, searchValue: searchValue, value: innerValue, onToggle: (checked, value) => toggleSelected(value), multiple: multiple, disabled: disabled, readOnly: readOnly })
+                    ? _jsx(Tree, { ...treeProps, nodes,
+                        labelKey,
+                        searchTokenKey,
+                        showLine,
+                        indent,
+                        renderExpandIcon,
+                        showCheckbox,
+                        readOnly,
+                        clickLabelToExpand,
+                        defaultExpanded,
+                        expanded,
+                        onExpandedChange,
+                        sortable,
+                        showDragHandle,
+                        onSort,
+                        primaryKey,
+                        childrenKey,
+                        relation,
+                        integration,
+                        clearable,
+                        disabled,
+                        onToggle, multiple: multiple, nodes: actualOptions, searchable: false, searchValue: searchValue, value: innerValue, onToggle: (checked, value) => toggleSelected(value) })
                     : _jsx(Placeholder, {});
             }
         } }));

package/dist/esm/types.d.ts

@@ -65,9 +65,4 @@ export type SelectableMultipleProps<T> = {
     value?: T[];
     onChange?(value: T[]): void;
 };
-export type SelectableProps<T> = {
-    multiple?: boolean;
-    defaultValue?: T | T[];
-    value?: T | T[];
-    onChange?(value: T | T[]): void;
-};
+export type SelectableProps<T> = SelectableSingleProps<T> | SelectableMultipleProps<T>;