rc-tree-select - npm Package Compare versions

Comparing version 5.11.1 to 5.11.2

es/TreeSelect.d.ts

@@ -1,8 +0,8 @@
-import * as React from 'react';
+import type { BaseSelectPropsWithoutPrivate, BaseSelectRef, SelectProps } from 'rc-select';
 import type { IconType } from 'rc-tree/lib/interface';
 import type { ExpandAction } from 'rc-tree/lib/Tree';
-import type { BaseSelectRef, BaseSelectPropsWithoutPrivate, SelectProps } from 'rc-select';
+import * as React from 'react';
 import TreeNode from './TreeNode';
-import { SHOW_ALL, SHOW_PARENT, SHOW_CHILD } from './utils/strategyUtil';
 import type { CheckedStrategy } from './utils/strategyUtil';
+import { SHOW_ALL, SHOW_CHILD, SHOW_PARENT } from './utils/strategyUtil';
 export type OnInternalSelect = (value: RawValueType, info: {
@@ -9,0 +9,0 @@ selected: boolean;

es/TreeSelect.js

@@ -8,22 +8,22 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 var _excluded = ["id", "prefixCls", "value", "defaultValue", "onChange", "onSelect", "onDeselect", "searchValue", "inputValue", "onSearch", "autoClearSearchValue", "filterTreeNode", "treeNodeFilterProp", "showCheckedStrategy", "treeNodeLabelProp", "multiple", "treeCheckable", "treeCheckStrictly", "labelInValue", "fieldNames", "treeDataSimpleMode", "treeData", "children", "loadData", "treeLoadedKeys", "onTreeLoad", "treeDefaultExpandAll", "treeExpandedKeys", "treeDefaultExpandedKeys", "onTreeExpand", "treeExpandAction", "virtual", "listHeight", "listItemHeight", "onDropdownVisibleChange", "dropdownMatchSelectWidth", "treeLine", "treeIcon", "showTreeIcon", "switcherIcon", "treeMotion"];
-import * as React from 'react';
 import { BaseSelect } from 'rc-select';
+import useId from "rc-select/es/hooks/useId";
 import { conductCheck } from "rc-tree/es/utils/conductUtil";
-import useId from "rc-select/es/hooks/useId";
 import useMergedState from "rc-util/es/hooks/useMergedState";
+import warning from "rc-util/es/warning";
+import * as React from 'react';
+import useCache from "./hooks/useCache";
+import useCheckedKeys from "./hooks/useCheckedKeys";
+import useDataEntities from "./hooks/useDataEntities";
+import useFilterTreeData from "./hooks/useFilterTreeData";
+import useRefFunc from "./hooks/useRefFunc";
+import useTreeData from "./hooks/useTreeData";
+import LegacyContext from "./LegacyContext";
 import OptionList from "./OptionList";
 import TreeNode from "./TreeNode";
-import { formatStrategyValues, SHOW_ALL, SHOW_PARENT, SHOW_CHILD } from "./utils/strategyUtil";
 import TreeSelectContext from "./TreeSelectContext";
-import LegacyContext from "./LegacyContext";
-import useTreeData from "./hooks/useTreeData";
-import { toArray, fillFieldNames, isNil } from "./utils/valueUtil";
-import useCache from "./hooks/useCache";
-import useRefFunc from "./hooks/useRefFunc";
-import useDataEntities from "./hooks/useDataEntities";
 import { fillAdditionalInfo, fillLegacyProps } from "./utils/legacyUtil";
-import useCheckedKeys from "./hooks/useCheckedKeys";
-import useFilterTreeData from "./hooks/useFilterTreeData";
+import { formatStrategyValues, SHOW_ALL, SHOW_CHILD, SHOW_PARENT } from "./utils/strategyUtil";
+import { fillFieldNames, isNil, toArray } from "./utils/valueUtil";
 import warningProps from "./utils/warningPropsUtil";
-import warning from "rc-util/es/warning";
 
@@ -52,4 +52,3 @@ /** @deprecated This is only used for legacy compatible. Not works on new code. */
     treeNodeFilterProp = _props$treeNodeFilter === void 0 ? 'value' : _props$treeNodeFilter,
-    _props$showCheckedStr = props.showCheckedStrategy,
-    showCheckedStrategy = _props$showCheckedStr === void 0 ? SHOW_CHILD : _props$showCheckedStr,
+    showCheckedStrategy = props.showCheckedStrategy,
     treeNodeLabelProp = props.treeNodeLabelProp,
@@ -98,2 +97,10 @@ multiple = props.multiple,
 
+  // `multiple` && `!treeCheckable` should be show all
+  var mergedShowCheckedStrategy = React.useMemo(function () {
+    if (!treeCheckable) {
+      return SHOW_ALL;
+    }
+    return showCheckedStrategy || SHOW_CHILD;
+  }, [showCheckedStrategy, treeCheckable]);
+
   // ========================== Warning ===========================
@@ -259,3 +266,3 @@ if (process.env.NODE_ENV !== 'production') {
     // Collect keys which need to show
-    var displayKeys = formatStrategyValues(rawCheckedValues, showCheckedStrategy, keyEntities, mergedFieldNames);
+    var displayKeys = formatStrategyValues(rawCheckedValues, mergedShowCheckedStrategy, keyEntities, mergedFieldNames);
 
@@ -289,3 +296,3 @@ // Convert to value and filled with label
     });
-  }, [mergedFieldNames, mergedMultiple, rawCheckedValues, rawLabeledValues, convert2LabelValues, showCheckedStrategy, keyEntities]);
+  }, [mergedFieldNames, mergedMultiple, rawCheckedValues, rawLabeledValues, convert2LabelValues, mergedShowCheckedStrategy, keyEntities]);
   var _useCache = useCache(displayValues),
@@ -309,3 +316,3 @@ _useCache2 = _slicedToArray(_useCache, 1),
       if (treeConduction) {
-        var formattedKeyList = formatStrategyValues(newRawValues, showCheckedStrategy, keyEntities, mergedFieldNames);
+        var formattedKeyList = formatStrategyValues(newRawValues, mergedShowCheckedStrategy, keyEntities, mergedFieldNames);
         eventValues = formattedKeyList.map(function (key) {
@@ -312,0 +319,0 @@ var entity = valueEntities.get(key);

lib/TreeSelect.d.ts

@@ -1,8 +0,8 @@
-import * as React from 'react';
+import type { BaseSelectPropsWithoutPrivate, BaseSelectRef, SelectProps } from 'rc-select';
 import type { IconType } from 'rc-tree/lib/interface';
 import type { ExpandAction } from 'rc-tree/lib/Tree';
-import type { BaseSelectRef, BaseSelectPropsWithoutPrivate, SelectProps } from 'rc-select';
+import * as React from 'react';
 import TreeNode from './TreeNode';
-import { SHOW_ALL, SHOW_PARENT, SHOW_CHILD } from './utils/strategyUtil';
 import type { CheckedStrategy } from './utils/strategyUtil';
+import { SHOW_ALL, SHOW_CHILD, SHOW_PARENT } from './utils/strategyUtil';
 export type OnInternalSelect = (value: RawValueType, info: {
@@ -9,0 +9,0 @@ selected: boolean;

lib/TreeSelect.js

@@ -15,22 +15,22 @@ "use strict";
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var React = _interopRequireWildcard(require("react"));
 var _rcSelect = require("rc-select");
+var _useId = _interopRequireDefault(require("rc-select/lib/hooks/useId"));
 var _conductUtil = require("rc-tree/lib/utils/conductUtil");
-var _useId = _interopRequireDefault(require("rc-select/lib/hooks/useId"));
 var _useMergedState5 = _interopRequireDefault(require("rc-util/lib/hooks/useMergedState"));
+var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
+var React = _interopRequireWildcard(require("react"));
+var _useCache3 = _interopRequireDefault(require("./hooks/useCache"));
+var _useCheckedKeys3 = _interopRequireDefault(require("./hooks/useCheckedKeys"));
+var _useDataEntities2 = _interopRequireDefault(require("./hooks/useDataEntities"));
+var _useFilterTreeData = _interopRequireDefault(require("./hooks/useFilterTreeData"));
+var _useRefFunc = _interopRequireDefault(require("./hooks/useRefFunc"));
+var _useTreeData = _interopRequireDefault(require("./hooks/useTreeData"));
+var _LegacyContext = _interopRequireDefault(require("./LegacyContext"));
 var _OptionList = _interopRequireDefault(require("./OptionList"));
 var _TreeNode = _interopRequireDefault(require("./TreeNode"));
+var _TreeSelectContext = _interopRequireDefault(require("./TreeSelectContext"));
+var _legacyUtil = require("./utils/legacyUtil");
 var _strategyUtil = require("./utils/strategyUtil");
-var _TreeSelectContext = _interopRequireDefault(require("./TreeSelectContext"));
-var _LegacyContext = _interopRequireDefault(require("./LegacyContext"));
-var _useTreeData = _interopRequireDefault(require("./hooks/useTreeData"));
 var _valueUtil = require("./utils/valueUtil");
-var _useCache3 = _interopRequireDefault(require("./hooks/useCache"));
-var _useRefFunc = _interopRequireDefault(require("./hooks/useRefFunc"));
-var _useDataEntities2 = _interopRequireDefault(require("./hooks/useDataEntities"));
-var _legacyUtil = require("./utils/legacyUtil");
-var _useCheckedKeys3 = _interopRequireDefault(require("./hooks/useCheckedKeys"));
-var _useFilterTreeData = _interopRequireDefault(require("./hooks/useFilterTreeData"));
 var _warningPropsUtil = _interopRequireDefault(require("./utils/warningPropsUtil"));
-var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
 var _excluded = ["id", "prefixCls", "value", "defaultValue", "onChange", "onSelect", "onDeselect", "searchValue", "inputValue", "onSearch", "autoClearSearchValue", "filterTreeNode", "treeNodeFilterProp", "showCheckedStrategy", "treeNodeLabelProp", "multiple", "treeCheckable", "treeCheckStrictly", "labelInValue", "fieldNames", "treeDataSimpleMode", "treeData", "children", "loadData", "treeLoadedKeys", "onTreeLoad", "treeDefaultExpandAll", "treeExpandedKeys", "treeDefaultExpandedKeys", "onTreeExpand", "treeExpandAction", "virtual", "listHeight", "listItemHeight", "onDropdownVisibleChange", "dropdownMatchSelectWidth", "treeLine", "treeIcon", "showTreeIcon", "switcherIcon", "treeMotion"];
@@ -61,4 +61,3 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
     treeNodeFilterProp = _props$treeNodeFilter === void 0 ? 'value' : _props$treeNodeFilter,
-    _props$showCheckedStr = props.showCheckedStrategy,
-    showCheckedStrategy = _props$showCheckedStr === void 0 ? _strategyUtil.SHOW_CHILD : _props$showCheckedStr,
+    showCheckedStrategy = props.showCheckedStrategy,
     treeNodeLabelProp = props.treeNodeLabelProp,
@@ -107,2 +106,10 @@ multiple = props.multiple,
 
+  // `multiple` && `!treeCheckable` should be show all
+  var mergedShowCheckedStrategy = React.useMemo(function () {
+    if (!treeCheckable) {
+      return _strategyUtil.SHOW_ALL;
+    }
+    return showCheckedStrategy || _strategyUtil.SHOW_CHILD;
+  }, [showCheckedStrategy, treeCheckable]);
+
   // ========================== Warning ===========================
@@ -268,3 +275,3 @@ if (process.env.NODE_ENV !== 'production') {
     // Collect keys which need to show
-    var displayKeys = (0, _strategyUtil.formatStrategyValues)(rawCheckedValues, showCheckedStrategy, keyEntities, mergedFieldNames);
+    var displayKeys = (0, _strategyUtil.formatStrategyValues)(rawCheckedValues, mergedShowCheckedStrategy, keyEntities, mergedFieldNames);
 
@@ -298,3 +305,3 @@ // Convert to value and filled with label
     });
-  }, [mergedFieldNames, mergedMultiple, rawCheckedValues, rawLabeledValues, convert2LabelValues, showCheckedStrategy, keyEntities]);
+  }, [mergedFieldNames, mergedMultiple, rawCheckedValues, rawLabeledValues, convert2LabelValues, mergedShowCheckedStrategy, keyEntities]);
   var _useCache = (0, _useCache3.default)(displayValues),
@@ -318,3 +325,3 @@ _useCache2 = (0, _slicedToArray2.default)(_useCache, 1),
       if (treeConduction) {
-        var formattedKeyList = (0, _strategyUtil.formatStrategyValues)(newRawValues, showCheckedStrategy, keyEntities, mergedFieldNames);
+        var formattedKeyList = (0, _strategyUtil.formatStrategyValues)(newRawValues, mergedShowCheckedStrategy, keyEntities, mergedFieldNames);
         eventValues = formattedKeyList.map(function (key) {
@@ -321,0 +328,0 @@ var entity = valueEntities.get(key);

package.json

 {
   "name": "rc-tree-select",
-  "version": "5.11.1",
+  "version": "5.11.2",
   "description": "tree-select ui component for react",
@@ -5,0 +5,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

162316

increased by0.23%

Lines of code

3151

increased by0.38%

No dependency changes