@hi-ui/check-cascader 4.0.0-beta.29 → 4.0.0-beta.31

package/lib/cjs/CheckCascader.js

@@ -35,7 +35,7 @@ var picker = require('@hi-ui/picker');
 
 var tagInput = require('@hi-ui/tag-input');
 
-var CheckCascaderMenus = require('./CheckCascaderMenus.js');
+var CheckCascaderMenuList = require('./CheckCascaderMenuList.js');
 
 var useSearchMode = require('@hi-ui/use-search-mode');
 
@@ -254,7 +254,7 @@ var CheckCascader = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       data: flattedData,
       invalid: invalid
     })
-  }), typeAssertion.isArrayNonEmpty(selectProps.data) ? /*#__PURE__*/React__default["default"].createElement(CheckCascaderMenus.CheckCascaderMenus, {
+  }), typeAssertion.isArrayNonEmpty(selectProps.data) ? /*#__PURE__*/React__default["default"].createElement(CheckCascaderMenuList.CheckCascaderMenuList, {
     disabled: disabled,
     value: value,
     // @ts-ignore

package/lib/cjs/{CheckCascaderMenus.js → CheckCascaderMenuList.js}

@@ -50,11 +50,7 @@ var _role = 'check-cascader-menus';
 var _prefix = classname.getPrefixCls(_role);
 
 var NOOP_ARRAY = [];
-/**
- * TODO: What is CheckCascaderMenus
- */
-
-var CheckCascaderMenus = /*#__PURE__*/React.forwardRef(function (_a, ref) {
+var CheckCascaderMenuList = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var _a$prefixCls = _a.prefixCls,
       prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
       _a$role = _a.role,
@@ -145,7 +141,7 @@ var CheckCascaderMenus = /*#__PURE__*/React.forwardRef(function (_a, ref) {
 });
 
 if (env.__DEV__) {
-  CheckCascaderMenus.displayName = 'CheckCascaderMenus';
+  CheckCascaderMenuList.displayName = 'CheckCascaderMenuList';
 }
 
-exports.CheckCascaderMenus = CheckCascaderMenus;
+exports.CheckCascaderMenuList = CheckCascaderMenuList;

package/lib/cjs/hooks/use-check.js

@@ -28,9 +28,8 @@ var useCheck = function useCheck(checkedMode, disabled, flattedData, defaultChec
 
   var _useUncontrolledState = useUncontrolledState.useUncontrolledState(defaultCheckedIds, checkedIdsProp, function (checkedIds, checkedNode, shouldChecked, semiCheckedIds) {
     // 出口数据处理
-    var processedIds = index.processCheckedIds(checkedMode, checkedIds, flattedData, allowCheck);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck({
-      checkedIds: processedIds,
+      checkedIds: checkedIds,
       semiCheckedIds: semiCheckedIds
     }, checkedNode, shouldChecked);
   }),
@@ -45,7 +44,11 @@ var useCheck = function useCheck(checkedMode, disabled, flattedData, defaultChec
     disabled: disabled,
     flattedData: flattedData,
     checkedIds: parsedCheckedIds,
-    onCheck: trySetCheckedIds,
+    onCheck: function onCheck(checkedIds, checkedNode, shouldChecked, semiCheckedIds) {
+      // 出口数据处理
+      var processedIds = index.processCheckedIds(checkedMode, checkedIds, flattedData, allowCheck);
+      trySetCheckedIds(processedIds, checkedNode, shouldChecked, semiCheckedIds);
+    },
     allowCheck: allowCheck
   });
 };

package/lib/cjs/utils/index.js

@@ -145,7 +145,6 @@ var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData
         if (node) {
           // 向上递归遍历是否被勾选
           var ancestors = treeUtils.getNodeAncestors(node);
-          console.log(ancestors);
 
           if (ancestors.some(function (parent) {
             return keySet.has(parent.id);

package/lib/esm/CheckCascader.js

@@ -17,7 +17,7 @@ import { UpOutlined, DownOutlined } from '@hi-ui/icons';
 import { useCache } from './hooks/use-cache/lib/esm/index.js';
 import { Picker } from '@hi-ui/picker';
 import { TagInputMock } from '@hi-ui/tag-input';
-import { CheckCascaderMenus } from './CheckCascaderMenus.js';
+import { CheckCascaderMenuList } from './CheckCascaderMenuList.js';
 import { useTreeCustomSearch, useTreeUpMatchSearch, useSearchMode, matchStrategy } from '@hi-ui/use-search-mode';
 import { flattenTreeData } from './utils/index.js';
 import { getTopDownAncestors, getNodeAncestorsWithMe } from '@hi-ui/tree-utils';
@@ -221,7 +221,7 @@ var CheckCascader = /*#__PURE__*/forwardRef(function (_a, ref) {
       data: flattedData,
       invalid: invalid
     })
-  }), isArrayNonEmpty(selectProps.data) ? /*#__PURE__*/React.createElement(CheckCascaderMenus, {
+  }), isArrayNonEmpty(selectProps.data) ? /*#__PURE__*/React.createElement(CheckCascaderMenuList, {
     disabled: disabled,
     value: value,
     // @ts-ignore

package/lib/esm/{CheckCascaderMenus.js → CheckCascaderMenuList.js}

@@ -23,11 +23,7 @@ var _role = 'check-cascader-menus';
 var _prefix = getPrefixCls(_role);
 
 var NOOP_ARRAY = [];
-/**
- * TODO: What is CheckCascaderMenus
- */
-
-var CheckCascaderMenus = /*#__PURE__*/forwardRef(function (_a, ref) {
+var CheckCascaderMenuList = /*#__PURE__*/forwardRef(function (_a, ref) {
   var _a$prefixCls = _a.prefixCls,
       prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
       _a$role = _a.role,
@@ -118,7 +114,7 @@ var CheckCascaderMenus = /*#__PURE__*/forwardRef(function (_a, ref) {
 });
 
 if (__DEV__) {
-  CheckCascaderMenus.displayName = 'CheckCascaderMenus';
+  CheckCascaderMenuList.displayName = 'CheckCascaderMenuList';
 }
 
-export { CheckCascaderMenus };
+export { CheckCascaderMenuList };

package/lib/esm/hooks/use-check.js

@@ -19,9 +19,8 @@ var useCheck = function useCheck(checkedMode, disabled, flattedData, defaultChec
 
   var _useUncontrolledState = useUncontrolledState(defaultCheckedIds, checkedIdsProp, function (checkedIds, checkedNode, shouldChecked, semiCheckedIds) {
     // 出口数据处理
-    var processedIds = processCheckedIds(checkedMode, checkedIds, flattedData, allowCheck);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck({
-      checkedIds: processedIds,
+      checkedIds: checkedIds,
       semiCheckedIds: semiCheckedIds
     }, checkedNode, shouldChecked);
   }),
@@ -36,7 +35,11 @@ var useCheck = function useCheck(checkedMode, disabled, flattedData, defaultChec
     disabled: disabled,
     flattedData: flattedData,
     checkedIds: parsedCheckedIds,
-    onCheck: trySetCheckedIds,
+    onCheck: function onCheck(checkedIds, checkedNode, shouldChecked, semiCheckedIds) {
+      // 出口数据处理
+      var processedIds = processCheckedIds(checkedMode, checkedIds, flattedData, allowCheck);
+      trySetCheckedIds(processedIds, checkedNode, shouldChecked, semiCheckedIds);
+    },
     allowCheck: allowCheck
   });
 };

package/lib/esm/utils/index.js

@@ -137,7 +137,6 @@ var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData
         if (node) {
           // 向上递归遍历是否被勾选
           var ancestors = getNodeAncestors(node);
-          console.log(ancestors);
 
           if (ancestors.some(function (parent) {
             return keySet.has(parent.id);

package/lib/types/CheckCascader.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CheckCascaderDataItem, ExpandTrigger, CheckCascaderDataItemEventData, FlattedCheckCascaderDataItem } from './types';
+import { CheckCascaderDataItem, CascaderExpandTriggerEnum, CheckCascadeItemEventData, FlattedCheckCascaderDataItem } from './types';
 import { PickerProps } from '@hi-ui/picker';
 import { HiBaseAppearanceEnum } from '@hi-ui/core';
 /**
@@ -21,18 +21,17 @@ export interface CheckCascaderProps extends Omit<PickerProps, 'trigger'> {
     defaultValue?: React.ReactText[][];
     /**
      * 多选值改变时的回调
-     * TODO: 是否有这样的需求：暴露操作的原始数据对象？包括 点击 checkbox、点击 tag 删除按钮、点击清空按钮
      */
     onChange?: (values: React.ReactText[][]) => void;
     /**
      * 选项被点击时的回调。暂不对外暴露
      * @private
      */
-    onSelect?: (selectedId: React.ReactText, selectedOption: CheckCascaderDataItemEventData) => void;
+    onSelect?: (selectedId: React.ReactText, selectedOption: CheckCascadeItemEventData) => void;
     /**
      * 次级菜单的展开方式
      */
-    expandTrigger?: ExpandTrigger;
+    expandTrigger?: CascaderExpandTriggerEnum;
     /**
      * 是否可搜索（仅在 title 为字符串时支持）
      */
@@ -56,7 +55,7 @@ export interface CheckCascaderProps extends Omit<PickerProps, 'trigger'> {
     /**
      * 自定义渲染节点的 title 内容
      */
-    render?: (item: CheckCascaderDataItemEventData) => React.ReactNode;
+    render?: (item: CheckCascadeItemEventData) => React.ReactNode;
     /**
      * 自定义选择后触发器所展示的内容
      */
@@ -81,7 +80,7 @@ export interface CheckCascaderProps extends Omit<PickerProps, 'trigger'> {
     /**
      * 异步请求更新数据
      */
-    onLoadChildren?: (item: CheckCascaderDataItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void;
+    onLoadChildren?: (item: CheckCascadeItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void;
     /**
      * 设置展现形式
      */

package/lib/types/{CheckCascaderMenus.d.ts → CheckCascaderMenuList.d.ts}

@@ -1,9 +1,6 @@
 import React from 'react';
-import { ExpandTrigger, CheckCascaderDataItemEventData, FlattedCheckCascaderDataItem, CheckCascaderDataItem } from './types';
-/**
- * TODO: What is CheckCascaderMenus
- */
-export declare const CheckCascaderMenus: React.ForwardRefExoticComponent<CascaderMenusProps & React.RefAttributes<HTMLDivElement | null>>;
+import { CascaderExpandTriggerEnum, CheckCascadeItemEventData, FlattedCheckCascaderDataItem, CheckCascaderDataItem } from './types';
+export declare const CheckCascaderMenuList: React.ForwardRefExoticComponent<CascaderMenusProps & React.RefAttributes<HTMLDivElement | null>>;
 export interface CascaderMenusProps {
     /**
      * 组件默认的选择器类
@@ -48,11 +45,11 @@ export interface CascaderMenusProps {
     /**
      * 选项被点击时的回调
      */
-    onSelect?: (selectedId: React.ReactText, selectedOption: CheckCascaderDataItemEventData) => void;
+    onSelect?: (selectedId: React.ReactText, selectedOption: CheckCascadeItemEventData) => void;
     /**
      * 次级菜单的展开方式
      */
-    expandTrigger?: ExpandTrigger;
+    expandTrigger?: CascaderExpandTriggerEnum;
     /**
      * 是否禁止使用
      */
@@ -64,7 +61,7 @@ export interface CascaderMenusProps {
     /**
      * 自定义渲染节点的 title 内容
      */
-    titleRender?: (item: CheckCascaderDataItemEventData) => React.ReactNode;
+    titleRender?: (item: CheckCascadeItemEventData) => React.ReactNode;
     /**
      * 多选数据交互时回填、回显模式
      * PARENT: 当所有子节点被选中时将只保留父节点
@@ -84,5 +81,5 @@ export interface CascaderMenusProps {
     /**
      * 点击异步加载子项
      */
-    onLoadChildren?: (item: CheckCascaderDataItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void;
+    onLoadChildren?: (item: CheckCascadeItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void;
 }

package/lib/types/context.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
-import { ExpandTrigger, CheckCascaderDataItemEventData, CheckCascaderDataItem, FlattedCheckCascaderDataItem, CheckCascaderDataItemRequiredProps } from './types';
+import { CascaderExpandTriggerEnum, CheckCascadeItemEventData, CheckCascaderDataItem, FlattedCheckCascaderDataItem, CheckCascaderDataItemRequiredProps } from './types';
 interface CheckCascaderContext {
-    onLoadChildren?: (item: CheckCascaderDataItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void;
+    onLoadChildren?: (item: CheckCascadeItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void;
     disabled?: boolean;
-    expandTrigger?: ExpandTrigger;
-    onCheck?: (option: CheckCascaderDataItemEventData, shouldChecked: boolean) => void;
-    onSelect?: (selectedOption: CheckCascaderDataItemEventData) => void;
+    expandTrigger?: CascaderExpandTriggerEnum;
+    onCheck?: (option: CheckCascadeItemEventData, shouldChecked: boolean) => void;
+    onSelect?: (selectedOption: CheckCascadeItemEventData) => void;
     flatted?: boolean;
     changeOnSelect?: boolean;
-    titleRender?: (item: CheckCascaderDataItemEventData) => React.ReactNode;
+    titleRender?: (item: CheckCascadeItemEventData) => React.ReactNode;
     getCascaderItemRequiredProps?: (item: FlattedCheckCascaderDataItem) => CheckCascaderDataItemRequiredProps;
 }
 export declare const CheckCascaderProvider: React.Provider<CheckCascaderContext>;

package/lib/types/hooks/use-async-switch.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-import { CheckCascaderDataItem, CheckCascaderDataItemEventData } from '../types';
-export declare const useAsyncSwitch: (setCascaderData: React.Dispatch<React.SetStateAction<CheckCascaderDataItem[]>>, onExpand?: ((selectedOption: CheckCascaderDataItemEventData) => void) | undefined, onLoadChildren?: ((item: CheckCascaderDataItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void) | undefined) => readonly [(id: React.ReactText) => boolean, (node: CheckCascaderDataItemEventData) => Promise<void>];
+import { CheckCascaderDataItem, CheckCascadeItemEventData } from '../types';
+export declare const useAsyncSwitch: (setCascaderData: React.Dispatch<React.SetStateAction<CheckCascaderDataItem[]>>, onExpand?: ((selectedOption: CheckCascadeItemEventData) => void) | undefined, onLoadChildren?: ((item: CheckCascadeItemEventData, idPaths: React.ReactText[]) => Promise<CheckCascaderDataItem[] | void> | void) | undefined) => readonly [(id: React.ReactText) => boolean, (node: CheckCascadeItemEventData) => Promise<void>];

package/lib/types/hooks/use-check.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { CheckCascaderDataItemEventData, FlattedCheckCascaderDataItem } from '../types';
+import { CheckCascadeItemEventData, FlattedCheckCascaderDataItem } from '../types';
 export declare const useCheck: (checkedMode: string, disabled: boolean, flattedData: FlattedCheckCascaderDataItem[], defaultCheckedIds?: React.ReactText[], checkedIdsProp?: React.ReactText[] | undefined, onCheck?: ((checkedInfo: {
     checkedIds: React.ReactText[];
     semiCheckedIds: React.ReactText[];
-}, node: CheckCascaderDataItemEventData, checked: boolean) => void) | undefined) => readonly [(targetItem: import("@hi-ui/use-check").UseCascadeCheckItem, shouldChecked: boolean) => void, (id: React.ReactText) => boolean, (id: React.ReactText) => boolean];
+}, node: CheckCascadeItemEventData, checked: boolean) => void) | undefined) => readonly [(targetItem: import("@hi-ui/use-check").UseCascadeCheckItem, shouldChecked: boolean) => void, (id: React.ReactText) => boolean, (id: React.ReactText) => boolean];

package/lib/types/hooks/use-select.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import { CheckCascaderDataItemEventData } from '../types';
+import { CheckCascadeItemEventData } from '../types';
 /**
  * 用于选中的 hook
  *
  * @param disabled
  * @returns
  */
-export declare const useSelect: (disabled: boolean) => readonly [React.ReactText | undefined, (selectedOption: CheckCascaderDataItemEventData) => void];
+export declare const useSelect: (disabled: boolean) => readonly [React.ReactText | undefined, (selectedOption: CheckCascadeItemEventData) => void];

package/lib/types/types.d.ts

@@ -3,11 +3,11 @@ export interface CheckCascaderDataItem {
     /**
      * 树节点唯一 id
      */
-    id: React.ReactText;
+    id?: React.ReactText;
     /**
      * 树节点标题
      */
-    title: React.ReactNode;
+    title?: React.ReactNode;
     /**
      * 该节点的子节点列表
      */
@@ -37,10 +37,6 @@ export interface FlattedCheckCascaderDataItem extends Required<Omit<CheckCascade
      * 该节点的子节点列表
      */
     children?: FlattedCheckCascaderDataItem[];
-    /**
-     * 该节点的所有祖先节点列表
-     */
-    ancestors?: FlattedCheckCascaderDataItemWithChildren[];
     /**
      * 关联用户传入的原始节点
      */
@@ -60,9 +56,9 @@ export interface CheckCascaderDataItemRequiredProps {
     semiChecked: boolean;
     loading: boolean;
 }
-export interface CheckCascaderDataItemEventData extends FlattedCheckCascaderDataItem, CheckCascaderDataItemRequiredProps {
+export interface CheckCascadeItemEventData extends FlattedCheckCascaderDataItem, CheckCascaderDataItemRequiredProps {
 }
-export declare type ExpandTrigger = 'click' | 'hover';
+export declare type CascaderExpandTriggerEnum = 'click' | 'hover';
 export interface NodeRoot<T> {
     depth: -1;
     children: T[];

package/lib/types/utils/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { HiBaseFieldNames } from '@hi-ui/core';
-import { CheckCascaderDataItemRequiredProps, CheckCascaderDataItemEventData, CheckCascaderDataItem, FlattedCheckCascaderDataItem } from '../types';
+import { CheckCascaderDataItemRequiredProps, CheckCascadeItemEventData, CheckCascaderDataItem, FlattedCheckCascaderDataItem } from '../types';
 /**
  * 扁平化树数据结构，基于前序遍历
  *
@@ -11,7 +11,7 @@ export declare const flattenTreeData: (treeData: CheckCascaderDataItem[], fieldN
 export declare const getActiveMenus: (data: FlattedCheckCascaderDataItem[], selectedIds?: React.ReactText | undefined) => FlattedCheckCascaderDataItem[][];
 export declare const getFlattedMenus: (data: FlattedCheckCascaderDataItem[]) => FlattedCheckCascaderDataItem[][];
 export declare const getActiveMenuIds: (data: FlattedCheckCascaderDataItem[], selectedIds?: React.ReactText | undefined) => React.ReactText[];
-export declare function getCascaderItemEventData(node: FlattedCheckCascaderDataItem, requiredProps: CheckCascaderDataItemRequiredProps): CheckCascaderDataItemEventData;
+export declare function getCascaderItemEventData(node: FlattedCheckCascaderDataItem, requiredProps: CheckCascaderDataItemRequiredProps): CheckCascadeItemEventData;
 /**
  * 处理选中的回显数据
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-cascader",
-  "version": "4.0.0-beta.29",
+  "version": "4.0.0-beta.31",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -45,19 +45,19 @@
   },
   "dependencies": {
     "@hi-ui/array-utils": "^4.0.0-beta.7",
-    "@hi-ui/checkbox": "^4.0.0-beta.10",
+    "@hi-ui/checkbox": "^4.0.0-beta.12",
     "@hi-ui/classname": "^4.0.0-beta.0",
     "@hi-ui/core": "^4.0.0-beta.8",
     "@hi-ui/core-css": "^4.0.0-beta.5",
     "@hi-ui/env": "^4.0.0-beta.0",
-    "@hi-ui/func-utils": "^4.0.0-beta.11",
+    "@hi-ui/func-utils": "^4.0.0-beta.12",
     "@hi-ui/icons": "^4.0.0-beta.10",
-    "@hi-ui/input": "^4.0.0-beta.13",
-    "@hi-ui/locale-context": "^4.0.0-beta.17",
-    "@hi-ui/picker": "^4.0.0-beta.22",
-    "@hi-ui/popper": "^4.0.0-beta.12",
-    "@hi-ui/spinner": "^4.0.0-beta.8",
-    "@hi-ui/tag-input": "^4.0.0-beta.17",
+    "@hi-ui/input": "^4.0.0-beta.15",
+    "@hi-ui/locale-context": "^4.0.0-beta.18",
+    "@hi-ui/picker": "^4.0.0-beta.24",
+    "@hi-ui/popper": "^4.0.0-beta.14",
+    "@hi-ui/spinner": "^4.0.0-beta.9",
+    "@hi-ui/tag-input": "^4.0.0-beta.18",
     "@hi-ui/times": "^4.0.0-beta.5",
     "@hi-ui/tree-utils": "^4.0.0-beta.4",
     "@hi-ui/type-assertion": "^4.0.0-beta.4",
@@ -66,7 +66,7 @@
     "@hi-ui/use-latest": "^4.0.0-beta.4",
     "@hi-ui/use-merge-refs": "^4.0.0-beta.4",
     "@hi-ui/use-outside-click": "^4.0.0-beta.4",
-    "@hi-ui/use-search-mode": "^4.0.0-beta.17",
+    "@hi-ui/use-search-mode": "^4.0.0-beta.19",
     "@hi-ui/use-toggle": "^4.0.0-beta.4",
     "@hi-ui/use-uncontrolled-state": "^4.0.0-beta.4"
   },
@@ -79,5 +79,5 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "798e91b8086b524e9ef1df8fef404bbf284198f5"
+  "gitHead": "64cc3305632f0d88f852f4a95cba7c27ff388a2d"
 }