@mezzanine-ui/react 0.9.2 → 0.10.0

package/Select/Select.js

@@ -1,13 +1,12 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { forwardRef, useContext, useState, useRef, useLayoutEffect } from 'react';
+import { forwardRef, useContext, useState, useRef, useMemo } from 'react';
 import { selectClasses } from '@mezzanine-ui/core/select';
-import { SearchIcon } from '@mezzanine-ui/icons';
+import isArray from 'lodash/isArray';
 import { useComposeRefs } from '../hooks/useComposeRefs.js';
 import { SelectControlContext } from './SelectControlContext.js';
 import { useSelectValueControl } from '../Form/useSelectValueControl.js';
 import { useClickAway } from '../hooks/useClickAway.js';
 import SelectTrigger from './SelectTrigger.js';
-import Icon from '../Icon/Icon.js';
 import InputTriggerPopper from '../_internal/InputTriggerPopper/InputTriggerPopper.js';
 import Menu from '../Menu/Menu.js';
 import { FormControlContext } from '../Form/FormControlContext.js';
@@ -17,7 +16,7 @@ const MENU_ID = 'mzn-select-menu-id';
 const Select = forwardRef(function Select(props, ref) {
     var _a, _b;
     const { disabled: disabledFromFormControl, fullWidth: fullWidthFromFormControl, required: requiredFromFormControl, severity, } = useContext(FormControlContext) || {};
-    const { children, className, clearable = false, defaultValue, disabled = disabledFromFormControl || false, error = severity === 'error' || false, fullWidth = fullWidthFromFormControl || false, inputProps, inputRef, itemsInView = 4, menuMaxHeight, menuRole = 'listbox', menuSize = 'medium', mode = 'single', onBlur, onChange: onChangeProp, onClear: onClearProp, onFocus, onSearch, placeholder = '', popperOptions = {}, prefix, renderValue: renderValueProp, required = requiredFromFormControl || false, size = 'medium', suffixActionIcon: suffixActionIconProp, value: valueProp, } = props;
+    const { children, className, clearable = false, defaultValue, disabled = disabledFromFormControl || false, error = severity === 'error' || false, fullWidth = fullWidthFromFormControl || false, inputProps, inputRef, itemsInView = 4, menuMaxHeight, menuRole = 'listbox', menuSize = 'medium', mode = 'single', onBlur, onChange: onChangeProp, onClear: onClearProp, onFocus, placeholder = '', popperOptions = {}, prefix, renderValue, required = requiredFromFormControl || false, size = 'medium', suffixActionIcon, value: valueProp, } = props;
     const [open, toggleOpen] = useState(false);
     const onOpen = () => {
         onFocus === null || onFocus === void 0 ? void 0 : onFocus();
@@ -47,46 +46,28 @@ const Select = forwardRef(function Select(props, ref) {
     const controlRef = useRef(null);
     const popperRef = useRef(null);
     const composedRef = useComposeRefs([ref, controlRef]);
-    const searchable = typeof onSearch === 'function';
-    const [searchText, changeSearchText] = useState('');
-    const [focused, setFocused] = useState(false);
-    const renderValue = focused && searchable ? () => searchText : renderValueProp;
     function getPlaceholder() {
-        if (focused && searchable) {
-            if (typeof renderValueProp === 'function') {
-                return renderValueProp(value);
-            }
-            if (value) {
-                return value.name;
-            }
-            return placeholder;
+        if (typeof renderValue === 'function') {
+            return renderValue(value);
+        }
+        if (value && !isArray(value)) {
+            return value.name;
         }
         return placeholder;
     }
-    useLayoutEffect(() => {
-        if (!focused) {
-            changeSearchText('');
-            if (typeof onSearch === 'function') {
-                onSearch('');
-            }
-        }
-    }, [focused, onSearch]);
     useClickAway(() => {
-        if (!open || focused)
+        if (!open)
             return;
         return () => {
             onClose();
         };
     }, nodeRef, [
-        focused,
         nodeRef,
         open,
         toggleOpen,
     ]);
-    const suffixActionIcon = suffixActionIconProp || (searchable && open ? (jsx(Icon, { icon: SearchIcon }, void 0)) : undefined);
     const onClickTextField = () => {
-        /** when searchable, should open menu when focus */
-        if (!searchable && !disabled) {
+        if (!disabled) {
             onToggleOpen();
         }
     };
@@ -117,34 +98,19 @@ const Select = forwardRef(function Select(props, ref) {
             }
         }
     };
-    /** Trigger input props */
-    const onSearchInputChange = searchable ? (e) => {
-        changeSearchText(e.target.value);
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        onSearch(e.target.value);
-    } : undefined;
-    const onSearchInputFocus = searchable ? (e) => {
-        e.stopPropagation();
-        onToggleOpen();
-        setFocused(true);
-    } : undefined;
-    const onSearchInputBlur = () => setFocused(false);
     const resolvedInputProps = {
         ...inputProps,
         'aria-controls': MENU_ID,
         'aria-expanded': open,
         'aria-owns': MENU_ID,
-        onBlur: onSearchInputBlur,
-        onChange: onSearchInputChange,
-        onFocus: onSearchInputFocus,
         placeholder: getPlaceholder(),
         role: 'combobox',
     };
-    return (jsx(SelectControlContext.Provider, Object.assign({ value: {
-            onChange,
-            value,
-        } }, { children: jsxs("div", Object.assign({ ref: nodeRef, className: cx(selectClasses.host, fullWidth && selectClasses.hostFullWidth) }, { children: [jsx(SelectTrigger, { ref: composedRef, active: open, className: className, clearable: clearable, disabled: disabled, error: error, fullWidth: fullWidth, inputRef: inputRef, mode: mode, onTagClose: onChange, onClear: onClear, onClick: onClickTextField, onKeyDown: onKeyDownTextField, prefix: prefix, readOnly: !searchable, required: required, inputProps: resolvedInputProps, size: size, suffixActionIcon: suffixActionIcon, value: value, renderValue: renderValue }, void 0),
-                jsx(InputTriggerPopper, Object.assign({ ref: popperRef, anchor: controlRef, className: selectClasses.popper, open: open, sameWidth: true, options: popperOptions }, { children: jsx(Menu, Object.assign({ id: MENU_ID, "aria-activedescendant": Array.isArray(value) ? (_b = (_a = value === null || value === void 0 ? void 0 : value[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '' : value === null || value === void 0 ? void 0 : value.id, itemsInView: itemsInView, maxHeight: menuMaxHeight, role: menuRole, size: menuSize, style: { border: 0 } }, { children: children }), void 0) }), void 0)] }), void 0) }), void 0));
+    const context = useMemo(() => ({
+        onChange,
+        value,
+    }), [onChange, value]);
+    return (jsx(SelectControlContext.Provider, { value: context, children: jsxs("div", { ref: nodeRef, className: cx(selectClasses.host, fullWidth && selectClasses.hostFullWidth), children: [jsx(SelectTrigger, { ref: composedRef, active: open, className: className, clearable: clearable, disabled: disabled, error: error, fullWidth: fullWidth, inputRef: inputRef, mode: mode, onTagClose: onChange, onClear: onClear, onClick: onClickTextField, onKeyDown: onKeyDownTextField, prefix: prefix, readOnly: true, renderValue: renderValue, required: required, inputProps: resolvedInputProps, size: size, suffixActionIcon: suffixActionIcon, value: value }), jsx(InputTriggerPopper, { ref: popperRef, anchor: controlRef, className: selectClasses.popper, open: open, sameWidth: true, options: popperOptions, children: jsx(Menu, { id: MENU_ID, "aria-activedescendant": Array.isArray(value) ? (_b = (_a = value === null || value === void 0 ? void 0 : value[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '' : value === null || value === void 0 ? void 0 : value.id, itemsInView: itemsInView, maxHeight: menuMaxHeight, role: menuRole, size: menuSize, style: { border: 0 }, children: children }) })] }) }));
 });
 var Select$1 = Select;
 

package/Select/SelectTrigger.d.ts

@@ -8,6 +8,10 @@ export interface SelectTriggerBaseProps extends Omit<TextFieldProps, 'active' |
      * Controls the chevron icon layout.
      */
     active?: boolean;
+    /**
+     * Tags arg ellipsis or not.
+     */
+    ellipsis?: boolean;
     /**
      * force hide suffixAction icons
      */
@@ -43,6 +47,9 @@ export interface SelectTriggerBaseProps extends Omit<TextFieldProps, 'active' |
      * @default false
      */
     required?: boolean;
+    searchText?: string;
+    showTextInputAfterTags?: boolean;
+    suffixAction?: VoidFunction;
 }
 export declare type SelectTriggerMultipleProps = SelectTriggerBaseProps & {
     /**
@@ -78,5 +85,5 @@ export declare type SelectTriggerSingleProps = SelectTriggerBaseProps & {
 };
 export declare type SelectTriggerComponentProps = SelectTriggerMultipleProps | SelectTriggerSingleProps;
 export declare type SelectTriggerProps = Omit<SelectTriggerComponentProps, 'innerRef'>;
-declare const SelectTrigger: import("react").ForwardRefExoticComponent<Pick<SelectTriggerComponentProps, "disabled" | "placeholder" | "readOnly" | "required" | "size" | "value" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "active" | "clearable" | "error" | "fullWidth" | "onClear" | "suffixActionIcon" | "forceHideSuffixActionIcon" | "inputProps" | "inputRef" | "onTagClose" | "renderValue" | "mode"> & import("react").RefAttributes<HTMLDivElement>>;
+declare const SelectTrigger: import("react").ForwardRefExoticComponent<SelectTriggerProps & import("react").RefAttributes<HTMLDivElement>>;
 export default SelectTrigger;

package/Select/SelectTrigger.js

@@ -2,14 +2,13 @@ import { jsx } from 'react/jsx-runtime';
 import { forwardRef } from 'react';
 import { selectClasses } from '@mezzanine-ui/core/select';
 import { ChevronDownIcon } from '@mezzanine-ui/icons';
+import SelectTriggerTags from './SelectTriggerTags.js';
 import Icon from '../Icon/Icon.js';
 import TextField from '../TextField/TextField.js';
-import Tag from '../Tag/Tag.js';
 import cx from 'clsx';
 
 function SelectTriggerComponent(props) {
-    var _a;
-    const { active, className, disabled, forceHideSuffixActionIcon, inputProps, innerRef, inputRef, mode, onTagClose, readOnly, renderValue: renderValueProp, required, size, suffixActionIcon: suffixActionIconProp, value, ...restTextFieldProps } = props;
+    const { active, className, disabled, ellipsis = false, forceHideSuffixActionIcon, inputProps, innerRef, inputRef, mode, onTagClose, readOnly, renderValue: renderValueProp, required, searchText, size, showTextInputAfterTags = false, suffixAction, suffixActionIcon: suffixActionIconProp, value, ...restTextFieldProps } = props;
     /** Render value to string for input */
     const renderValue = () => {
         if (typeof renderValueProp === 'function') {
@@ -24,28 +23,25 @@ function SelectTriggerComponent(props) {
         return '';
     };
     /** Compute suffix action icon */
-    const suffixActionIcon = suffixActionIconProp || (jsx(Icon, { icon: ChevronDownIcon, className: cx(selectClasses.triggerSuffixActionIcon, {
+    const suffixActionIcon = suffixActionIconProp || (jsx(Icon, { icon: ChevronDownIcon, onClick: suffixAction, className: cx(selectClasses.triggerSuffixActionIcon, {
             [selectClasses.triggerSuffixActionIconActive]: active,
-        }) }, void 0));
+        }) }));
     const getTextFieldActive = () => {
         if (value) {
             if (Array.isArray(value)) {
-                return !!(value === null || value === void 0 ? void 0 : value.length);
+                return !!value.length;
             }
             return !!value;
         }
         return false;
     };
-    return (jsx(TextField, Object.assign({ ref: innerRef }, restTextFieldProps, { active: getTextFieldActive(), className: cx(selectClasses.trigger, className), disabled: disabled, size: size, suffixActionIcon: forceHideSuffixActionIcon ? undefined : suffixActionIcon }, { children: mode === 'multiple' && ((_a = value) === null || _a === void 0 ? void 0 : _a.length) ? (jsx("div", Object.assign({ className: selectClasses.triggerTags }, { children: value.map((selection) => (jsx(Tag, Object.assign({ closable: true, disabled: disabled, onClose: (e) => {
-                    e.stopPropagation();
-                    onTagClose === null || onTagClose === void 0 ? void 0 : onTagClose(selection);
-                }, size: size }, { children: selection.name }), selection.id))) }), void 0)) : (jsx("input", Object.assign({}, inputProps, { ref: inputRef, "aria-autocomplete": "list", "aria-disabled": disabled, "aria-haspopup": "listbox", "aria-readonly": readOnly, "aria-required": required, autoComplete: "false", disabled: disabled, readOnly: readOnly, required: required, type: "search", value: renderValue() }), void 0)) }), void 0));
+    return (jsx(TextField, { ref: innerRef, ...restTextFieldProps, active: getTextFieldActive(), className: cx(selectClasses.trigger, className), disabled: disabled, size: size, suffixActionIcon: forceHideSuffixActionIcon ? undefined : suffixActionIcon, children: mode === 'multiple' && (value === null || value === void 0 ? void 0 : value.length) ? (jsx(SelectTriggerTags, { disabled: disabled, ellipsis: ellipsis, inputProps: inputProps, inputRef: inputRef, onTagClose: onTagClose, readOnly: readOnly, required: required, searchText: searchText, size: size, showTextInputAfterTags: showTextInputAfterTags, value: value })) : (jsx("input", { ...inputProps, ref: inputRef, "aria-autocomplete": "list", "aria-disabled": disabled, "aria-haspopup": "listbox", "aria-readonly": readOnly, "aria-required": required, autoComplete: "false", disabled: disabled, readOnly: readOnly, required: required, type: "search", value: renderValue() })) }));
 }
 const SelectTrigger = forwardRef((props, ref) => {
     if (props.mode === 'multiple') {
-        return (jsx(SelectTriggerComponent, Object.assign({}, props, { innerRef: ref }), void 0));
+        return (jsx(SelectTriggerComponent, { ...props, innerRef: ref }));
     }
-    return (jsx(SelectTriggerComponent, Object.assign({}, props, { innerRef: ref }), void 0));
+    return (jsx(SelectTriggerComponent, { ...props, innerRef: ref }));
 });
 var SelectTrigger$1 = SelectTrigger;
 

package/Select/SelectTriggerTags.d.ts

@@ -0,0 +1,19 @@
+import { Ref } from 'react';
+import { TagSize } from '@mezzanine-ui/core/tag';
+import { NativeElementPropsWithoutKeyAndRef } from '../utils/jsx-types';
+import { SelectValue } from './typings';
+export interface SelectTriggerTagsProps {
+    disabled?: boolean;
+    ellipsis: boolean;
+    inputProps?: Omit<NativeElementPropsWithoutKeyAndRef<'input'>, 'autoComplete' | 'children' | 'defaultValue' | 'disabled' | 'readOnly' | 'required' | 'type' | 'value' | `aria-${'autocomplete' | 'disabled' | 'haspopup' | 'multiline' | 'readonly' | 'required'}`>;
+    inputRef?: Ref<HTMLInputElement>;
+    onTagClose?: (target: SelectValue) => void;
+    readOnly?: boolean;
+    required?: boolean;
+    searchText?: string;
+    size?: TagSize;
+    showTextInputAfterTags?: boolean;
+    value?: SelectValue[];
+}
+declare const SelectTriggerTags: import("react").ForwardRefExoticComponent<SelectTriggerTagsProps & import("react").RefAttributes<HTMLDivElement>>;
+export default SelectTriggerTags;

package/Select/SelectTriggerTags.js

@@ -0,0 +1,33 @@
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { forwardRef, useRef } from 'react';
+import { selectClasses } from '@mezzanine-ui/core/select';
+import take from 'lodash/take';
+import { useComposeRefs } from '../hooks/useComposeRefs.js';
+import { useSelectTriggerTags } from './useSelectTriggerTags.js';
+import Tag from '../Tag/Tag.js';
+import cx from 'clsx';
+
+const SelectTriggerTags = forwardRef(function SelectTriggerTags(props, ref) {
+    const { disabled, ellipsis, inputProps, inputRef, onTagClose, readOnly, required, searchText, size = 'medium', showTextInputAfterTags, value, } = props;
+    const controlRef = useRef();
+    const composedRef = useComposeRefs([ref, controlRef]);
+    const { renderFakeTags, takeCount, } = useSelectTriggerTags({
+        controlRef,
+        value,
+        size,
+    });
+    return (jsxs("div", { ref: composedRef, className: cx(selectClasses.triggerTagsInputWrapper, {
+            [selectClasses.triggerTagsInputWrapperEllipsis]: ellipsis,
+        }), children: [jsxs("div", { className: cx(selectClasses.triggerTags, {
+                    [selectClasses.triggerTagsEllipsis]: ellipsis,
+                }), children: [ellipsis ? (jsxs(Fragment, { children: [take(value, takeCount).map((selection) => (jsx(Tag, { closable: true, disabled: disabled, onClose: (e) => {
+                                    e.stopPropagation();
+                                    onTagClose === null || onTagClose === void 0 ? void 0 : onTagClose(selection);
+                                }, size: size, children: selection.name }, selection.id))), value && value.length > takeCount ? (jsx(Tag, { disabled: disabled, size: size, children: `+${value.length - takeCount <= 99 ? value.length - takeCount : 99}...` })) : null] })) : (value === null || value === void 0 ? void 0 : value.map((selection) => (jsx(Tag, { closable: true, disabled: disabled, onClose: (e) => {
+                            e.stopPropagation();
+                            onTagClose === null || onTagClose === void 0 ? void 0 : onTagClose(selection);
+                        }, size: size, children: selection.name }, selection.id)))), ellipsis ? renderFakeTags() : null] }), showTextInputAfterTags ? (jsx("div", { className: selectClasses.triggerTagsInput, children: jsx("input", { ...inputProps, ref: inputRef, "aria-autocomplete": "list", "aria-disabled": disabled, "aria-haspopup": "listbox", "aria-readonly": readOnly, "aria-required": required, autoComplete: "false", disabled: disabled, readOnly: readOnly, required: required, type: "search", value: searchText }) })) : null] }));
+});
+var SelectTriggerTags$1 = SelectTriggerTags;
+
+export { SelectTriggerTags$1 as default };

package/Select/TreeSelect.js

@@ -187,12 +187,11 @@ const TreeSelect = forwardRef((props, ref) => {
         const newExpandedValues = toggleValue(value, expandedValues);
         setExpandedValues(newExpandedValues);
     };
-    return (jsxs("div", Object.assign({ ref: nodeRef, className: selectClasses.treeSelect }, { children: [jsx(SelectTrigger, { ref: composedRef, active: open, className: className, clearable: clearable, disabled: disabled, error: error, fullWidth: fullWidth, inputProps: resolvedInputProps, inputRef: inputRef, mode: mode, onClear: onClear, onClick: onTextFieldClick, onKeyDown: onTextFieldKeydown, onTagClose: onTagClose, prefix: prefix, readOnly: true, renderValue: renderValue, required: required, size: size, suffixActionIcon: suffixActionIcon, value: valueProp }, void 0),
-            jsx(InputTriggerPopper, Object.assign({ ref: popperRef, anchor: controlRef, className: selectClasses.popper, controllerRef: controllerRef, open: open, options: popperOptions, sameWidth: sameWidth }, { children: jsx(Menu, Object.assign({ itemsInView: itemsInView, maxHeight: menuMaxHeight, role: menuRole, size: menuSize, style: {
+    return (jsxs("div", { ref: nodeRef, className: selectClasses.treeSelect, children: [jsx(SelectTrigger, { ref: composedRef, active: open, className: className, clearable: clearable, disabled: disabled, error: error, fullWidth: fullWidth, inputProps: resolvedInputProps, inputRef: inputRef, mode: mode, onClear: onClear, onClick: onTextFieldClick, onKeyDown: onTextFieldKeydown, onTagClose: onTagClose, prefix: prefix, readOnly: true, renderValue: renderValue, required: required, size: size, suffixActionIcon: suffixActionIcon, value: valueProp }), jsx(InputTriggerPopper, { ref: popperRef, anchor: controlRef, className: selectClasses.popper, controllerRef: controllerRef, open: open, options: popperOptions, sameWidth: sameWidth, children: jsx(Menu, { itemsInView: itemsInView, maxHeight: menuMaxHeight, role: menuRole, size: menuSize, style: {
                         ...restStyle,
                         border: border || 0,
                         width: width || `${panelWidth}px`,
-                    } }, { children: jsx(Tree, Object.assign({}, restTreeProps, { ref: ref, className: cx(selectClasses.tree, treeClassName), disabledValues: disabledValues, expandControllerRef: expandControllerRef, expandedValues: expandedValues, multiple: multiple, nodes: nodes, onExpand: onExpand, onSelect: onSelect, selectMethod: "target", selectable: true, values: selectedValues }), void 0) }), void 0) }), void 0)] }), void 0));
+                    }, children: jsx(Tree, { ...restTreeProps, ref: ref, className: cx(selectClasses.tree, treeClassName), disabledValues: disabledValues, expandControllerRef: expandControllerRef, expandedValues: expandedValues, multiple: multiple, nodes: nodes, onExpand: onExpand, onSelect: onSelect, selectMethod: "target", selectable: true, values: selectedValues }) }) })] }));
 });
 var TreeSelect$1 = TreeSelect;
 

package/Select/index.d.ts

@@ -1,6 +1,7 @@
 export * from './typings';
 export { SelectControlContext, } from './SelectControlContext';
 export { SelectTriggerProps, SelectTriggerInputProps, default as SelectTrigger, } from './SelectTrigger';
+export { SelectTriggerTagsProps, default as SelectTriggerTags, } from './SelectTriggerTags';
 export { SelectProps, default, } from './Select';
 export { OptionProps, default as Option, } from './Option';
 export { MenuItemGroupProps as OptionGroupProps, default as OptionGroup, } from '../Menu/MenuItemGroup';

package/Select/index.js

@@ -1,5 +1,6 @@
 export { SelectControlContext } from './SelectControlContext.js';
 export { default as SelectTrigger } from './SelectTrigger.js';
+export { default as SelectTriggerTags } from './SelectTriggerTags.js';
 export { default } from './Select.js';
 export { default as Option } from './Option.js';
 export { default as OptionGroup } from '../Menu/MenuItemGroup.js';

package/Select/useSelectTriggerTags.d.ts

@@ -0,0 +1,19 @@
+import { MutableRefObject } from 'react';
+import { TagSize } from '@mezzanine-ui/core/tag';
+import { SelectValue } from './typings';
+export interface UseSelectTriggerTagsProps {
+    controlRef: MutableRefObject<HTMLDivElement | undefined>;
+    size?: TagSize;
+    value?: SelectValue[];
+}
+export interface UseSelectTriggerTagsValue {
+    renderFakeTags: () => JSX.Element | null;
+    takeCount: number;
+}
+export declare function calcTakeCount({ tagsWidths, maxWidth, ellipsisTagWidth, setTakeCount, }: {
+    tagsWidths: number[];
+    maxWidth: number;
+    ellipsisTagWidth: number;
+    setTakeCount: (count: number) => void;
+}): void;
+export declare function useSelectTriggerTags(props: UseSelectTriggerTagsProps): UseSelectTriggerTagsValue;

package/Select/useSelectTriggerTags.js

@@ -0,0 +1,61 @@
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { useState, useEffect } from 'react';
+import take from 'lodash/take';
+import Tag from '../Tag/Tag.js';
+
+function calcTakeCount({ tagsWidths, maxWidth, ellipsisTagWidth, setTakeCount, }) {
+    let targetCount = 0;
+    for (let count = 0; count <= tagsWidths.length; count += 1) {
+        const prevTotal = take(tagsWidths, count).reduce((prev, curr) => prev + curr, 0);
+        const nowTotal = take(tagsWidths, count + 1).reduce((prev, curr) => prev + curr, 0);
+        targetCount = count;
+        if (prevTotal < maxWidth && nowTotal > maxWidth) {
+            if (prevTotal + ellipsisTagWidth > maxWidth) {
+                targetCount -= 1;
+            }
+            break;
+        }
+    }
+    setTakeCount(targetCount);
+}
+function useSelectTriggerTags(props) {
+    const { controlRef, value, size, } = props;
+    const [tagsWidths, setTagsWidths] = useState([]);
+    const [takeCount, setTakeCount] = useState(0);
+    const mznFakeTagClassName = 'mzn-fake-tag';
+    const mznFakeEllipsisTagClassName = 'mzn-fake-ellipsis-tag';
+    useEffect(() => {
+        var _a, _b, _c;
+        const elements = (_a = controlRef.current) === null || _a === void 0 ? void 0 : _a.getElementsByClassName(mznFakeTagClassName);
+        const ellipsisTagElement = (_b = controlRef.current) === null || _b === void 0 ? void 0 : _b.getElementsByClassName(mznFakeEllipsisTagClassName)[0];
+        if ((elements === null || elements === void 0 ? void 0 : elements.length) && ellipsisTagElement) {
+            const tagsWidthsArray = Array.from(elements).map((e) => e.clientWidth);
+            const parentWidth = ((_c = controlRef.current) === null || _c === void 0 ? void 0 : _c.clientWidth) || 0;
+            const maxWidth = parentWidth * 0.7;
+            const ellipsisTagWidth = ellipsisTagElement.clientWidth;
+            setTagsWidths(tagsWidthsArray);
+            calcTakeCount({
+                tagsWidths: tagsWidthsArray,
+                maxWidth,
+                ellipsisTagWidth,
+                setTakeCount,
+            });
+        }
+    }, [value, controlRef]);
+    const renderFakeTags = () => {
+        if (value && value.length === tagsWidths.length)
+            return null;
+        return (jsxs("div", { style: {
+                position: 'absolute',
+                visibility: 'hidden',
+                pointerEvents: 'none',
+                opacity: 0,
+            }, children: [value === null || value === void 0 ? void 0 : value.map((selection) => (jsx(Tag, { className: mznFakeTagClassName, closable: true, disabled: true, size: size, children: selection.name }, selection.id))), jsx(Tag, { disabled: true, className: mznFakeEllipsisTagClassName, size: size, children: "+99..." })] }));
+    };
+    return {
+        renderFakeTags,
+        takeCount,
+    };
+}
+
+export { calcTakeCount, useSelectTriggerTags };

package/Skeleton/Skeleton.js

@@ -8,7 +8,7 @@ import cx from 'clsx';
  */
 const Skeleton = forwardRef(function Skeleton(props, ref) {
     const { className, height: skeletonHeight, style: skeletonStyle, type, width: skeletonWidth, ...rest } = props;
-    return (jsx("div", Object.assign({}, rest, { ref: ref, className: cx(skeletonClasses.host, type === 'circle' && skeletonClasses.circle, className), style: { width: skeletonWidth, height: skeletonHeight, ...skeletonStyle } }, rest), void 0));
+    return (jsx("div", { ...rest, ref: ref, className: cx(skeletonClasses.host, type === 'circle' && skeletonClasses.circle, className), style: { width: skeletonWidth, height: skeletonHeight, ...skeletonStyle }, ...rest }));
 });
 var Skeleton$1 = Skeleton;
 

package/Slider/Slider.d.ts

@@ -47,5 +47,5 @@ export declare type SliderProps = Omit<SliderComponentProps, 'innerRef'>;
  * The outcome will be base on the type of given value.
  * Notice that slider is a fully controlled component. Property value is always needed.
  */
-declare const Slider: import("react").ForwardRefExoticComponent<Pick<SliderComponentProps, "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "placeholder" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "value" | "disabled" | "max" | "min" | "step" | "withInput"> & import("react").RefAttributes<HTMLDivElement>>;
+declare const Slider: import("react").ForwardRefExoticComponent<SliderProps & import("react").RefAttributes<HTMLDivElement>>;
 export default Slider;

package/Slider/Slider.js

@@ -20,9 +20,9 @@ function SliderComponent(props) {
         ...styleProp,
     };
     const shouldHaveInputHandlers = withInput && onChange && !disabled;
-    const getHandle = (handlerValue, index) => (jsx("div", Object.assign({ className: cx(sliderClasses.handlerPosition, index === 0 && sliderClasses.handlerStartPosition, index === 1 && sliderClasses.handlerEndPosition) }, { children: jsx(Tooltip, Object.assign({ disablePortal: true, options: {
+    const getHandle = (handlerValue, index) => (jsx("div", { className: cx(sliderClasses.handlerPosition, index === 0 && sliderClasses.handlerStartPosition, index === 1 && sliderClasses.handlerEndPosition), children: jsx(Tooltip, { disablePortal: true, options: {
                 placement: 'top',
-            }, title: handlerValue.toString() }, { children: ({ onMouseEnter, onMouseLeave }) => (jsx("div", { className: cx(sliderClasses.handler, index === activeHandleIndex && sliderClasses.handlerActive), "aria-disabled": disabled, "aria-label": `Slider Handler ${index}`, "aria-valuemax": max, "aria-valuemin": min, "aria-valuenow": handlerValue, onFocus: () => { }, onMouseDown: (e) => handlePress(e, index), onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, onTouchStart: (e) => handlePress(e, index), role: "slider", tabIndex: index }, void 0)) }), void 0) }), void 0));
+            }, title: handlerValue.toString(), children: ({ onMouseEnter, onMouseLeave }) => (jsx("div", { className: cx(sliderClasses.handler, index === activeHandleIndex && sliderClasses.handlerActive), "aria-disabled": disabled, "aria-label": `Slider Handler ${index}`, "aria-valuemax": max, "aria-valuemin": min, "aria-valuenow": handlerValue, onFocus: () => { }, onMouseDown: (e) => handlePress(e, index), onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, onTouchStart: (e) => handlePress(e, index), role: "slider", tabIndex: index })) }) }));
     const inputSize = Math.max(min.toString().length, max.toString().length);
     const [startInputValue, setStartInputValue] = useState(() => {
         if (!isRangeSlider(value)) {
@@ -159,19 +159,15 @@ function SliderComponent(props) {
         },
         type: 'number',
     };
-    return (jsxs("div", Object.assign({}, rest, { ref: innerRef, className: cx(sliderClasses.host, disabled && sliderClasses.disabled, className), style: style }, { children: [withInput && isRangeSlider(value) ? (jsx(Input, { className: sliderClasses.input, disabled: disabled, onChange: onStartInputChange, value: startInputValue, inputProps: {
+    return (jsxs("div", { ...rest, ref: innerRef, className: cx(sliderClasses.host, disabled && sliderClasses.disabled, className), style: style, children: [withInput && isRangeSlider(value) ? (jsx(Input, { className: sliderClasses.input, disabled: disabled, onChange: onStartInputChange, value: startInputValue, inputProps: {
                     ...inputProps,
                     onKeyDown: onStartInputKeydown,
                     onBlur: onStartInputBlur,
-                } }, void 0)) : null,
-            jsxs("div", Object.assign({ className: sliderClasses.controls }, { children: [jsx("div", { ref: railRef, className: sliderClasses.rail, role: "presentation", onMouseDown: handleClickTrackOrRail }, void 0),
-                    jsx("div", { className: sliderClasses.track, role: "presentation", onMouseDown: handleClickTrackOrRail }, void 0),
-                    isRangeSlider(value) ? (jsxs(Fragment, { children: [getHandle(value[0], 0), getHandle(value[1], 1)] }, void 0)) : getHandle(value, -1)] }), void 0),
-            withInput ? (jsx(Input, { className: sliderClasses.input, disabled: disabled, onChange: onEndInputChange, value: endInputValue, inputProps: {
+                } })) : null, jsxs("div", { className: sliderClasses.controls, children: [jsx("div", { ref: railRef, className: sliderClasses.rail, role: "presentation", onMouseDown: handleClickTrackOrRail }), jsx("div", { className: sliderClasses.track, role: "presentation", onMouseDown: handleClickTrackOrRail }), isRangeSlider(value) ? (jsxs(Fragment, { children: [getHandle(value[0], 0), getHandle(value[1], 1)] })) : getHandle(value, -1)] }), withInput ? (jsx(Input, { className: sliderClasses.input, disabled: disabled, onChange: onEndInputChange, value: endInputValue, inputProps: {
                     ...inputProps,
                     onKeyDown: onEndInputKeydown,
                     onBlur: onEndInputBlur,
-                } }, void 0)) : null] }), void 0));
+                } })) : null] }));
 }
 /**
  * The react component for `mezzanine` slider.
@@ -180,9 +176,9 @@ function SliderComponent(props) {
  */
 const Slider = forwardRef((props, ref) => {
     if (isRangeSlider(props.value)) {
-        return (jsx(SliderComponent, Object.assign({}, props, { innerRef: ref }), void 0));
+        return (jsx(SliderComponent, { ...props, innerRef: ref }));
     }
-    return (jsx(SliderComponent, Object.assign({}, props, { innerRef: ref }), void 0));
+    return (jsx(SliderComponent, { ...props, innerRef: ref }));
 });
 var Slider$1 = Slider;
 

package/Stepper/Step.js

@@ -12,8 +12,8 @@ import cx from 'clsx';
 const Step = forwardRef(function Step(props, ref) {
     const { active, children, className, completed, completedIconProps, disabled, index = -1, title, titleProps, ...rest } = props;
     /** icon and step number */
-    const iconRender = (jsx(Typography, Object.assign({ className: stepClasses.iconBackground, variant: "button3" }, { children: completed ? (jsx(Icon, Object.assign({ className: stepClasses.completedIcon, icon: CheckIcon }, completedIconProps), void 0)) : index + 1 }), void 0));
-    return (jsxs("div", Object.assign({ className: cx(stepClasses.host, disabled && stepClasses.disabled, className), ref: ref }, rest, { children: [iconRender, /** title (optional) */ title && (jsx(Typography, Object.assign({ className: stepClasses.title, variant: "button2" }, titleProps, { children: title }), void 0)), children] }), void 0));
+    const iconRender = (jsx(Typography, { className: stepClasses.iconBackground, variant: "button3", children: completed ? (jsx(Icon, { className: stepClasses.completedIcon, icon: CheckIcon, ...completedIconProps })) : index + 1 }));
+    return (jsxs("div", { className: cx(stepClasses.host, disabled && stepClasses.disabled, className), ref: ref, ...rest, children: [iconRender, /** title (optional) */ title && (jsx(Typography, { className: stepClasses.title, variant: "button2", ...titleProps, children: title })), children] }));
 });
 var Step$1 = Step;
 

package/Stepper/Stepper.js

@@ -27,7 +27,7 @@ const Stepper = forwardRef(function Stepper(props, ref) {
             ...step.props,
         });
     });
-    return (jsx("div", Object.assign({ className: cx(stepperClasses.host, className), ref: ref }, rest, { children: stepsWithState }), void 0));
+    return (jsx("div", { className: cx(stepperClasses.host, className), ref: ref, ...rest, children: stepsWithState }));
 });
 var Stepper$1 = Stepper;
 

package/Switch/Switch.js

@@ -18,12 +18,11 @@ const Switch = forwardRef(function Switch(props, ref) {
         onChange: onChangeProp,
     });
     const disabled = loading || disabledProp;
-    return (jsxs("span", Object.assign({ ref: ref }, rest, { className: cx(switchClasses.host, {
+    return (jsxs("span", { ref: ref, ...rest, className: cx(switchClasses.host, {
             [switchClasses.checked]: checked,
             [switchClasses.disabled]: disabled,
             [switchClasses.large]: size === 'large',
-        }, className) }, { children: [jsx("span", Object.assign({ className: switchClasses.control }, { children: loading && jsx(Icon, { icon: SwitchSpinnerIcon, spin: true }, void 0) }), void 0),
-            jsx("input", Object.assign({}, inputProps, { "aria-checked": checked, "aria-disabled": disabled, checked: checked, className: switchClasses.input, disabled: disabled, onChange: onChange, type: "checkbox" }), void 0)] }), void 0));
+        }, className), children: [jsx("span", { className: switchClasses.control, children: loading && jsx(Icon, { icon: SwitchSpinnerIcon, spin: true }) }), jsx("input", { ...inputProps, "aria-checked": checked, "aria-disabled": disabled, checked: checked, className: switchClasses.input, disabled: disabled, onChange: onChange, type: "checkbox" })] }));
 });
 var Switch$1 = Switch;
 

package/Table/Table.d.ts

@@ -82,5 +82,5 @@ export interface TableWithPagination<T> extends TableBaseProps<T> {
     fetchMore?: undefined;
 }
 export declare type TableProps<T> = TableWithFetchMore<T> | TableWithPagination<T>;
-declare const Table: import("react").ForwardRefExoticComponent<(TableWithFetchMore<Record<string, unknown>> & import("react").RefAttributes<HTMLDivElement>) | (TableWithPagination<Record<string, unknown>> & import("react").RefAttributes<HTMLDivElement>)>;
+declare const Table: import("react").ForwardRefExoticComponent<TableProps<Record<string, unknown>> & import("react").RefAttributes<HTMLDivElement>>;
 export default Table;

package/Table/Table.js

@@ -52,13 +52,9 @@ const Table = forwardRef(function Table(props, ref) {
     /** Feature refresh */
     const isRefreshShow = useMemo(() => {
         var _a;
-        return ((_a = 
+        return (
         /** @default false */
-        refreshProp === null || 
-        /** @default false */
-        refreshProp === void 0 ? void 0 : 
-        /** @default false */
-        refreshProp.show) !== null && _a !== void 0 ? _a : false);
+        (_a = refreshProp === null || refreshProp === void 0 ? void 0 : refreshProp.show) !== null && _a !== void 0 ? _a : false);
     }, [refreshProp === null || refreshProp === void 0 ? void 0 : refreshProp.show]);
     /** context */
     const tableContextValue = useMemo(() => {
@@ -120,10 +116,7 @@ const Table = forwardRef(function Table(props, ref) {
     const tableComponentContextValue = {
         bodyCell: (_a = components === null || components === void 0 ? void 0 : components.body) === null || _a === void 0 ? void 0 : _a.cell,
     };
-    return (jsx(Loading, Object.assign({ loading: loading, stretch: true, tip: "\u8CC7\u6599\u8F09\u5165\u4E2D..." }, { children: jsx("div", Object.assign({ ref: ref }, rest, { className: cx(tableClasses.host, className), role: "grid" }, { children: jsx(TableContext.Provider, Object.assign({ value: tableContextValue }, { children: jsx(TableDataContext.Provider, Object.assign({ value: tableDataContextValue }, { children: jsxs(TableComponentContext.Provider, Object.assign({ value: tableComponentContextValue }, { children: [isRefreshShow ? (jsx(TableRefresh, { onClick: refreshProp.onClick }, void 0)) : null,
-                            jsx(TableHeader, { className: headerClassName }, void 0),
-                            jsx(TableBody, { ref: bodyRef, className: bodyClassName, rowClassName: bodyRowClassName }, void 0),
-                            paginationProp ? (jsx(TablePagination, { bodyRef: bodyRef }, void 0)) : null] }), void 0) }), void 0) }), void 0) }), void 0) }), void 0));
+    return (jsx(Loading, { loading: loading, stretch: true, tip: "\u8CC7\u6599\u8F09\u5165\u4E2D...", children: jsx("div", { ref: ref, ...rest, className: cx(tableClasses.host, className), role: "grid", children: jsx(TableContext.Provider, { value: tableContextValue, children: jsx(TableDataContext.Provider, { value: tableDataContextValue, children: jsxs(TableComponentContext.Provider, { value: tableComponentContextValue, children: [isRefreshShow ? (jsx(TableRefresh, { onClick: refreshProp.onClick })) : null, jsx(TableHeader, { className: headerClassName }), jsx(TableBody, { ref: bodyRef, className: bodyClassName, rowClassName: bodyRowClassName }), paginationProp ? (jsx(TablePagination, { bodyRef: bodyRef })) : null] }) }) }) }) }));
 });
 var Table$1 = Table;
 

package/Table/TableBody.js

@@ -22,15 +22,13 @@ const TableBody = forwardRef(function TableBody(props, ref) {
     const currentStartCount = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.pageSize) && currentPage ? ((paginationOptions.pageSize) * (currentPage - 1)) : 0;
     const currentEndCount = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.pageSize) && currentPage && total ? (Math.min(((paginationOptions.pageSize) * currentPage), total)) : 0;
     const currentDataSource = pagination && !disableAutoSlicing ? (dataSource.slice(currentStartCount, currentEndCount)) : dataSource;
-    return (jsxs("div", Object.assign({}, rest, { ref: composedRefs, className: cx(tableClasses.body, className), onScroll: tableBody.onScroll, role: "rowgroup" }, { children: [currentDataSource.length ? currentDataSource.map((rowData, index) => (jsx(TableBodyRow, { className: rowClassName, rowData: rowData, rowIndex: index }, (rowData.key || rowData.id)))) : (jsx(Empty, Object.assign({}, restEmptyProps, { className: cx(tableClasses.bodyEmpty, emptyComponentClassName), fullHeight: emptyComponentFullHeight }, { children: emptyComponentChildren }), void 0)),
-            (fetchMore === null || fetchMore === void 0 ? void 0 : fetchMore.isFetching) ? (jsx("div", Object.assign({ className: tableClasses.bodyFetchMore }, { children: jsx(Loading, { loading: true }, void 0) }), void 0)) : null,
-            jsx("div", Object.assign({ ref: scrollElement.ref, onMouseDown: scrollElement.onMouseDown, onMouseUp: scrollElement.onMouseUp, onMouseEnter: scrollElement.onMouseEnter, onMouseLeave: scrollElement.onMouseLeave, role: "button", style: scrollElement.style, tabIndex: -1 }, { children: jsx("div", { style: {
+    return (jsxs("div", { ...rest, ref: composedRefs, className: cx(tableClasses.body, className), onScroll: tableBody.onScroll, role: "rowgroup", children: [currentDataSource.length ? currentDataSource.map((rowData, index) => (jsx(TableBodyRow, { className: rowClassName, rowData: rowData, rowIndex: index }, (rowData.key || rowData.id)))) : (jsx(Empty, { ...restEmptyProps, className: cx(tableClasses.bodyEmpty, emptyComponentClassName), fullHeight: emptyComponentFullHeight, children: emptyComponentChildren })), (fetchMore === null || fetchMore === void 0 ? void 0 : fetchMore.isFetching) ? (jsx("div", { className: tableClasses.bodyFetchMore, children: jsx(Loading, { loading: true }) })) : null, jsx("div", { ref: scrollElement.ref, onMouseDown: scrollElement.onMouseDown, onMouseUp: scrollElement.onMouseUp, onMouseEnter: scrollElement.onMouseEnter, onMouseLeave: scrollElement.onMouseLeave, role: "button", style: scrollElement.style, tabIndex: -1, children: jsx("div", { style: {
                         width: `${scrollBarSize}px`,
                         height: '100%',
                         borderRadius: '10px',
                         backgroundColor: '#7d7d7d',
                         transition: '0.1s',
-                    } }, void 0) }), void 0)] }), void 0));
+                    } }) })] }));
 });
 var TableBody$1 = TableBody;