@rc-component/select 1.0.5 → 1.0.7

package/es/Select.js

@@ -40,7 +40,7 @@ import OptionList from "./OptionList";
 import SelectContext from "./SelectContext";
 import useCache from "./hooks/useCache";
 import useFilterOptions from "./hooks/useFilterOptions";
-import useId from "./hooks/useId";
+import useId from "@rc-component/util/es/hooks/useId";
 import useOptions from "./hooks/useOptions";
 import useRefFunc from "./hooks/useRefFunc";
 import { hasValue, isComboNoValue, toArray } from "./utils/commonUtil";

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/Select.js

@@ -14,7 +14,7 @@ var _OptionList = _interopRequireDefault(require("./OptionList"));
 var _SelectContext = _interopRequireDefault(require("./SelectContext"));
 var _useCache = _interopRequireDefault(require("./hooks/useCache"));
 var _useFilterOptions = _interopRequireDefault(require("./hooks/useFilterOptions"));
-var _useId = _interopRequireDefault(require("./hooks/useId"));
+var _useId = _interopRequireDefault(require("@rc-component/util/lib/hooks/useId"));
 var _useOptions = _interopRequireDefault(require("./hooks/useOptions"));
 var _useRefFunc = _interopRequireDefault(require("./hooks/useRefFunc"));
 var _commonUtil = require("./utils/commonUtil");

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.5",
+  "version": "1.0.7",
   "description": "React Select",
   "engines": {
     "node": ">=8.x"

package/es/hooks/useId.d.ts

@@ -1,5 +0,0 @@
-/** Is client side and not jsdom */
-export declare const isBrowserClient: boolean;
-/** Get unique id for accessibility usage */
-export declare function getUUID(): number | string;
-export default function useId(id?: string): string;

package/es/hooks/useId.js

@@ -1,29 +0,0 @@
-import * as React from 'react';
-import canUseDom from "@rc-component/util/es/Dom/canUseDom";
-let uuid = 0;
-
-/** Is client side and not jsdom */
-export const isBrowserClient = process.env.NODE_ENV !== 'test' && canUseDom();
-
-/** Get unique id for accessibility usage */
-export function getUUID() {
-  let retId;
-
-  // Test never reach
-  /* istanbul ignore if */
-  if (isBrowserClient) {
-    retId = uuid;
-    uuid += 1;
-  } else {
-    retId = 'TEST_OR_SSR';
-  }
-  return retId;
-}
-export default function useId(id) {
-  // Inner id for accessibility usage. Only work in client side
-  const [innerId, setInnerId] = React.useState();
-  React.useEffect(() => {
-    setInnerId(`rc_select_${getUUID()}`);
-  }, []);
-  return id || innerId;
-}

package/lib/hooks/useId.d.ts

@@ -1,5 +0,0 @@
-/** Is client side and not jsdom */
-export declare const isBrowserClient: boolean;
-/** Get unique id for accessibility usage */
-export declare function getUUID(): number | string;
-export default function useId(id?: string): string;

package/lib/hooks/useId.js

@@ -1,40 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = useId;
-exports.getUUID = getUUID;
-exports.isBrowserClient = void 0;
-var React = _interopRequireWildcard(require("react"));
-var _canUseDom = _interopRequireDefault(require("@rc-component/util/lib/Dom/canUseDom"));
-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; }
-let uuid = 0;
-
-/** Is client side and not jsdom */
-const isBrowserClient = exports.isBrowserClient = process.env.NODE_ENV !== 'test' && (0, _canUseDom.default)();
-
-/** Get unique id for accessibility usage */
-function getUUID() {
-  let retId;
-
-  // Test never reach
-  /* istanbul ignore if */
-  if (isBrowserClient) {
-    retId = uuid;
-    uuid += 1;
-  } else {
-    retId = 'TEST_OR_SSR';
-  }
-  return retId;
-}
-function useId(id) {
-  // Inner id for accessibility usage. Only work in client side
-  const [innerId, setInnerId] = React.useState();
-  React.useEffect(() => {
-    setInnerId(`rc_select_${getUUID()}`);
-  }, []);
-  return id || innerId;
-}