@rc-component/select 1.3.6 → 1.5.0

package/es/BaseSelect/index.d.ts

@@ -59,7 +59,7 @@ export interface BaseSelectPrivateProps {
     emptyOptions: boolean;
 }
 export type BaseSelectPropsWithoutPrivate = Omit<BaseSelectProps, keyof BaseSelectPrivateProps>;
-export interface BaseSelectProps extends BaseSelectPrivateProps, React.AriaAttributes {
+export interface BaseSelectProps extends BaseSelectPrivateProps, React.AriaAttributes, Pick<React.HTMLAttributes<HTMLElement>, 'role'> {
     className?: string;
     style?: React.CSSProperties;
     classNames?: Partial<Record<BaseSelectSemanticName, string>>;

package/es/Select.d.ts

@@ -125,7 +125,7 @@ export interface SelectProps<ValueType = any, OptionType extends BaseOptionType
     classNames?: Partial<Record<SemanticName, string>>;
     styles?: Partial<Record<SemanticName, React.CSSProperties>>;
 }
-declare const TypedSelect: (<ValueType = any, OptionType extends BaseOptionType | DefaultOptionType = DefaultOptionType>(props: React.PropsWithChildren<SelectProps<ValueType, OptionType>> & React.RefAttributes<BaseSelectRef>) => React.ReactElement) & {
+declare const TypedSelect: (<ValueType = any, OptionType extends DefaultOptionType | BaseOptionType = DefaultOptionType>(props: React.PropsWithChildren<SelectProps<ValueType, OptionType>> & React.RefAttributes<BaseSelectRef>) => React.ReactElement) & {
     Option: typeof Option;
     OptGroup: typeof OptGroup;
 };

package/es/SelectInput/Content/SingleContent.js

@@ -40,7 +40,7 @@ const SingleContent = /*#__PURE__*/React.forwardRef(({
 
   // Extract option props, excluding label and value, and handle className/style merging
   const optionProps = React.useMemo(() => {
-    let restProps = {
+    const restProps = {
       className: `${prefixCls}-content-value`,
       style: {
         visibility: mergedSearchValue ? 'hidden' : 'visible'
@@ -50,23 +50,17 @@ const SingleContent = /*#__PURE__*/React.forwardRef(({
       const option = selectContext.flattenOptions.find(opt => opt.value === displayValue.value);
       if (option?.data) {
         const {
-          label,
-          value,
           className,
-          style,
-          key,
-          ...rest
+          style
         } = option.data;
-        restProps = {
-          ...restProps,
-          ...rest,
+        Object.assign(restProps, {
           title: getTitle(option.data),
           className: clsx(restProps.className, className),
           style: {
             ...restProps.style,
             ...style
           }
-        };
+        });
       }
     }
     if (displayValue && !restProps.title) {

package/es/SelectInput/index.js

@@ -10,6 +10,7 @@ import { isValidateOpenKey } from "../utils/keyUtil";
 import { clsx } from 'clsx';
 import { getDOM } from "@rc-component/util/es/Dom/findDOMNode";
 import { composeRef } from "@rc-component/util/es/ref";
+import pickAttrs from "@rc-component/util/es/pickAttrs";
 const DEFAULT_OMIT_PROPS = ['value', 'onChange', 'removeIcon', 'placeholder', 'maxTagCount', 'maxTagTextLength', 'maxTagPlaceholder', 'choiceTransitionName', 'onInputKeyDown', 'onPopupScroll', 'tabIndex', 'activeValue', 'onSelectorRemove', 'focused'];
 export default /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
   const {
@@ -83,7 +84,8 @@ export default /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
     }
 
     // Open dropdown when a valid open key is pressed
-    if (isValidateOpenKey(which)) {
+    const isModifier = event.ctrlKey || event.altKey || event.metaKey;
+    if (!isModifier && isValidateOpenKey(which)) {
       toggleOpen(true);
     }
   });
@@ -141,6 +143,10 @@ export default /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
 
   // ===================== Render =====================
   const domProps = omit(restProps, DEFAULT_OMIT_PROPS);
+  const ariaProps = pickAttrs(domProps, {
+    aria: true
+  });
+  const ariaKeys = Object.keys(ariaProps);
 
   // Create context value with wrapped callbacks
   const contextValue = {
@@ -160,7 +166,7 @@ export default /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
   }
   return /*#__PURE__*/React.createElement(SelectInputContext.Provider, {
     value: contextValue
-  }, /*#__PURE__*/React.createElement("div", _extends({}, domProps, {
+  }, /*#__PURE__*/React.createElement("div", _extends({}, omit(domProps, ariaKeys), {
     // Style
     ref: rootRef,
     className: className,

package/es/hooks/useBaseProps.d.ts

@@ -8,7 +8,6 @@ export interface BaseSelectContextProps extends BaseSelectProps {
     triggerOpen: boolean;
     multiple: boolean;
     toggleOpen: (open?: boolean) => void;
-    role?: React.AriaRole;
 }
 export declare const BaseSelectContext: React.Context<BaseSelectContextProps>;
 export default function useBaseProps(): BaseSelectContextProps;

package/lib/BaseSelect/index.d.ts

@@ -59,7 +59,7 @@ export interface BaseSelectPrivateProps {
     emptyOptions: boolean;
 }
 export type BaseSelectPropsWithoutPrivate = Omit<BaseSelectProps, keyof BaseSelectPrivateProps>;
-export interface BaseSelectProps extends BaseSelectPrivateProps, React.AriaAttributes {
+export interface BaseSelectProps extends BaseSelectPrivateProps, React.AriaAttributes, Pick<React.HTMLAttributes<HTMLElement>, 'role'> {
     className?: string;
     style?: React.CSSProperties;
     classNames?: Partial<Record<BaseSelectSemanticName, string>>;

package/lib/Select.d.ts

@@ -125,7 +125,7 @@ export interface SelectProps<ValueType = any, OptionType extends BaseOptionType
     classNames?: Partial<Record<SemanticName, string>>;
     styles?: Partial<Record<SemanticName, React.CSSProperties>>;
 }
-declare const TypedSelect: (<ValueType = any, OptionType extends BaseOptionType | DefaultOptionType = DefaultOptionType>(props: React.PropsWithChildren<SelectProps<ValueType, OptionType>> & React.RefAttributes<BaseSelectRef>) => React.ReactElement) & {
+declare const TypedSelect: (<ValueType = any, OptionType extends DefaultOptionType | BaseOptionType = DefaultOptionType>(props: React.PropsWithChildren<SelectProps<ValueType, OptionType>> & React.RefAttributes<BaseSelectRef>) => React.ReactElement) & {
     Option: typeof Option;
     OptGroup: typeof OptGroup;
 };

package/lib/SelectInput/Content/SingleContent.js

@@ -49,7 +49,7 @@ const SingleContent = /*#__PURE__*/React.forwardRef(({
 
   // Extract option props, excluding label and value, and handle className/style merging
   const optionProps = React.useMemo(() => {
-    let restProps = {
+    const restProps = {
       className: `${prefixCls}-content-value`,
       style: {
         visibility: mergedSearchValue ? 'hidden' : 'visible'
@@ -59,23 +59,17 @@ const SingleContent = /*#__PURE__*/React.forwardRef(({
       const option = selectContext.flattenOptions.find(opt => opt.value === displayValue.value);
       if (option?.data) {
         const {
-          label,
-          value,
           className,
-          style,
-          key,
-          ...rest
+          style
         } = option.data;
-        restProps = {
-          ...restProps,
-          ...rest,
+        Object.assign(restProps, {
           title: (0, _commonUtil.getTitle)(option.data),
           className: (0, _clsx.clsx)(restProps.className, className),
           style: {
             ...restProps.style,
             ...style
           }
-        };
+        });
       }
     }
     if (displayValue && !restProps.title) {

package/lib/SelectInput/index.js

@@ -15,6 +15,7 @@ var _keyUtil = require("../utils/keyUtil");
 var _clsx = require("clsx");
 var _findDOMNode = require("@rc-component/util/lib/Dom/findDOMNode");
 var _ref = require("@rc-component/util/lib/ref");
+var _pickAttrs = _interopRequireDefault(require("@rc-component/util/lib/pickAttrs"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -92,7 +93,8 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function SelectIn
     }
 
     // Open dropdown when a valid open key is pressed
-    if ((0, _keyUtil.isValidateOpenKey)(which)) {
+    const isModifier = event.ctrlKey || event.altKey || event.metaKey;
+    if (!isModifier && (0, _keyUtil.isValidateOpenKey)(which)) {
       toggleOpen(true);
     }
   });
@@ -150,6 +152,10 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function SelectIn
 
   // ===================== Render =====================
   const domProps = (0, _util.omit)(restProps, DEFAULT_OMIT_PROPS);
+  const ariaProps = (0, _pickAttrs.default)(domProps, {
+    aria: true
+  });
+  const ariaKeys = Object.keys(ariaProps);
 
   // Create context value with wrapped callbacks
   const contextValue = {
@@ -169,7 +175,7 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function SelectIn
   }
   return /*#__PURE__*/React.createElement(_context.default.Provider, {
     value: contextValue
-  }, /*#__PURE__*/React.createElement("div", _extends({}, domProps, {
+  }, /*#__PURE__*/React.createElement("div", _extends({}, (0, _util.omit)(domProps, ariaKeys), {
     // Style
     ref: rootRef,
     className: className,

package/lib/hooks/useBaseProps.d.ts

@@ -8,7 +8,6 @@ export interface BaseSelectContextProps extends BaseSelectProps {
     triggerOpen: boolean;
     multiple: boolean;
     toggleOpen: (open?: boolean) => void;
-    role?: React.AriaRole;
 }
 export declare const BaseSelectContext: React.Context<BaseSelectContextProps>;
 export default function useBaseProps(): BaseSelectContextProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/select",
-  "version": "1.3.6",
+  "version": "1.5.0",
   "description": "React Select",
   "engines": {
     "node": ">=8.x"