@rc-component/cascader 1.12.0 → 1.13.0

package/es/OptionList/Column.js

@@ -190,7 +190,7 @@ export default function Column({
       }
     }), /*#__PURE__*/React.createElement("div", {
       className: `${menuItemPrefixCls}-content`
-    }, optionRender ? optionRender(option) : label), !isLoading && expandIcon && !isMergedLeaf && /*#__PURE__*/React.createElement("div", {
+    }, optionRender && value !== '__EMPTY__' ? optionRender(option) : label), !isLoading && expandIcon && !isMergedLeaf && /*#__PURE__*/React.createElement("div", {
       className: `${menuItemPrefixCls}-expand-icon`
     }, expandIcon), isLoading && loadingIcon && /*#__PURE__*/React.createElement("div", {
       className: `${menuItemPrefixCls}-loading-icon`

package/es/OptionList/List.d.ts

@@ -1,6 +1,10 @@
 import type { useBaseProps } from '@rc-component/select';
 import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
 import * as React from 'react';
-export type RawOptionListProps = Pick<ReturnType<typeof useBaseProps>, 'prefixCls' | 'multiple' | 'searchValue' | 'toggleOpen' | 'notFoundContent' | 'direction' | 'open' | 'disabled'>;
-declare const RawOptionList: React.ForwardRefExoticComponent<RawOptionListProps & React.RefAttributes<RefOptionListProps>>;
+export type RawOptionListProps = Pick<ReturnType<typeof useBaseProps>, 'prefixCls' | 'multiple' | 'searchValue' | 'toggleOpen' | 'notFoundContent' | 'direction' | 'open' | 'disabled'> & {
+    lockOptions?: boolean;
+};
+declare const RawOptionList: React.ForwardRefExoticComponent<Pick<import("@rc-component/select/lib/hooks/useBaseProps").BaseSelectContextProps, "disabled" | "prefixCls" | "multiple" | "searchValue" | "direction" | "notFoundContent" | "open" | "toggleOpen"> & {
+    lockOptions?: boolean | undefined;
+} & React.RefAttributes<RefOptionListProps>>;
 export default RawOptionList;

package/es/OptionList/List.js

@@ -2,10 +2,10 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 /* eslint-disable default-case */
 import { clsx } from 'clsx';
 import * as React from 'react';
+import useMemo from "@rc-component/util/es/hooks/useMemo";
 import CascaderContext from "../context";
 import { getFullPathKeys, isLeaf, scrollIntoParentView, toPathKey, toPathKeys, toPathValueStr } from "../utils/commonUtil";
 import { toPathOptions } from "../utils/treeUtil";
-import CacheContent from "./CacheContent";
 import Column, { FIX_LABEL } from "./Column";
 import useActive from "./useActive";
 import useKeyboard from "./useKeyboard";
@@ -18,7 +18,8 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
     notFoundContent,
     direction,
     open,
-    disabled
+    disabled,
+    lockOptions = false
   } = props;
   const containerRef = React.useRef(null);
   const rtl = direction === 'rtl';
@@ -103,13 +104,16 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
   };
 
   // ========================== Option ==========================
-  const mergedOptions = React.useMemo(() => {
+  const filteredOptions = React.useMemo(() => {
     if (searchValue) {
       return searchOptions;
     }
     return options;
   }, [searchValue, searchOptions, options]);
 
+  // Update only when open or lockOptions
+  const mergedOptions = useMemo(() => filteredOptions, [open, lockOptions], (prev, next) => !!next[0] && !next[1]);
+
   // ========================== Column ==========================
   const optionColumns = React.useMemo(() => {
     const optionList = [{
@@ -199,15 +203,13 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
   });
 
   // >>>>> Render
-  return /*#__PURE__*/React.createElement(CacheContent, {
-    open: open
-  }, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: clsx(`${mergedPrefixCls}-menus`, {
       [`${mergedPrefixCls}-menu-empty`]: isEmpty,
       [`${mergedPrefixCls}-rtl`]: rtl
     }),
     ref: containerRef
-  }, columnNodes));
+  }, columnNodes);
 });
 if (process.env.NODE_ENV !== 'production') {
   RawOptionList.displayName = 'RawOptionList';

package/es/OptionList/index.js

@@ -3,10 +3,14 @@ import { useBaseProps } from '@rc-component/select';
 import * as React from 'react';
 import RawOptionList from "./List";
 const RefOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const baseProps = useBaseProps();
+  const {
+    lockOptions,
+    ...baseProps
+  } = useBaseProps();
 
   // >>>>> Render
   return /*#__PURE__*/React.createElement(RawOptionList, _extends({}, props, baseProps, {
+    lockOptions: lockOptions,
     ref: ref
   }));
 });

package/lib/OptionList/Column.js

@@ -200,7 +200,7 @@ function Column({
       }
     }), /*#__PURE__*/React.createElement("div", {
       className: `${menuItemPrefixCls}-content`
-    }, optionRender ? optionRender(option) : label), !isLoading && expandIcon && !isMergedLeaf && /*#__PURE__*/React.createElement("div", {
+    }, optionRender && value !== '__EMPTY__' ? optionRender(option) : label), !isLoading && expandIcon && !isMergedLeaf && /*#__PURE__*/React.createElement("div", {
       className: `${menuItemPrefixCls}-expand-icon`
     }, expandIcon), isLoading && loadingIcon && /*#__PURE__*/React.createElement("div", {
       className: `${menuItemPrefixCls}-loading-icon`

package/lib/OptionList/List.d.ts

@@ -1,6 +1,10 @@
 import type { useBaseProps } from '@rc-component/select';
 import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
 import * as React from 'react';
-export type RawOptionListProps = Pick<ReturnType<typeof useBaseProps>, 'prefixCls' | 'multiple' | 'searchValue' | 'toggleOpen' | 'notFoundContent' | 'direction' | 'open' | 'disabled'>;
-declare const RawOptionList: React.ForwardRefExoticComponent<RawOptionListProps & React.RefAttributes<RefOptionListProps>>;
+export type RawOptionListProps = Pick<ReturnType<typeof useBaseProps>, 'prefixCls' | 'multiple' | 'searchValue' | 'toggleOpen' | 'notFoundContent' | 'direction' | 'open' | 'disabled'> & {
+    lockOptions?: boolean;
+};
+declare const RawOptionList: React.ForwardRefExoticComponent<Pick<import("@rc-component/select/lib/hooks/useBaseProps").BaseSelectContextProps, "disabled" | "prefixCls" | "multiple" | "searchValue" | "direction" | "notFoundContent" | "open" | "toggleOpen"> & {
+    lockOptions?: boolean | undefined;
+} & React.RefAttributes<RefOptionListProps>>;
 export default RawOptionList;

package/lib/OptionList/List.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _clsx = require("clsx");
 var React = _interopRequireWildcard(require("react"));
+var _useMemo = _interopRequireDefault(require("@rc-component/util/lib/hooks/useMemo"));
 var _context = _interopRequireDefault(require("../context"));
 var _commonUtil = require("../utils/commonUtil");
 var _treeUtil = require("../utils/treeUtil");
-var _CacheContent = _interopRequireDefault(require("./CacheContent"));
 var _Column = _interopRequireWildcard(require("./Column"));
 var _useActive = _interopRequireDefault(require("./useActive"));
 var _useKeyboard = _interopRequireDefault(require("./useKeyboard"));
@@ -26,7 +26,8 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
     notFoundContent,
     direction,
     open,
-    disabled
+    disabled,
+    lockOptions = false
   } = props;
   const containerRef = React.useRef(null);
   const rtl = direction === 'rtl';
@@ -111,13 +112,16 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
   };
 
   // ========================== Option ==========================
-  const mergedOptions = React.useMemo(() => {
+  const filteredOptions = React.useMemo(() => {
     if (searchValue) {
       return searchOptions;
     }
     return options;
   }, [searchValue, searchOptions, options]);
 
+  // Update only when open or lockOptions
+  const mergedOptions = (0, _useMemo.default)(() => filteredOptions, [open, lockOptions], (prev, next) => !!next[0] && !next[1]);
+
   // ========================== Column ==========================
   const optionColumns = React.useMemo(() => {
     const optionList = [{
@@ -207,15 +211,13 @@ const RawOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
   });
 
   // >>>>> Render
-  return /*#__PURE__*/React.createElement(_CacheContent.default, {
-    open: open
-  }, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: (0, _clsx.clsx)(`${mergedPrefixCls}-menus`, {
       [`${mergedPrefixCls}-menu-empty`]: isEmpty,
       [`${mergedPrefixCls}-rtl`]: rtl
     }),
     ref: containerRef
-  }, columnNodes));
+  }, columnNodes);
 });
 if (process.env.NODE_ENV !== 'production') {
   RawOptionList.displayName = 'RawOptionList';

package/lib/OptionList/index.js

@@ -12,10 +12,14 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const RefOptionList = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const baseProps = (0, _select.useBaseProps)();
+  const {
+    lockOptions,
+    ...baseProps
+  } = (0, _select.useBaseProps)();
 
   // >>>>> Render
   return /*#__PURE__*/React.createElement(_List.default, _extends({}, props, baseProps, {
+    lockOptions: lockOptions,
     ref: ref
   }));
 });

package/lib/OptionList/useKeyboard.d.ts

@@ -2,7 +2,7 @@ import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
 import * as React from 'react';
 import type { DefaultOptionType, InternalFieldNames, LegacyKey, SingleValueType } from '../Cascader';
 declare const _default: (ref: React.Ref<RefOptionListProps>, options: DefaultOptionType[], fieldNames: InternalFieldNames, activeValueCells: LegacyKey[], setActiveValueCells: (activeValueCells: LegacyKey[]) => void, onKeyBoardSelect: (valueCells: SingleValueType, option: DefaultOptionType) => void, contextProps: {
-    direction?: "rtl" | "ltr" | undefined;
+    direction?: "ltr" | "rtl" | undefined;
     searchValue: string;
     toggleOpen: (open?: boolean) => void;
     open?: boolean | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/cascader",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "cascade select ui component for react",
   "keywords": [
     "react",
@@ -43,7 +43,7 @@
     "test": "rc-test"
   },
   "dependencies": {
-    "@rc-component/select": "~1.5.0",
+    "@rc-component/select": "~1.5.2",
     "@rc-component/tree": "~1.2.0",
     "@rc-component/util": "^1.4.0",
     "clsx": "^2.1.1"

package/es/OptionList/CacheContent.d.ts

@@ -1,7 +0,0 @@
-import * as React from 'react';
-export interface CacheContentProps {
-    children?: React.ReactNode;
-    open?: boolean;
-}
-declare const CacheContent: React.MemoExoticComponent<({ children }: CacheContentProps) => React.ReactElement<unknown, string | React.JSXElementConstructor<any>>>;
-export default CacheContent;

package/es/OptionList/CacheContent.js

@@ -1,8 +0,0 @@
-import * as React from 'react';
-const CacheContent = /*#__PURE__*/React.memo(({
-  children
-}) => children, (_, next) => !next.open);
-if (process.env.NODE_ENV !== 'production') {
-  CacheContent.displayName = 'CacheContent';
-}
-export default CacheContent;

package/lib/OptionList/CacheContent.d.ts

@@ -1,7 +0,0 @@
-import * as React from 'react';
-export interface CacheContentProps {
-    children?: React.ReactNode;
-    open?: boolean;
-}
-declare const CacheContent: React.MemoExoticComponent<({ children }: CacheContentProps) => React.ReactElement<unknown, string | React.JSXElementConstructor<any>>>;
-export default CacheContent;

package/lib/OptionList/CacheContent.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var React = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const CacheContent = /*#__PURE__*/React.memo(({
-  children
-}) => children, (_, next) => !next.open);
-if (process.env.NODE_ENV !== 'production') {
-  CacheContent.displayName = 'CacheContent';
-}
-var _default = exports.default = CacheContent;