@hi-ui/cascader 4.4.0 → 4.5.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @hi-ui/cascader
 
+## 4.5.0
+
+### Minor Changes
+
+- [#3231](https://github.com/XiaoMi/hiui/pull/3231) [`bbba46153`](https://github.com/XiaoMi/hiui/commit/bbba4615313cd0618deff633bebc657e7f34ec94) Thanks [@zyprepare](https://github.com/zyprepare)! - feat(cascader): onChange 回调中增加选中项对象参数返回 (#3230)
+
+### Patch Changes
+
+- Updated dependencies [[`dc1311a91`](https://github.com/XiaoMi/hiui/commit/dc1311a917518bc5debef755a9fcd4e33fb58790)]:
+  - @hi-ui/use-search-mode@4.2.1
+
+## 4.4.1
+
+### Patch Changes
+
+- [#3196](https://github.com/XiaoMi/hiui/pull/3196) [`80a909d2d`](https://github.com/XiaoMi/hiui/commit/80a909d2dae99d68d71f2ec6f4b210080d032ec0) Thanks [@KEH3](https://github.com/KEH3)! - fix(popper): ref 中增加更新位置方法解决上游组件弹窗被遮挡问题 (#3195)
+
+- Updated dependencies [[`80a909d2d`](https://github.com/XiaoMi/hiui/commit/80a909d2dae99d68d71f2ec6f4b210080d032ec0)]:
+  - @hi-ui/picker@4.1.8
+  - @hi-ui/popper@4.1.7
+
 ## 4.4.0
 
 ### Minor Changes

package/lib/cjs/Cascader.js

@@ -90,6 +90,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     customRender = props.customRender,
     rest = tslib.__rest(props, ["prefixCls", "className", "placeholder", "disabled", "clearable", "type", "fieldNames", "expandTrigger", "displayRender", "onSelect", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "keyword", "onSearch", "render", "overlayClassName", "data", "flattedSearchResult", "visible", "size", "prefix", "suffix", "onOpen", "onClose", "onClear", "renderExtraFooter", "dropdownColumnRender", "closeOnSelect", "customRender"]);
   var i18n = core.useLocaleContext();
+  var pickerInnerRef = React.useRef(null);
   var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('cascader.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
       visible: visible,
@@ -220,6 +221,13 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return flattedData;
   }, [selectedItem, flattedData]);
   var cls = classname.cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
+  React.useEffect(function () {
+    var _a;
+    if (menuVisible) {
+      // 数据改变时更新弹窗显示位置，避免弹窗内容被遮挡
+      (_a = pickerInnerRef.current) === null || _a === void 0 ? void 0 : _a.update();
+    }
+  }, [menuVisible, showData]);
   return /*#__PURE__*/React__default["default"].createElement(context.CascaderProvider, {
     value: Object.assign(Object.assign({}, context$1), {
       expandTrigger: expandTrigger,
@@ -229,6 +237,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     })
   }, /*#__PURE__*/React__default["default"].createElement(picker.Picker, Object.assign({
     ref: ref,
+    innerRef: pickerInnerRef,
     className: cls,
     overlayClassName: classname.cx(prefixCls + "__popper", overlayClassName)
   }, rootProps, {

package/lib/cjs/use-cascader.js

@@ -56,7 +56,7 @@ var useCascader = function useCascader(_a) {
     tryChangeValue(itemPaths.map(function (_ref) {
       var id = _ref.id;
       return id;
-    }));
+    }), item, itemPaths);
     onSelectProp === null || onSelectProp === void 0 ? void 0 : onSelectProp(value, item, itemPaths);
   };
   // 单击选中某项

package/lib/esm/Cascader.js

@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { __rest } from 'tslib';
-import React, { forwardRef, useState, useMemo, useEffect } from 'react';
+import React, { forwardRef, useRef, useState, useMemo, useEffect } from 'react';
 import { getPrefixCls, cx } from '@hi-ui/classname';
 import { __DEV__ } from '@hi-ui/env';
 import { useUncontrolledToggle } from '@hi-ui/use-toggle';
@@ -77,6 +77,7 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
     customRender = props.customRender,
     rest = __rest(props, ["prefixCls", "className", "placeholder", "disabled", "clearable", "type", "fieldNames", "expandTrigger", "displayRender", "onSelect", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "keyword", "onSearch", "render", "overlayClassName", "data", "flattedSearchResult", "visible", "size", "prefix", "suffix", "onOpen", "onClose", "onClear", "renderExtraFooter", "dropdownColumnRender", "closeOnSelect", "customRender"]);
   var i18n = useLocaleContext();
+  var pickerInnerRef = useRef(null);
   var placeholder = isUndef(placeholderProp) ? i18n.get('cascader.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useUncontrolledToggle({
       visible: visible,
@@ -207,6 +208,13 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
     return flattedData;
   }, [selectedItem, flattedData]);
   var cls = cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
+  useEffect(function () {
+    var _a;
+    if (menuVisible) {
+      // 数据改变时更新弹窗显示位置，避免弹窗内容被遮挡
+      (_a = pickerInnerRef.current) === null || _a === void 0 ? void 0 : _a.update();
+    }
+  }, [menuVisible, showData]);
   return /*#__PURE__*/React.createElement(CascaderProvider, {
     value: Object.assign(Object.assign({}, context), {
       expandTrigger: expandTrigger,
@@ -216,6 +224,7 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
     })
   }, /*#__PURE__*/React.createElement(Picker, Object.assign({
     ref: ref,
+    innerRef: pickerInnerRef,
     className: cls,
     overlayClassName: cx(prefixCls + "__popper", overlayClassName)
   }, rootProps, {

package/lib/esm/use-cascader.js

@@ -51,7 +51,7 @@ var useCascader = function useCascader(_a) {
     tryChangeValue(itemPaths.map(function (_ref) {
       var id = _ref.id;
       return id;
-    }));
+    }), item, itemPaths);
     onSelectProp === null || onSelectProp === void 0 ? void 0 : onSelectProp(value, item, itemPaths);
   };
   // 单击选中某项

package/lib/types/use-cascader.d.ts

@@ -41,7 +41,7 @@ export interface UseCascaderProps {
     /**
      * 选中值改变时的回调
      */
-    onChange?: (value: React.ReactText[]) => void;
+    onChange?: (value: React.ReactText[], targetOption?: CascaderItemEventData, optionPaths?: FlattedCascaderDataItem[]) => void;
     /**
      * 选中选项时触发，仅供内部使用。暂不对外暴露
      * @private

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/cascader",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -50,15 +50,15 @@
     "@hi-ui/highlighter": "^4.1.2",
     "@hi-ui/icons": "^4.0.19",
     "@hi-ui/input": "^4.4.0",
-    "@hi-ui/picker": "^4.1.6",
-    "@hi-ui/popper": "^4.1.5",
+    "@hi-ui/picker": "^4.1.8",
+    "@hi-ui/popper": "^4.1.7",
     "@hi-ui/spinner": "^4.0.9",
     "@hi-ui/tree-utils": "^4.1.4",
     "@hi-ui/type-assertion": "^4.0.4",
     "@hi-ui/use-check-state": "^4.0.4",
     "@hi-ui/use-data-source": "^4.0.4",
     "@hi-ui/use-latest": "^4.0.4",
-    "@hi-ui/use-search-mode": "^4.1.4",
+    "@hi-ui/use-search-mode": "^4.2.1",
     "@hi-ui/use-toggle": "^4.0.4",
     "@hi-ui/use-uncontrolled-state": "^4.0.4"
   },