@hi-ui/cascader 4.0.0-beta.36 → 4.0.0-beta.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -96,9 +96,10 @@ var CascaderMenu = function CascaderMenu(_ref) {
96
96
  }, menu.map(function (option) {
97
97
  var eventOption = index.getItemEventData(option, getItemRequiredProps(option));
98
98
  var selected = eventOption.selected,
99
- loading = eventOption.loading;
99
+ loading = eventOption.loading,
100
+ active = eventOption.active;
100
101
  var disabled = disabledContext || option.disabled;
101
- var optionCls = classname.cx(prefixCls + "-option", loading && prefixCls + "-option--loading", disabled && prefixCls + "-option--disabled", selected && prefixCls + "-option--selected");
102
+ var optionCls = classname.cx(prefixCls + "-option", active && prefixCls + "-option--active", loading && prefixCls + "-option--loading", disabled && prefixCls + "-option--disabled", selected && prefixCls + "-option--selected");
102
103
  return /*#__PURE__*/React__default["default"].createElement("li", {
103
104
  key: option.id,
104
105
  role: "menu-item",
@@ -105,12 +105,13 @@ var useCascader = function useCascader(_a) {
105
105
  var id = _ref3.id,
106
106
  depth = _ref3.depth;
107
107
  return {
108
+ active: value[depth] === id,
108
109
  selected: flatted ? selectedId === id : selectedIds[depth] === id,
109
110
  loading: isLoadingId(id),
110
111
  // TODO: 表示聚焦状态,添加快捷键时可以一起处理
111
112
  focused: false
112
113
  };
113
- }, [flatted, selectedId, selectedIds, isLoadingId]);
114
+ }, [flatted, selectedId, selectedIds, isLoadingId, value]);
114
115
  var reset = React.useCallback(function () {
115
116
  setSelectedId(value[value.length - 1]);
116
117
  }, [setSelectedId, value]);
@@ -71,9 +71,10 @@ var CascaderMenu = function CascaderMenu(_ref) {
71
71
  }, menu.map(function (option) {
72
72
  var eventOption = getItemEventData(option, getItemRequiredProps(option));
73
73
  var selected = eventOption.selected,
74
- loading = eventOption.loading;
74
+ loading = eventOption.loading,
75
+ active = eventOption.active;
75
76
  var disabled = disabledContext || option.disabled;
76
- var optionCls = cx(prefixCls + "-option", loading && prefixCls + "-option--loading", disabled && prefixCls + "-option--disabled", selected && prefixCls + "-option--selected");
77
+ var optionCls = cx(prefixCls + "-option", active && prefixCls + "-option--active", loading && prefixCls + "-option--loading", disabled && prefixCls + "-option--disabled", selected && prefixCls + "-option--selected");
77
78
  return /*#__PURE__*/React.createElement("li", {
78
79
  key: option.id,
79
80
  role: "menu-item",
@@ -92,12 +92,13 @@ var useCascader = function useCascader(_a) {
92
92
  var id = _ref3.id,
93
93
  depth = _ref3.depth;
94
94
  return {
95
+ active: value[depth] === id,
95
96
  selected: flatted ? selectedId === id : selectedIds[depth] === id,
96
97
  loading: isLoadingId(id),
97
98
  // TODO: 表示聚焦状态,添加快捷键时可以一起处理
98
99
  focused: false
99
100
  };
100
- }, [flatted, selectedId, selectedIds, isLoadingId]);
101
+ }, [flatted, selectedId, selectedIds, isLoadingId, value]);
101
102
  var reset = useCallback(function () {
102
103
  setSelectedId(value[value.length - 1]);
103
104
  }, [setSelectedId, value]);
@@ -9,7 +9,7 @@ import { PickerProps } from '@hi-ui/picker';
9
9
  * Trigger + MenuList + Search
10
10
  */
11
11
  export declare const Cascader: React.ForwardRefExoticComponent<CascaderProps & React.RefAttributes<HTMLDivElement | null>>;
12
- export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | 'trigger'>, UseCascaderProps {
12
+ export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | 'trigger' | 'scrollable'>, UseCascaderProps {
13
13
  /**
14
14
  * 将 check 子项拍平展示。暂不对外暴露
15
15
  * @private
@@ -54,6 +54,7 @@ export interface CascaderItemRequiredProps {
54
54
  selected: boolean;
55
55
  loading: boolean;
56
56
  focused: boolean;
57
+ active: boolean;
57
58
  }
58
59
  export interface CascaderItemEventData extends FlattedCascaderDataItem, CascaderItemRequiredProps {
59
60
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hi-ui/cascader",
3
- "version": "4.0.0-beta.36",
3
+ "version": "4.0.0-beta.37",
4
4
  "description": "A sub-package for @hi-ui/hiui.",
5
5
  "keywords": [],
6
6
  "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -72,5 +72,5 @@
72
72
  "react": "^17.0.1",
73
73
  "react-dom": "^17.0.1"
74
74
  },
75
- "gitHead": "a1e8367a78c1f3fcea6a95ffc44bbf59beb58798"
75
+ "gitHead": "c88fb2f2e288ed4eda0edaa405db38e55d55bcd6"
76
76
  }