@rc-component/tree-select 1.2.0 → 1.2.2

package/es/TreeSelect.js

@@ -2,7 +2,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 import { BaseSelect } from '@rc-component/select';
 import useId from "@rc-component/util/es/hooks/useId";
 import { conductCheck } from "@rc-component/tree/es/utils/conductUtil";
-import useMergedState from "@rc-component/util/es/hooks/useMergedState";
+import useControlledState from "@rc-component/util/es/hooks/useControlledState";
 import * as React from 'react';
 import useCache from "./hooks/useCache";
 import useCheckedKeys from "./hooks/useCheckedKeys";
@@ -34,6 +34,12 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     onDeselect,
     // Search
     showSearch,
+    searchValue: legacySearchValue,
+    inputValue: legacyinputValue,
+    onSearch: legacyOnSearch,
+    autoClearSearchValue: legacyAutoClearSearchValue,
+    filterTreeNode: legacyFilterTreeNode,
+    treeNodeFilterProp: legacytreeNodeFilterProp,
     // Selector
     showCheckedStrategy,
     treeNodeLabelProp,
@@ -82,7 +88,15 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   const mergedCheckable = treeCheckable || treeCheckStrictly;
   const mergedLabelInValue = treeCheckStrictly || labelInValue;
   const mergedMultiple = mergedCheckable || multiple;
-  const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, props);
+  const searchProps = {
+    searchValue: legacySearchValue,
+    inputValue: legacyinputValue,
+    onSearch: legacyOnSearch,
+    autoClearSearchValue: legacyAutoClearSearchValue,
+    filterTreeNode: legacyFilterTreeNode,
+    treeNodeFilterProp: legacytreeNodeFilterProp
+  };
+  const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, searchProps);
   const {
     searchValue,
     onSearch,
@@ -90,9 +104,7 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     filterTreeNode,
     treeNodeFilterProp = 'value'
   } = searchConfig;
-  const [internalValue, setInternalValue] = useMergedState(defaultValue, {
-    value
-  });
+  const [internalValue, setInternalValue] = useControlledState(defaultValue, value);
 
   // `multiple` && `!treeCheckable` should be show all
   const mergedShowCheckedStrategy = React.useMemo(() => {
@@ -113,10 +125,8 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   /* eslint-enable react-hooks/exhaustive-deps */);
 
   // =========================== Search ===========================
-  const [mergedSearchValue, setSearchValue] = useMergedState('', {
-    value: searchValue,
-    postState: search => search || ''
-  });
+  const [internalSearchValue, setSearchValue] = useControlledState('', searchValue);
+  const mergedSearchValue = internalSearchValue || '';
   const onInternalSearch = searchText => {
     setSearchValue(searchText);
     onSearch?.(searchText);
@@ -502,7 +512,8 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     displayValues: cachedDisplayValues,
     onDisplayValuesChange: onDisplayValuesChange
     // >>> Search
-  }, searchConfig, {
+    ,
+    autoClearSearchValue: autoClearSearchValue,
     showSearch: mergedShowSearch,
     searchValue: mergedSearchValue,
     onSearch: onInternalSearch

package/es/hooks/useSearchConfig.d.ts

@@ -1,2 +1,4 @@
-import type { SearchConfig, TreeSelectProps } from "../TreeSelect";
-export default function useSearchConfig(showSearch: boolean | SearchConfig, props: TreeSelectProps): [boolean, SearchConfig];
+import type { SearchConfig } from "../TreeSelect";
+export default function useSearchConfig(showSearch: boolean | SearchConfig, props: SearchConfig & {
+    inputValue: string;
+}): [boolean, SearchConfig];

package/lib/TreeSelect.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 var _select = require("@rc-component/select");
 var _useId = _interopRequireDefault(require("@rc-component/util/lib/hooks/useId"));
 var _conductUtil = require("@rc-component/tree/lib/utils/conductUtil");
-var _useMergedState = _interopRequireDefault(require("@rc-component/util/lib/hooks/useMergedState"));
+var _useControlledState = _interopRequireDefault(require("@rc-component/util/lib/hooks/useControlledState"));
 var React = _interopRequireWildcard(require("react"));
 var _useCache = _interopRequireDefault(require("./hooks/useCache"));
 var _useCheckedKeys = _interopRequireDefault(require("./hooks/useCheckedKeys"));
@@ -43,6 +43,12 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     onDeselect,
     // Search
     showSearch,
+    searchValue: legacySearchValue,
+    inputValue: legacyinputValue,
+    onSearch: legacyOnSearch,
+    autoClearSearchValue: legacyAutoClearSearchValue,
+    filterTreeNode: legacyFilterTreeNode,
+    treeNodeFilterProp: legacytreeNodeFilterProp,
     // Selector
     showCheckedStrategy,
     treeNodeLabelProp,
@@ -91,7 +97,15 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   const mergedCheckable = treeCheckable || treeCheckStrictly;
   const mergedLabelInValue = treeCheckStrictly || labelInValue;
   const mergedMultiple = mergedCheckable || multiple;
-  const [mergedShowSearch, searchConfig] = (0, _useSearchConfig.default)(showSearch, props);
+  const searchProps = {
+    searchValue: legacySearchValue,
+    inputValue: legacyinputValue,
+    onSearch: legacyOnSearch,
+    autoClearSearchValue: legacyAutoClearSearchValue,
+    filterTreeNode: legacyFilterTreeNode,
+    treeNodeFilterProp: legacytreeNodeFilterProp
+  };
+  const [mergedShowSearch, searchConfig] = (0, _useSearchConfig.default)(showSearch, searchProps);
   const {
     searchValue,
     onSearch,
@@ -99,9 +113,7 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     filterTreeNode,
     treeNodeFilterProp = 'value'
   } = searchConfig;
-  const [internalValue, setInternalValue] = (0, _useMergedState.default)(defaultValue, {
-    value
-  });
+  const [internalValue, setInternalValue] = (0, _useControlledState.default)(defaultValue, value);
 
   // `multiple` && `!treeCheckable` should be show all
   const mergedShowCheckedStrategy = React.useMemo(() => {
@@ -122,10 +134,8 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   /* eslint-enable react-hooks/exhaustive-deps */);
 
   // =========================== Search ===========================
-  const [mergedSearchValue, setSearchValue] = (0, _useMergedState.default)('', {
-    value: searchValue,
-    postState: search => search || ''
-  });
+  const [internalSearchValue, setSearchValue] = (0, _useControlledState.default)('', searchValue);
+  const mergedSearchValue = internalSearchValue || '';
   const onInternalSearch = searchText => {
     setSearchValue(searchText);
     onSearch?.(searchText);
@@ -511,7 +521,8 @@ const TreeSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     displayValues: cachedDisplayValues,
     onDisplayValuesChange: onDisplayValuesChange
     // >>> Search
-  }, searchConfig, {
+    ,
+    autoClearSearchValue: autoClearSearchValue,
     showSearch: mergedShowSearch,
     searchValue: mergedSearchValue,
     onSearch: onInternalSearch

package/lib/hooks/useSearchConfig.d.ts

@@ -1,2 +1,4 @@
-import type { SearchConfig, TreeSelectProps } from "../TreeSelect";
-export default function useSearchConfig(showSearch: boolean | SearchConfig, props: TreeSelectProps): [boolean, SearchConfig];
+import type { SearchConfig } from "../TreeSelect";
+export default function useSearchConfig(showSearch: boolean | SearchConfig, props: SearchConfig & {
+    inputValue: string;
+}): [boolean, SearchConfig];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/tree-select",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "tree-select ui component for react",
   "keywords": [
     "react",
@@ -47,7 +47,7 @@
     "classnames": "2.x",
     "@rc-component/select": "~1.1.0",
     "@rc-component/tree": "~1.0.1",
-    "@rc-component/util": "^1.2.1"
+    "@rc-component/util": "^1.3.0"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^2.0.2",