@rc-component/select 1.0.6 → 1.0.7

package/es/Selector/Input.js

@@ -2,29 +2,20 @@ import * as React from 'react';
 import classNames from 'classnames';
 import { composeRef } from "@rc-component/util/es/ref";
 import { warning } from "@rc-component/util/es/warning";
+import composeProps from "@rc-component/util/es/composeProps";
 import useBaseProps from "../hooks/useBaseProps";
 const Input = (props, ref) => {
   const {
     prefixCls,
     id,
     inputElement,
-    disabled,
-    tabIndex,
-    autoFocus,
     autoComplete,
     editable,
     activeDescendantId,
     value,
-    maxLength,
-    onKeyDown,
-    onMouseDown,
-    onChange,
-    onPaste,
-    onCompositionStart,
-    onCompositionEnd,
-    onBlur,
     open,
-    attrs
+    attrs,
+    ...restProps
   } = props;
   const {
     classNames: contextClassNames,
@@ -35,27 +26,15 @@ const Input = (props, ref) => {
     ref: originRef,
     props: originProps
   } = inputNode;
-  const {
-    onKeyDown: onOriginKeyDown,
-    onChange: onOriginChange,
-    onMouseDown: onOriginMouseDown,
-    onCompositionStart: onOriginCompositionStart,
-    onCompositionEnd: onOriginCompositionEnd,
-    onBlur: onOriginBlur,
-    style
-  } = originProps;
   warning(!('maxLength' in inputNode.props), `Passing 'maxLength' to input element directly may not work because input in BaseSelect is controlled.`);
   inputNode = /*#__PURE__*/React.cloneElement(inputNode, {
     type: 'search',
-    ...originProps,
+    ...composeProps(restProps, originProps, true),
     // Override over origin props
     id,
     ref: composeRef(ref, originRef),
-    disabled,
-    tabIndex,
     autoComplete: autoComplete || 'off',
-    autoFocus,
-    className: classNames(`${prefixCls}-selection-search-input`, inputNode?.props?.className, contextClassNames?.input),
+    className: classNames(`${prefixCls}-selection-search-input`, originProps.className, contextClassNames?.input),
     role: 'combobox',
     'aria-expanded': open || false,
     'aria-haspopup': 'listbox',
@@ -65,50 +44,12 @@ const Input = (props, ref) => {
     'aria-activedescendant': open ? activeDescendantId : undefined,
     ...attrs,
     value: editable ? value : '',
-    maxLength,
     readOnly: !editable,
     unselectable: !editable ? 'on' : null,
     style: {
-      ...style,
+      ...originProps.style,
       opacity: editable ? null : 0,
       ...contextStyles?.input
-    },
-    onKeyDown: event => {
-      onKeyDown(event);
-      if (onOriginKeyDown) {
-        onOriginKeyDown(event);
-      }
-    },
-    onMouseDown: event => {
-      onMouseDown(event);
-      if (onOriginMouseDown) {
-        onOriginMouseDown(event);
-      }
-    },
-    onChange: event => {
-      onChange(event);
-      if (onOriginChange) {
-        onOriginChange(event);
-      }
-    },
-    onCompositionStart(event) {
-      onCompositionStart(event);
-      if (onOriginCompositionStart) {
-        onOriginCompositionStart(event);
-      }
-    },
-    onCompositionEnd(event) {
-      onCompositionEnd(event);
-      if (onOriginCompositionEnd) {
-        onOriginCompositionEnd(event);
-      }
-    },
-    onPaste,
-    onBlur(event) {
-      onBlur(event);
-      if (onOriginBlur) {
-        onOriginBlur(event);
-      }
     }
   });
   return inputNode;

package/lib/Selector/Input.js

@@ -8,6 +8,7 @@ var React = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ref = require("@rc-component/util/lib/ref");
 var _warning = require("@rc-component/util/lib/warning");
+var _composeProps = _interopRequireDefault(require("@rc-component/util/lib/composeProps"));
 var _useBaseProps = _interopRequireDefault(require("../hooks/useBaseProps"));
 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); }
@@ -17,23 +18,13 @@ const Input = (props, ref) => {
     prefixCls,
     id,
     inputElement,
-    disabled,
-    tabIndex,
-    autoFocus,
     autoComplete,
     editable,
     activeDescendantId,
     value,
-    maxLength,
-    onKeyDown,
-    onMouseDown,
-    onChange,
-    onPaste,
-    onCompositionStart,
-    onCompositionEnd,
-    onBlur,
     open,
-    attrs
+    attrs,
+    ...restProps
   } = props;
   const {
     classNames: contextClassNames,
@@ -44,27 +35,15 @@ const Input = (props, ref) => {
     ref: originRef,
     props: originProps
   } = inputNode;
-  const {
-    onKeyDown: onOriginKeyDown,
-    onChange: onOriginChange,
-    onMouseDown: onOriginMouseDown,
-    onCompositionStart: onOriginCompositionStart,
-    onCompositionEnd: onOriginCompositionEnd,
-    onBlur: onOriginBlur,
-    style
-  } = originProps;
   (0, _warning.warning)(!('maxLength' in inputNode.props), `Passing 'maxLength' to input element directly may not work because input in BaseSelect is controlled.`);
   inputNode = /*#__PURE__*/React.cloneElement(inputNode, {
     type: 'search',
-    ...originProps,
+    ...(0, _composeProps.default)(restProps, originProps, true),
     // Override over origin props
     id,
     ref: (0, _ref.composeRef)(ref, originRef),
-    disabled,
-    tabIndex,
     autoComplete: autoComplete || 'off',
-    autoFocus,
-    className: (0, _classnames.default)(`${prefixCls}-selection-search-input`, inputNode?.props?.className, contextClassNames?.input),
+    className: (0, _classnames.default)(`${prefixCls}-selection-search-input`, originProps.className, contextClassNames?.input),
     role: 'combobox',
     'aria-expanded': open || false,
     'aria-haspopup': 'listbox',
@@ -74,50 +53,12 @@ const Input = (props, ref) => {
     'aria-activedescendant': open ? activeDescendantId : undefined,
     ...attrs,
     value: editable ? value : '',
-    maxLength,
     readOnly: !editable,
     unselectable: !editable ? 'on' : null,
     style: {
-      ...style,
+      ...originProps.style,
       opacity: editable ? null : 0,
       ...contextStyles?.input
-    },
-    onKeyDown: event => {
-      onKeyDown(event);
-      if (onOriginKeyDown) {
-        onOriginKeyDown(event);
-      }
-    },
-    onMouseDown: event => {
-      onMouseDown(event);
-      if (onOriginMouseDown) {
-        onOriginMouseDown(event);
-      }
-    },
-    onChange: event => {
-      onChange(event);
-      if (onOriginChange) {
-        onOriginChange(event);
-      }
-    },
-    onCompositionStart(event) {
-      onCompositionStart(event);
-      if (onOriginCompositionStart) {
-        onOriginCompositionStart(event);
-      }
-    },
-    onCompositionEnd(event) {
-      onCompositionEnd(event);
-      if (onOriginCompositionEnd) {
-        onOriginCompositionEnd(event);
-      }
-    },
-    onPaste,
-    onBlur(event) {
-      onBlur(event);
-      if (onOriginBlur) {
-        onOriginBlur(event);
-      }
     }
   });
   return inputNode;

package/package.json

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