@mezzanine-ui/react 0.7.4 → 0.8.0

package/Form/useAutoCompleteValueControl.d.ts

@@ -17,7 +17,7 @@ export interface AutoCompleteValueControl {
     options: string[];
     searchText: string;
     setSearchText: Dispatch<SetStateAction<string>>;
-    setValue: Dispatch<SetStateAction<string>>;
-    value: SelectValue[];
+    setValue: (text: string) => void;
+    value: SelectValue | null;
 }
 export declare function useAutoCompleteValueControl(props: UseAutoCompleteValueControl): AutoCompleteValueControl;

package/Form/useAutoCompleteValueControl.js

@@ -11,6 +11,10 @@ function useAutoCompleteValueControl(props) {
     });
     const [searchText, setSearchText] = useState('');
     const [focused, setFocused] = useState(false);
+    const onChangeValue = useCallback((text) => {
+        setValue(text);
+        onChange === null || onChange === void 0 ? void 0 : onChange(text);
+    }, [setValue, onChange]);
     const onFocus = useCallback((focus) => {
         setFocused(focus);
         /** sync current value */
@@ -21,10 +25,10 @@ function useAutoCompleteValueControl(props) {
         value,
         onChange,
     ]);
-    const getCurrentInputValue = () => (value ? [{
-            id: value,
-            name: value,
-        }] : []);
+    const getCurrentInputValue = () => (value ? {
+        id: value,
+        name: value,
+    } : null);
     const options = disabledOptionsFilter
         ? optionsProp
         : optionsProp.filter((option) => ~option.search(searchText));
@@ -50,7 +54,7 @@ function useAutoCompleteValueControl(props) {
         options,
         searchText,
         setSearchText,
-        setValue,
+        setValue: onChangeValue,
         value: getCurrentInputValue(),
     };
 }

package/Form/useSelectValueControl.d.ts

@@ -1,16 +1,33 @@
 import { MouseEvent } from 'react';
 import { SelectValue } from '../Select/typings';
-export interface UseSelectValueControl {
-    defaultValue?: SelectValue[];
-    mode: string;
-    onChange?(newOptions: SelectValue[]): any;
+export interface UseSelectBaseValueControl {
     onClear?(e: MouseEvent<Element>): void;
+    onChange?(newOptions: SelectValue[] | SelectValue): any;
     onClose?(): void;
+}
+export declare type UseSelectMultipleValueControl = UseSelectBaseValueControl & {
+    defaultValue?: SelectValue[];
+    mode: 'multiple';
+    onChange?(newOptions: SelectValue[]): any;
     value?: SelectValue[];
+};
+export declare type UseSelectSingleValueControl = UseSelectBaseValueControl & {
+    defaultValue?: SelectValue;
+    mode: 'single';
+    onChange?(newOption: SelectValue): any;
+    value?: SelectValue | null;
+};
+export declare type UseSelectValueControl = UseSelectMultipleValueControl | UseSelectSingleValueControl;
+export interface SelectBaseValueControl {
+    onClear(e: MouseEvent<Element>): void;
 }
-export interface SelectValueControl {
+export declare type SelectMultipleValueControl = SelectBaseValueControl & {
     onChange: (v: SelectValue | null) => SelectValue[];
-    onClear(e: MouseEvent<Element>): void;
     value: SelectValue[];
-}
-export declare function useSelectValueControl(props: UseSelectValueControl): SelectValueControl;
+};
+export declare type SelectSingleValueControl = SelectBaseValueControl & {
+    onChange: (v: SelectValue | null) => SelectValue | null;
+    value: SelectValue | null;
+};
+export declare type SelectValueControl = SelectMultipleValueControl | SelectSingleValueControl;
+export declare const useSelectValueControl: (props: UseSelectValueControl) => SelectValueControl;

package/Form/useSelectValueControl.js

@@ -1,31 +1,28 @@
-import intersectionBy from 'lodash/intersectionBy';
+import isEqual from 'lodash/isEqual';
 import { useControlValueState } from './useControlValueState.js';
 
-const equalityFn = (a, b) => (a.length === b.length && intersectionBy(a, b, 'id').length === a.length);
-function useSelectValueControl(props) {
+const equalityFn = (a, b) => isEqual(a, b);
+function useSelectBaseValueControl(props) {
     const { defaultValue, mode, onChange, onClear: onClearProp, onClose, value: valueProp, } = props;
     const [value, setValue] = useControlValueState({
-        defaultValue: defaultValue || [],
+        defaultValue: defaultValue || (mode === 'multiple' ? [] : null),
         equalityFn,
         value: valueProp,
     });
     return {
         value,
         onChange: (chooseOption) => {
-            if (!chooseOption)
-                return [];
-            let newValue = [];
-            switch (mode) {
-                case 'single': {
-                    newValue = [chooseOption];
-                    if (typeof onClose === 'function') {
-                        /** single selection should close modal when clicked */
-                        onClose();
-                    }
-                    break;
+            var _a;
+            if (!chooseOption) {
+                if (mode === 'multiple') {
+                    return [];
                 }
+                return null;
+            }
+            let newValue = mode === 'multiple' ? [] : null;
+            switch (mode) {
                 case 'multiple': {
-                    const existedValueIdx = (value !== null && value !== void 0 ? value : []).findIndex((v) => v.id === chooseOption.id);
+                    const existedValueIdx = ((_a = value) !== null && _a !== void 0 ? _a : []).findIndex((v) => v.id === chooseOption.id);
                     if (~existedValueIdx) {
                         newValue = [
                             ...value.slice(0, existedValueIdx),
@@ -38,22 +35,43 @@ function useSelectValueControl(props) {
                             chooseOption,
                         ];
                     }
+                    if (typeof onChange === 'function')
+                        onChange(newValue);
+                    break;
+                }
+                default: {
+                    newValue = chooseOption;
+                    if (typeof onClose === 'function') {
+                        /** single selection should close modal when clicked */
+                        onClose();
+                    }
+                    if (typeof onChange === 'function')
+                        onChange(newValue);
                     break;
                 }
             }
             setValue(newValue);
-            if (typeof onChange === 'function')
-                onChange(newValue);
             return newValue;
         },
         onClear: (e) => {
             e.stopPropagation();
-            setValue([]);
+            if (mode === 'multiple') {
+                setValue([]);
+            }
+            else {
+                setValue(null);
+            }
             if (typeof onClearProp === 'function') {
                 onClearProp(e);
             }
         },
     };
-}
+}
+const useSelectValueControl = (props) => {
+    if (props.mode === 'multiple') {
+        return useSelectBaseValueControl(props);
+    }
+    return useSelectBaseValueControl(props);
+};
 
 export { useSelectValueControl };

package/Select/AutoComplete.js

@@ -22,7 +22,7 @@ const MENU_ID = 'mzn-select-autocomplete-menu-id';
  * should considering using the `Select` component with `onSearch` prop.
  */
 const AutoComplete = forwardRef(function Select(props, ref) {
-    var _a, _b;
+    var _a;
     const { disabled: disabledFromFormControl, fullWidth: fullWidthFromFormControl, required: requiredFromFormControl, severity, } = useContext(FormControlContext) || {};
     const { addable = false, className, disabled = disabledFromFormControl || false, disabledOptionsFilter = false, defaultValue, error = severity === 'error' || false, fullWidth = fullWidthFromFormControl || false, inputRef, inputProps, itemsInView = 4, menuMaxHeight, menuRole = 'listbox', menuSize = 'medium', onChange: onChangeProp, onClear: onClearProp, onInsert, onSearch, options: optionsProp, popperOptions = {}, placeholder = '', prefix, required = requiredFromFormControl || false, size = 'medium', value: valueProp, } = props;
     const [open, toggleOpen] = useState(false);
@@ -87,8 +87,10 @@ const AutoComplete = forwardRef(function Select(props, ref) {
     return (jsx(SelectControlContext.Provider, Object.assign({ value: {
             onChange,
             value,
-        } }, { children: jsxs("div", Object.assign({ ref: nodeRef, className: selectClasses.host }, { children: [jsx(SelectTrigger, { ref: composedRef, active: open, className: className, clearable: true, disabled: disabled, error: error, forceHideSuffixActionIcon: true, fullWidth: fullWidth, inputRef: inputRef, mode: "single", onTagClose: onChange, onClear: onClear, prefix: prefix, readOnly: false, required: required, inputProps: resolvedInputProps, size: size, suffixActionIcon: undefined, value: value }, void 0),
-                jsxs(InputTriggerPopper, Object.assign({ ref: popperRef, anchor: controlRef, className: selectClasses.popper, open: open, sameWidth: true, options: popperOptions }, { children: [jsxs(Menu, Object.assign({ id: MENU_ID, "aria-activedescendant": (_b = (_a = value[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '', itemsInView: itemsInView, maxHeight: menuMaxHeight, role: menuRole, size: menuSize, style: { border: 0 } }, { children: [jsx(Option, Object.assign({ value: searchText }, { children: searchText }), void 0),
+        } }, { children: jsxs("div", Object.assign({ ref: nodeRef, className: cx(selectClasses.host, {
+                [selectClasses.hostFullWidth]: fullWidth,
+            }) }, { children: [jsx(SelectTrigger, { ref: composedRef, active: open, className: className, clearable: true, disabled: disabled, error: error, forceHideSuffixActionIcon: true, fullWidth: fullWidth, inputRef: inputRef, mode: "single", onTagClose: onChange, onClear: onClear, prefix: prefix, readOnly: false, required: required, inputProps: resolvedInputProps, size: size, suffixActionIcon: undefined, value: value }, void 0),
+                jsxs(InputTriggerPopper, Object.assign({ ref: popperRef, anchor: controlRef, className: selectClasses.popper, open: open, sameWidth: true, options: popperOptions }, { children: [jsxs(Menu, Object.assign({ id: MENU_ID, "aria-activedescendant": (_a = value === null || value === void 0 ? void 0 : value.id) !== null && _a !== void 0 ? _a : '', itemsInView: itemsInView, maxHeight: menuMaxHeight, role: menuRole, size: menuSize, style: { border: 0 } }, { children: [jsx(Option, Object.assign({ value: searchText }, { children: searchText }), void 0),
                                 options.length ? options.map((option) => (jsx(Option, Object.assign({ value: option }, { children: option }), option))) : (jsx(Empty, { children: "\u67E5\u7121\u8CC7\u6599" }, void 0))] }), void 0),
                         addable ? (jsxs("div", Object.assign({ className: selectClasses.autoComplete }, { children: [jsx("input", { type: "text", onChange: (e) => setInsertText(e.target.value), onClick: (e) => e.stopPropagation(), onFocus: (e) => e.stopPropagation(), placeholder: "\u65B0\u589E\u9078\u9805", value: insertText }, void 0),
                                 jsx(Icon, { className: cx(selectClasses.autoCompleteIcon, {

package/Select/Option.js

@@ -7,7 +7,19 @@ const Option = forwardRef(function Option(props, ref) {
     const { active: activeProp, children, role = 'option', value, ...rest } = props;
     const selectControl = useContext(SelectControlContext);
     const { onChange, value: selectedValue, } = selectControl || {};
-    const active = Boolean(activeProp || (selectedValue !== null && selectedValue !== void 0 ? selectedValue : []).find((sv) => sv.id === value));
+    const getActive = () => {
+        if (activeProp) {
+            return activeProp;
+        }
+        if (selectedValue) {
+            if (Array.isArray(selectedValue)) {
+                return selectedValue.find((sv) => sv.id === value);
+            }
+            return selectedValue.id === value;
+        }
+        return false;
+    };
+    const active = Boolean(getActive());
     const onSelect = () => {
         if (typeof onChange === 'function' && value) {
             onChange({

package/Select/Select.d.ts

@@ -6,25 +6,17 @@ import { PopperProps } from '../Popper';
 import { SelectValue } from './typings';
 import { PickRenameMulti } from '../utils/general';
 import { SelectTriggerProps, SelectTriggerInputProps } from './SelectTrigger';
-export interface SelectProps extends Omit<SelectTriggerProps, 'active' | 'inputProps' | 'onBlur' | 'onChange' | 'onClick' | 'onFocus' | 'onKeyDown'>, FormElementFocusHandlers, PickRenameMulti<Pick<MenuProps, 'itemsInView' | 'maxHeight' | 'role' | 'size'>, {
+export interface SelectBaseProps extends Omit<SelectTriggerProps, 'active' | 'inputProps' | 'mode' | 'onBlur' | 'onChange' | 'onClick' | 'onFocus' | 'onKeyDown' | 'renderValue' | 'value'>, FormElementFocusHandlers, PickRenameMulti<Pick<MenuProps, 'itemsInView' | 'maxHeight' | 'role' | 'size'>, {
     maxHeight: 'menuMaxHeight';
     role: 'menuRole';
     size: 'menuSize';
 }>, PickRenameMulti<Pick<PopperProps, 'options'>, {
     options: 'popperOptions';
 }>, Pick<MenuProps, 'children'> {
-    /**
-     * The default selection
-     */
-    defaultValue?: SelectValue[];
     /**
      * The other native props for input element.
      */
     inputProps?: Omit<SelectTriggerInputProps, 'onBlur' | 'onChange' | 'onFocus' | 'placeholder' | 'role' | 'value' | `aria-${'controls' | 'expanded' | 'owns'}`>;
-    /**
-     * The change event handler of input element.
-     */
-    onChange?(newOptions: SelectValue[]): any;
     /**
      * The search event handler, this prop won't work when mode is `multiple`
      */
@@ -36,7 +28,7 @@ export interface SelectProps extends Omit<SelectTriggerProps, 'active' | 'inputP
     /**
      * To customize rendering select input value
      */
-    renderValue?(values: SelectValue[]): string;
+    renderValue?(values: SelectValue[] | SelectValue | null): string;
     /**
      * Whether the selection is required.
      * @default false
@@ -47,11 +39,97 @@ export interface SelectProps extends Omit<SelectTriggerProps, 'active' | 'inputP
      * @default 'medium'
      */
     size?: SelectInputSize;
+}
+export declare type SelectMultipleProps = SelectBaseProps & {
+    /**
+     * The default selection
+     */
+    defaultValue?: SelectValue[];
+    /**
+     * Controls the layout of trigger.
+     */
+    mode: 'multiple';
+    /**
+     * The change event handler of input element.
+     */
+    onChange?(newOptions: SelectValue[]): any;
+    /**
+     * To customize rendering select input value
+     */
+    renderValue?(values: SelectValue[]): string;
     /**
      * The value of selection.
      * @default undefined
      */
     value?: SelectValue[];
-}
-declare const Select: import("react").ForwardRefExoticComponent<SelectProps & import("react").RefAttributes<HTMLDivElement>>;
+};
+export declare type SelectSingleProps = SelectBaseProps & {
+    /**
+     * The default selection
+     */
+    defaultValue?: SelectValue;
+    /**
+     * Controls the layout of trigger.
+     */
+    mode?: 'single';
+    /**
+     * The change event handler of input element.
+     */
+    onChange?(newOptions: SelectValue): any;
+    /**
+     * To customize rendering select input value
+     */
+    renderValue?(values: SelectValue | null): string;
+    /**
+     * The value of selection.
+     * @default undefined
+     */
+    value?: SelectValue | null;
+};
+export declare type SelectProps = SelectMultipleProps | SelectSingleProps;
+declare const Select: import("react").ForwardRefExoticComponent<(SelectBaseProps & {
+    /**
+     * The default selection
+     */
+    defaultValue?: SelectValue[] | undefined;
+    /**
+     * Controls the layout of trigger.
+     */
+    mode: 'multiple';
+    /**
+     * The change event handler of input element.
+     */
+    onChange?(newOptions: SelectValue[]): any;
+    /**
+     * To customize rendering select input value
+     */
+    renderValue?(values: SelectValue[]): string;
+    /**
+     * The value of selection.
+     * @default undefined
+     */
+    value?: SelectValue[] | undefined;
+} & import("react").RefAttributes<HTMLDivElement>) | (SelectBaseProps & {
+    /**
+     * The default selection
+     */
+    defaultValue?: SelectValue | undefined;
+    /**
+     * Controls the layout of trigger.
+     */
+    mode?: "single" | undefined;
+    /**
+     * The change event handler of input element.
+     */
+    onChange?(newOptions: SelectValue): any;
+    /**
+     * To customize rendering select input value
+     */
+    renderValue?(values: SelectValue | null): string;
+    /**
+     * The value of selection.
+     * @default undefined
+     */
+    value?: SelectValue | null | undefined;
+} & import("react").RefAttributes<HTMLDivElement>)>;
 export default Select;

package/Select/Select.js

@@ -52,9 +52,14 @@ const Select = forwardRef(function Select(props, ref) {
     const [focused, setFocused] = useState(false);
     const renderValue = focused && searchable ? () => searchText : renderValueProp;
     function getPlaceholder() {
-        var _a;
         if (focused && searchable) {
-            return (_a = renderValueProp === null || renderValueProp === void 0 ? void 0 : renderValueProp(value)) !== null && _a !== void 0 ? _a : value.map(({ name }) => name).join(', ');
+            if (typeof renderValueProp === 'function') {
+                return renderValueProp(value);
+            }
+            if (value) {
+                return value.name;
+            }
+            return placeholder;
         }
         return placeholder;
     }
@@ -139,7 +144,7 @@ const Select = forwardRef(function Select(props, ref) {
             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": (_b = (_a = value === null || value === void 0 ? void 0 : value[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '', itemsInView: itemsInView, maxHeight: menuMaxHeight, role: menuRole, size: menuSize, style: { border: 0 } }, { children: children }), void 0) }), void 0)] }), void 0) }), 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));
 });
 var Select$1 = Select;
 

package/Select/SelectTrigger.d.ts

@@ -1,10 +1,9 @@
 import { Ref } from 'react';
-import { SelectMode } from '@mezzanine-ui/core/select';
 import { TextFieldProps } from '../TextField';
 import { SelectValue } from './typings';
 import { NativeElementPropsWithoutKeyAndRef } from '../utils/jsx-types';
 export declare type SelectTriggerInputProps = Omit<NativeElementPropsWithoutKeyAndRef<'input'>, 'autoComplete' | 'children' | 'defaultValue' | 'disabled' | 'readOnly' | 'required' | 'type' | 'value' | `aria-${'autocomplete' | 'disabled' | 'haspopup' | 'multiline' | 'readonly' | 'required'}`>;
-export interface SelectTriggerProps extends Omit<TextFieldProps, 'active' | 'children' | 'defaultChecked' | 'suffix'> {
+export interface SelectTriggerBaseProps extends Omit<TextFieldProps, 'active' | 'children' | 'defaultChecked' | 'suffix'> {
     /**
      * Controls the chevron icon layout.
      */
@@ -13,6 +12,10 @@ export interface SelectTriggerProps extends Omit<TextFieldProps, 'active' | 'chi
      * force hide suffixAction icons
      */
     forceHideSuffixActionIcon?: boolean;
+    /**
+     * The ref for SelectTrigger root.
+     */
+    innerRef?: Ref<HTMLDivElement>;
     /**
      * Other props you may provide to input element.
      */
@@ -21,10 +24,6 @@ export interface SelectTriggerProps extends Omit<TextFieldProps, 'active' | 'chi
      * The ref object for input element.
      */
     inputRef?: Ref<HTMLInputElement>;
-    /**
-     * Controls the layout of trigger.
-     */
-    mode?: SelectMode;
     /**
      * The click handler for the cross icon on tags
      */
@@ -38,17 +37,46 @@ export interface SelectTriggerProps extends Omit<TextFieldProps, 'active' | 'chi
      * Provide if you have a customize value rendering logic.
      * By default will have a comma between values.
      */
-    renderValue?: (value: SelectValue[]) => string;
+    renderValue?: (value: SelectValue[] | SelectValue | null) => string;
     /**
      * Whether the input is required.
      * @default false
      */
     required?: boolean;
+}
+export declare type SelectTriggerMultipleProps = SelectTriggerBaseProps & {
+    /**
+     * Controls the layout of trigger.
+     */
+    mode: 'multiple';
     /**
      * The value of selection.
      * @default undefined
      */
     value?: SelectValue[];
-}
-declare const SelectTrigger: import("react").ForwardRefExoticComponent<SelectTriggerProps & import("react").RefAttributes<HTMLDivElement>>;
+    /**
+     * Provide if you have a customize value rendering logic.
+     * By default will have a comma between values.
+     */
+    renderValue?: (value: SelectValue[]) => string;
+};
+export declare type SelectTriggerSingleProps = SelectTriggerBaseProps & {
+    /**
+     * Controls the layout of trigger.
+     */
+    mode?: 'single';
+    /**
+     * The value of selection.
+     * @default undefined
+     */
+    value?: SelectValue | null;
+    /**
+     * Provide if you have a customize value rendering logic.
+     * By default will have a comma between values.
+     */
+    renderValue?: (value: SelectValue | null) => string;
+};
+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>>;
 export default SelectTrigger;

package/Select/SelectTrigger.js

@@ -7,21 +7,45 @@ import TextField from '../TextField/TextField.js';
 import Tag from '../Tag/Tag.js';
 import cx from 'clsx';
 
-const SelectTrigger = forwardRef(function SelectTrigger(props, ref) {
-    const { active, className, disabled, forceHideSuffixActionIcon, inputProps, inputRef, mode, onTagClose, readOnly, renderValue: renderValueProp, required, size, suffixActionIcon: suffixActionIconProp, value, ...restTextFieldProps } = props;
+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;
     /** Render value to string for input */
     const renderValue = () => {
-        var _a, _b;
-        return ((_b = (_a = renderValueProp === null || renderValueProp === void 0 ? void 0 : renderValueProp(value || [])) !== null && _a !== void 0 ? _a : value === null || value === void 0 ? void 0 : value.map((v) => v.name).join(', ')) !== null && _b !== void 0 ? _b : '');
+        if (typeof renderValueProp === 'function') {
+            return renderValueProp(value || (mode === 'multiple' ? [] : null));
+        }
+        if (value) {
+            if (Array.isArray(value)) {
+                return value.map((v) => v.name).join(', ');
+            }
+            return value.name;
+        }
+        return '';
     };
     /** Compute suffix action icon */
     const suffixActionIcon = suffixActionIconProp || (jsx(Icon, { icon: ChevronDownIcon, className: cx(selectClasses.triggerSuffixActionIcon, {
             [selectClasses.triggerSuffixActionIconActive]: active,
         }) }, void 0));
-    return (jsx(TextField, Object.assign({ ref: ref }, restTextFieldProps, { active: !!(value === null || value === void 0 ? void 0 : value.length), 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("div", Object.assign({ className: selectClasses.triggerTags }, { children: value.map((selection) => (jsx(Tag, Object.assign({ closable: true, disabled: disabled, onClose: (e) => {
+    const getTextFieldActive = () => {
+        if (value) {
+            if (Array.isArray(value)) {
+                return !!(value === null || value === void 0 ? void 0 : 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));
+}
+const SelectTrigger = forwardRef((props, ref) => {
+    if (props.mode === 'multiple') {
+        return (jsx(SelectTriggerComponent, Object.assign({}, props, { innerRef: ref }), void 0));
+    }
+    return (jsx(SelectTriggerComponent, Object.assign({}, props, { innerRef: ref }), void 0));
 });
 var SelectTrigger$1 = SelectTrigger;
 

package/Select/typings.d.ts

@@ -6,6 +6,6 @@ export interface TreeSelectOption extends SelectValue {
     siblings?: TreeSelectOption[];
 }
 export interface SelectControl {
-    value: SelectValue[];
-    onChange: (v: SelectValue | null) => SelectValue[];
+    value: SelectValue[] | SelectValue | null;
+    onChange: (v: SelectValue | null) => SelectValue[] | SelectValue | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezzanine-ui/react",
-  "version": "0.7.4",
+  "version": "0.8.0",
   "description": "React components for mezzanine-ui",
   "author": "Mezzanine",
   "repository": {