@rc-component/cascader 1.2.0 → 1.3.1

package/README.md

@@ -298,3 +298,9 @@ $ npm run coverage
 ## License
 
 rc-cascader is released under the MIT license.
+
+## 🤝 Contributing 
+
+<a href="https://openomy.app/github/react-component/cascader" target="_blank" style="display: block; width: 100%;" align="center">
+  <img src="https://www.openomy.app/svg?repo=react-component/cascader&chart=bubble&latestMonth=24" target="_blank" alt="Contribution Leaderboard" style="display: block; width: 100%;" />
+</a>

package/es/Cascader.d.ts

@@ -81,10 +81,8 @@ export type InternalCascaderProps = Omit<CascaderProps, 'onChange' | 'value' | '
     onChange?: (value: InternalValueType, selectOptions: BaseOptionType[] | BaseOptionType[][]) => void;
 };
 export type CascaderRef = Omit<BaseSelectRef, 'scrollTo'>;
-declare const Cascader: (<OptionType extends DefaultOptionType = DefaultOptionType, ValueField extends keyof OptionType = keyof OptionType, Multiple extends React.ReactNode = false>(props: CascaderProps<OptionType, ValueField, Multiple> & {
-    children?: React.ReactNode;
-} & {
-    ref?: React.Ref<CascaderRef> | undefined;
+declare const Cascader: (<OptionType extends DefaultOptionType = DefaultOptionType, ValueField extends keyof OptionType = keyof OptionType, Multiple extends React.ReactNode = false>(props: React.PropsWithChildren<CascaderProps<OptionType, ValueField, Multiple>> & {
+    ref?: React.Ref<CascaderRef>;
 }) => React.ReactElement) & {
     displayName?: string | undefined;
     SHOW_PARENT: typeof SHOW_PARENT;

package/es/Cascader.js

@@ -1,6 +1,6 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import { BaseSelect } from '@rc-component/select';
-import useId from "@rc-component/select/es/hooks/useId";
+import useId from "@rc-component/util/es/hooks/useId";
 import useEvent from "@rc-component/util/es/hooks/useEvent";
 import useMergedState from "@rc-component/util/es/hooks/useMergedState";
 import * as React from 'react';

package/es/OptionList/Column.js

@@ -1,5 +1,7 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import cls from 'classnames';
 import * as React from 'react';
+import pickAttrs from "rc-util/es/pickAttrs";
 import CascaderContext from "../context";
 import { SEARCH_MARK } from "../hooks/useSearchOptions";
 import { isLeaf, toPathKey } from "../utils/commonUtil";
@@ -104,6 +106,10 @@ export default function Column({
     fullPathKey,
     disableCheckbox
   }) => {
+    const ariaProps = pickAttrs(option, {
+      aria: true,
+      data: true
+    });
     // >>>>> Open
     const triggerOpenPath = () => {
       if (isOptionDisabled(disabled)) {
@@ -132,8 +138,9 @@ export default function Column({
     }
 
     // >>>>> Render
-    return /*#__PURE__*/React.createElement("li", {
-      key: fullPathKey,
+    return /*#__PURE__*/React.createElement("li", _extends({
+      key: fullPathKey
+    }, ariaProps, {
       className: cls(menuItemPrefixCls, classNames?.popup?.listItem, {
         [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,
         [`${menuItemPrefixCls}-active`]: activeValue === value || activeValue === fullPathKey,
@@ -171,7 +178,7 @@ export default function Column({
         // Prevent selector from blurring
         e.preventDefault();
       }
-    }, multiple && /*#__PURE__*/React.createElement(Checkbox, {
+    }), multiple && /*#__PURE__*/React.createElement(Checkbox, {
       prefixCls: `${prefixCls}-checkbox`,
       checked: checked,
       halfChecked: halfChecked,

package/es/OptionList/List.js

@@ -155,7 +155,6 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
       const cellKeyPath = toPathKey(cellPath);
       const ele = containerRef.current?.querySelector(`li[data-path-key="${cellKeyPath.replace(/\\{0,2}"/g, '\\"')}"]` // matches unescaped double quotes
       );
-
       if (ele) {
         scrollIntoParentView(ele);
       }

package/es/OptionList/useActive.js

@@ -19,7 +19,6 @@ const useActive = (multiple, open) => {
   }, /* eslint-disable react-hooks/exhaustive-deps */
   [open, firstValueCells]
   /* eslint-enable react-hooks/exhaustive-deps */);
-
   return [activeValueCells, setActiveValueCells];
 };
 export default useActive;

package/lib/Cascader.d.ts

@@ -81,10 +81,8 @@ export type InternalCascaderProps = Omit<CascaderProps, 'onChange' | 'value' | '
     onChange?: (value: InternalValueType, selectOptions: BaseOptionType[] | BaseOptionType[][]) => void;
 };
 export type CascaderRef = Omit<BaseSelectRef, 'scrollTo'>;
-declare const Cascader: (<OptionType extends DefaultOptionType = DefaultOptionType, ValueField extends keyof OptionType = keyof OptionType, Multiple extends React.ReactNode = false>(props: CascaderProps<OptionType, ValueField, Multiple> & {
-    children?: React.ReactNode;
-} & {
-    ref?: React.Ref<CascaderRef> | undefined;
+declare const Cascader: (<OptionType extends DefaultOptionType = DefaultOptionType, ValueField extends keyof OptionType = keyof OptionType, Multiple extends React.ReactNode = false>(props: React.PropsWithChildren<CascaderProps<OptionType, ValueField, Multiple>> & {
+    ref?: React.Ref<CascaderRef>;
 }) => React.ReactElement) & {
     displayName?: string | undefined;
     SHOW_PARENT: typeof SHOW_PARENT;

package/lib/Cascader.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _select = require("@rc-component/select");
-var _useId = _interopRequireDefault(require("@rc-component/select/lib/hooks/useId"));
+var _useId = _interopRequireDefault(require("@rc-component/util/lib/hooks/useId"));
 var _useEvent = _interopRequireDefault(require("@rc-component/util/lib/hooks/useEvent"));
 var _useMergedState = _interopRequireDefault(require("@rc-component/util/lib/hooks/useMergedState"));
 var React = _interopRequireWildcard(require("react"));

package/lib/OptionList/Column.js

@@ -7,6 +7,7 @@ exports.FIX_LABEL = void 0;
 exports.default = Column;
 var _classnames = _interopRequireDefault(require("classnames"));
 var React = _interopRequireWildcard(require("react"));
+var _pickAttrs = _interopRequireDefault(require("rc-util/lib/pickAttrs"));
 var _context = _interopRequireDefault(require("../context"));
 var _useSearchOptions = require("../hooks/useSearchOptions");
 var _commonUtil = require("../utils/commonUtil");
@@ -14,6 +15,7 @@ var _Checkbox = _interopRequireDefault(require("./Checkbox"));
 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; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const FIX_LABEL = exports.FIX_LABEL = '__cascader_fix_label__';
 function Column({
   prefixCls,
@@ -114,6 +116,10 @@ function Column({
     fullPathKey,
     disableCheckbox
   }) => {
+    const ariaProps = (0, _pickAttrs.default)(option, {
+      aria: true,
+      data: true
+    });
     // >>>>> Open
     const triggerOpenPath = () => {
       if (isOptionDisabled(disabled)) {
@@ -142,8 +148,9 @@ function Column({
     }
 
     // >>>>> Render
-    return /*#__PURE__*/React.createElement("li", {
-      key: fullPathKey,
+    return /*#__PURE__*/React.createElement("li", _extends({
+      key: fullPathKey
+    }, ariaProps, {
       className: (0, _classnames.default)(menuItemPrefixCls, classNames?.popup?.listItem, {
         [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,
         [`${menuItemPrefixCls}-active`]: activeValue === value || activeValue === fullPathKey,
@@ -181,7 +188,7 @@ function Column({
         // Prevent selector from blurring
         e.preventDefault();
       }
-    }, multiple && /*#__PURE__*/React.createElement(_Checkbox.default, {
+    }), multiple && /*#__PURE__*/React.createElement(_Checkbox.default, {
       prefixCls: `${prefixCls}-checkbox`,
       checked: checked,
       halfChecked: halfChecked,

package/lib/OptionList/List.js

@@ -163,7 +163,6 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
       const cellKeyPath = (0, _commonUtil.toPathKey)(cellPath);
       const ele = containerRef.current?.querySelector(`li[data-path-key="${cellKeyPath.replace(/\\{0,2}"/g, '\\"')}"]` // matches unescaped double quotes
       );
-
       if (ele) {
         (0, _commonUtil.scrollIntoParentView)(ele);
       }

package/lib/OptionList/useActive.js

@@ -28,7 +28,6 @@ const useActive = (multiple, open) => {
   }, /* eslint-disable react-hooks/exhaustive-deps */
   [open, firstValueCells]
   /* eslint-enable react-hooks/exhaustive-deps */);
-
   return [activeValueCells, setActiveValueCells];
 };
 var _default = exports.default = useActive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/cascader",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "cascade select ui component for react",
   "keywords": [
     "react",
@@ -43,11 +43,10 @@
     "test": "rc-test"
   },
   "dependencies": {
-    "@rc-component/select": "~1.0.0",
+    "@rc-component/select": "~1.0.7",
     "@rc-component/tree": "~1.0.0",
     "@rc-component/util": "^1.2.1",
-    "classnames": "^2.3.1",
-    "eslint-plugin-unicorn": "^47.0.0"
+    "classnames": "^2.3.1"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^2.0.2",
@@ -71,7 +70,7 @@
     "enzyme-to-json": "^3.2.1",
     "eslint": "^8.54.0",
     "eslint-plugin-jest": "^28.8.3",
-    "eslint-plugin-unicorn": "^58.0.0",
+    "eslint-plugin-unicorn": "^56.0.1",
     "father": "^4.0.0",
     "gh-pages": "^6.1.1",
     "glob": "^7.1.6",