tntd 3.0.40 → 3.0.41

package/es/dropdown/style/index.less

@@ -161,6 +161,7 @@
         &-icon {
           color: @text-color-secondary;
           font-style: normal;
+          margin-right: 0 !important;
           .iconfont-size-under-12px(10px);
         }
       }

package/es/tntd-cascader/rc-cascader/OptionList/Column.js

@@ -57,6 +57,7 @@ function Column(_ref) {
     }
     return 180;
   }, [optionsNum, optionHeight]);
+  var dropDownVisibleRef = React.useRef(dropdownVisible);
   var _React$useContext = React.useContext(_context["default"]),
     fieldNames = _React$useContext.fieldNames,
     changeOnSelect = _React$useContext.changeOnSelect,
@@ -65,10 +66,14 @@ function Column(_ref) {
     loadingIcon = _React$useContext.loadingIcon,
     dropdownMenuColumnStyle = _React$useContext.dropdownMenuColumnStyle;
   var hoverOpen = expandTrigger === 'hover';
+  // 将drop展示赋值给ref
+  React.useEffect(function () {
+    dropDownVisibleRef.current = dropdownVisible;
+  }, [dropdownVisible]);
   /** 单选情况下滚动到相应的位置 */
   React.useEffect(function () {
     var timer = null;
-    if (ref.current && ref.current.scrollTo && !multiple && dropdownVisible) {
+    if (ref.current && ref.current.scrollTo && !multiple && dropdownVisible && dropDownVisibleRef.current) {
       var index = options.findIndex(function (it) {
         return it[fieldNames.value] === activeValue;
       });
@@ -77,6 +82,7 @@ function Column(_ref) {
           ref.current.scrollTo((optionHeight || 36) * index);
         }, 5);
       }
+      dropDownVisibleRef.current = false;
     }
     return function () {
       if (timer) {

package/es/tntd-cascader/rc-cascader/OptionList/Column.js.map

@@ -1 +1 @@
-{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/rc-cascader/OptionList/Column.tsx"],"names":[],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport * as React from 'react'\nimport classNames from 'classnames'\nimport { isLeaf, toPathKey } from '../utils/commonUtil'\nimport CascaderContext from '../context'\nimport Checkbox from './Checkbox'\nimport type { DefaultOptionType, SingleValueType } from '../Cascader'\nimport { SEARCH_MARK } from '../hooks/useSearchOptions'\nimport List, { ListRef } from 'rc-virtual-list'\nimport type { RenderItem } from '../context'\n\nexport const FIX_LABEL = '__cascader_fix_label__'\n\nexport interface ColumnProps {\n  prefixCls: string\n  multiple?: boolean\n  options: DefaultOptionType[]\n  /** Current Column opened item key */\n  activeValue?: React.Key\n  /** The value path before current column */\n  prevValuePath: React.Key[]\n  onToggleOpen: (open: boolean) => void\n  onSelect: (valuePath: SingleValueType, leaf: boolean) => void\n  onActive: (valuePath: SingleValueType) => void\n  checkedSet: Set<React.Key>\n  halfCheckedSet: Set<React.Key>\n  loadingKeys: React.Key[]\n  isSelectable: (option: DefaultOptionType) => boolean\n  renderItem?: (item: RenderItem) => React.ReactNode\n  searchValue?: string\n  level?: number\n  dropdownVisible?: boolean\n  optionHeight?: number\n}\n\nexport default function Column({\n  prefixCls,\n  multiple,\n  options,\n  activeValue,\n  prevValuePath,\n  onToggleOpen,\n  onSelect,\n  onActive,\n  checkedSet,\n  halfCheckedSet,\n  loadingKeys,\n  isSelectable,\n  renderItem,\n  searchValue,\n  level,\n  dropdownVisible,\n  optionHeight = 32,\n  isEmpty,\n  optionsNum = 7,\n}: ColumnProps) {\n  const ref = React.useRef<ListRef>(null)\n  const menuPrefixCls = `${prefixCls}-menu ${prefixCls}-menu-${level}`\n  const menuItemPrefixCls = `${prefixCls}-menu-item`\n\n  const listHeight = React.useMemo(() => {\n    if (optionsNum) {\n      return Math.ceil((optionHeight || 36) * optionsNum) || 180\n    }\n    return 180\n  }, [optionsNum, optionHeight])\n\n  const {\n    fieldNames,\n    changeOnSelect,\n    expandTrigger,\n    expandIcon,\n    loadingIcon,\n    dropdownMenuColumnStyle,\n  } = React.useContext(CascaderContext)\n\n  const hoverOpen = expandTrigger === 'hover'\n\n  /** 单选情况下滚动到相应的位置 */\n  React.useEffect(() => {\n    let timer = null\n    if (ref.current && ref.current.scrollTo && !multiple && dropdownVisible) {\n      const index = options.findIndex((it) => it[fieldNames.value] === activeValue)\n\n      if (index > 0 && !isNaN(index)) {\n        timer = window.setTimeout(() => {\n          ref.current.scrollTo((optionHeight || 36) * index)\n        }, 5)\n      }\n    }\n\n    return () => {\n      if (timer) {\n        window.clearTimeout(timer)\n      }\n      timer = null\n    }\n  }, [multiple, activeValue, options, fieldNames, dropdownVisible, optionHeight])\n\n  // ============================ Option ============================\n  const optionInfoList = React.useMemo(\n    () =>\n      options.map((option) => {\n        const { disabled } = option\n        const searchOptions = option[SEARCH_MARK]\n        const label = option[FIX_LABEL] ?? option[fieldNames.label]\n        const value = option[fieldNames.value]\n\n        const isMergedLeaf = isLeaf(option, fieldNames)\n\n        // Get real value of option. Search option is different way.\n        const fullPath = searchOptions\n          ? // @ts-ignore\n            searchOptions.map((opt) => opt[fieldNames.value])\n          : [...prevValuePath, value]\n        const fullPathKey = toPathKey(fullPath)\n\n        const isLoading = loadingKeys.includes(fullPathKey)\n\n        // >>>>> checked\n        const checked = checkedSet.has(fullPathKey)\n\n        // >>>>> halfChecked\n        const halfChecked = halfCheckedSet.has(fullPathKey)\n\n        return {\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }\n      }),\n    [options, checkedSet, fieldNames, halfCheckedSet, loadingKeys, prevValuePath]\n  )\n  // ============================ Render ============================\n  return (\n    <ul className={menuPrefixCls} role=\"menu\" style={!isEmpty ? { height: listHeight + 'px' } : {}}>\n      <List\n        className={\n          optionInfoList[0].fullPathKey === '__EMPTY__' || !!searchValue\n            ? 'rc-virtual-list-full'\n            : ''\n        }\n        data={optionInfoList}\n        height={isEmpty ? 'auto' : listHeight}\n        itemHeight={optionHeight || 36}\n        itemKey=\"fullPathKey\"\n        ref={ref}\n      >\n        {({\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }) => {\n          // >>>>> Open\n          const triggerOpenPath = () => {\n            if (!disabled && (!hoverOpen || !isMergedLeaf)) {\n              onActive(fullPath)\n            }\n          }\n\n          // >>>>> Selection\n          const triggerSelect = () => {\n            if (isSelectable(option)) {\n              onSelect(fullPath, isMergedLeaf)\n            }\n          }\n\n          // >>>>> Title\n          let title: string\n          if (typeof option.title === 'string') {\n            title = option.title\n          } else if (typeof label === 'string') {\n            title = label\n          }\n          return (\n            <li\n              key={fullPathKey}\n              className={classNames(menuItemPrefixCls, {\n                [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,\n                [`${menuItemPrefixCls}-active`]: activeValue === value,\n                [`${menuItemPrefixCls}-disabled`]: disabled,\n                [`${menuItemPrefixCls}-loading`]: isLoading,\n              })}\n              style={dropdownMenuColumnStyle}\n              role=\"menuitemcheckbox\"\n              // @ts-ignore\n              title={title}\n              aria-checked={checked}\n              data-path-key={fullPathKey}\n              onClick={() => {\n                triggerOpenPath()\n                if (!multiple || isMergedLeaf) {\n                  triggerSelect()\n                }\n              }}\n              onDoubleClick={() => {\n                if (changeOnSelect) {\n                  onToggleOpen(false)\n                }\n              }}\n              onMouseEnter={() => {\n                if (hoverOpen) {\n                  triggerOpenPath()\n                }\n              }}\n              onMouseDown={(e) => {\n                // Prevent selector from blurring\n                e.preventDefault()\n              }}\n            >\n              {multiple && (\n                <Checkbox\n                  prefixCls={`${prefixCls}-checkbox`}\n                  checked={checked}\n                  halfChecked={halfChecked}\n                  disabled={disabled}\n                  onClick={(e: React.MouseEvent<HTMLSpanElement>) => {\n                    e.stopPropagation()\n                    triggerSelect()\n                  }}\n                />\n              )}\n              <div className={`${menuItemPrefixCls}-content`}>\n                {optionInfoList[0].fullPathKey !== '__EMPTY__' && renderItem\n                  ? renderItem(option, level)\n                  : label}\n              </div>\n              {!isLoading && expandIcon && !isMergedLeaf && (\n                <div className={`${menuItemPrefixCls}-expand-icon`}>{expandIcon}</div>\n              )}\n              {isLoading && loadingIcon && (\n                <div className={`${menuItemPrefixCls}-loading-icon`}>{loadingIcon}</div>\n              )}\n            </li>\n          )\n        }}\n      </List>\n    </ul>\n  )\n}\n"]}
+{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/rc-cascader/OptionList/Column.tsx"],"names":[],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport * as React from 'react'\nimport classNames from 'classnames'\nimport { isLeaf, toPathKey } from '../utils/commonUtil'\nimport CascaderContext from '../context'\nimport Checkbox from './Checkbox'\nimport type { DefaultOptionType, SingleValueType } from '../Cascader'\nimport { SEARCH_MARK } from '../hooks/useSearchOptions'\nimport List, { ListRef } from 'rc-virtual-list'\nimport type { RenderItem } from '../context'\n\nexport const FIX_LABEL = '__cascader_fix_label__'\n\nexport interface ColumnProps {\n  prefixCls: string\n  multiple?: boolean\n  options: DefaultOptionType[]\n  /** Current Column opened item key */\n  activeValue?: React.Key\n  /** The value path before current column */\n  prevValuePath: React.Key[]\n  onToggleOpen: (open: boolean) => void\n  onSelect: (valuePath: SingleValueType, leaf: boolean) => void\n  onActive: (valuePath: SingleValueType) => void\n  checkedSet: Set<React.Key>\n  halfCheckedSet: Set<React.Key>\n  loadingKeys: React.Key[]\n  isSelectable: (option: DefaultOptionType) => boolean\n  renderItem?: (item: RenderItem) => React.ReactNode\n  searchValue?: string\n  level?: number\n  dropdownVisible?: boolean\n  optionHeight?: number\n}\n\nexport default function Column({\n  prefixCls,\n  multiple,\n  options,\n  activeValue,\n  prevValuePath,\n  onToggleOpen,\n  onSelect,\n  onActive,\n  checkedSet,\n  halfCheckedSet,\n  loadingKeys,\n  isSelectable,\n  renderItem,\n  searchValue,\n  level,\n  dropdownVisible,\n  optionHeight = 32,\n  isEmpty,\n  optionsNum = 7,\n}: ColumnProps) {\n  const ref = React.useRef<ListRef>(null)\n  const menuPrefixCls = `${prefixCls}-menu ${prefixCls}-menu-${level}`\n  const menuItemPrefixCls = `${prefixCls}-menu-item`\n\n  const listHeight = React.useMemo(() => {\n    if (optionsNum) {\n      return Math.ceil((optionHeight || 36) * optionsNum) || 180\n    }\n    return 180\n  }, [optionsNum, optionHeight])\n\n  const dropDownVisibleRef = React.useRef(dropdownVisible)\n\n  const {\n    fieldNames,\n    changeOnSelect,\n    expandTrigger,\n    expandIcon,\n    loadingIcon,\n    dropdownMenuColumnStyle,\n  } = React.useContext(CascaderContext)\n\n  const hoverOpen = expandTrigger === 'hover'\n\n  // 将drop展示赋值给ref\n  React.useEffect(() => {\n    dropDownVisibleRef.current = dropdownVisible\n  }, [dropdownVisible])\n\n  /** 单选情况下滚动到相应的位置 */\n  React.useEffect(() => {\n    let timer = null\n\n    if (\n      ref.current &&\n      ref.current.scrollTo &&\n      !multiple &&\n      dropdownVisible &&\n      dropDownVisibleRef.current\n    ) {\n      const index = options.findIndex((it) => it[fieldNames.value] === activeValue)\n\n      if (index > 0 && !isNaN(index)) {\n        timer = window.setTimeout(() => {\n          ref.current.scrollTo((optionHeight || 36) * index)\n        }, 5)\n      }\n\n      dropDownVisibleRef.current = false\n    }\n\n    return () => {\n      if (timer) {\n        window.clearTimeout(timer)\n      }\n      timer = null\n    }\n  }, [multiple, activeValue, options, fieldNames, dropdownVisible, optionHeight])\n\n  // ============================ Option ============================\n  const optionInfoList = React.useMemo(\n    () =>\n      options.map((option) => {\n        const { disabled } = option\n        const searchOptions = option[SEARCH_MARK]\n        const label = option[FIX_LABEL] ?? option[fieldNames.label]\n        const value = option[fieldNames.value]\n\n        const isMergedLeaf = isLeaf(option, fieldNames)\n\n        // Get real value of option. Search option is different way.\n        const fullPath = searchOptions\n          ? // @ts-ignore\n            searchOptions.map((opt) => opt[fieldNames.value])\n          : [...prevValuePath, value]\n        const fullPathKey = toPathKey(fullPath)\n\n        const isLoading = loadingKeys.includes(fullPathKey)\n\n        // >>>>> checked\n        const checked = checkedSet.has(fullPathKey)\n\n        // >>>>> halfChecked\n        const halfChecked = halfCheckedSet.has(fullPathKey)\n\n        return {\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }\n      }),\n    [options, checkedSet, fieldNames, halfCheckedSet, loadingKeys, prevValuePath]\n  )\n  // ============================ Render ============================\n  return (\n    <ul className={menuPrefixCls} role=\"menu\" style={!isEmpty ? { height: listHeight + 'px' } : {}}>\n      <List\n        className={\n          optionInfoList[0].fullPathKey === '__EMPTY__' || !!searchValue\n            ? 'rc-virtual-list-full'\n            : ''\n        }\n        data={optionInfoList}\n        height={isEmpty ? 'auto' : listHeight}\n        itemHeight={optionHeight || 36}\n        itemKey=\"fullPathKey\"\n        ref={ref}\n      >\n        {({\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }) => {\n          // >>>>> Open\n          const triggerOpenPath = () => {\n            if (!disabled && (!hoverOpen || !isMergedLeaf)) {\n              onActive(fullPath)\n            }\n          }\n\n          // >>>>> Selection\n          const triggerSelect = () => {\n            if (isSelectable(option)) {\n              onSelect(fullPath, isMergedLeaf)\n            }\n          }\n\n          // >>>>> Title\n          let title: string\n          if (typeof option.title === 'string') {\n            title = option.title\n          } else if (typeof label === 'string') {\n            title = label\n          }\n          return (\n            <li\n              key={fullPathKey}\n              className={classNames(menuItemPrefixCls, {\n                [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,\n                [`${menuItemPrefixCls}-active`]: activeValue === value,\n                [`${menuItemPrefixCls}-disabled`]: disabled,\n                [`${menuItemPrefixCls}-loading`]: isLoading,\n              })}\n              style={dropdownMenuColumnStyle}\n              role=\"menuitemcheckbox\"\n              // @ts-ignore\n              title={title}\n              aria-checked={checked}\n              data-path-key={fullPathKey}\n              onClick={() => {\n                triggerOpenPath()\n                if (!multiple || isMergedLeaf) {\n                  triggerSelect()\n                }\n              }}\n              onDoubleClick={() => {\n                if (changeOnSelect) {\n                  onToggleOpen(false)\n                }\n              }}\n              onMouseEnter={() => {\n                if (hoverOpen) {\n                  triggerOpenPath()\n                }\n              }}\n              onMouseDown={(e) => {\n                // Prevent selector from blurring\n                e.preventDefault()\n              }}\n            >\n              {multiple && (\n                <Checkbox\n                  prefixCls={`${prefixCls}-checkbox`}\n                  checked={checked}\n                  halfChecked={halfChecked}\n                  disabled={disabled}\n                  onClick={(e: React.MouseEvent<HTMLSpanElement>) => {\n                    e.stopPropagation()\n                    triggerSelect()\n                  }}\n                />\n              )}\n              <div className={`${menuItemPrefixCls}-content`}>\n                {optionInfoList[0].fullPathKey !== '__EMPTY__' && renderItem\n                  ? renderItem(option, level)\n                  : label}\n              </div>\n              {!isLoading && expandIcon && !isMergedLeaf && (\n                <div className={`${menuItemPrefixCls}-expand-icon`}>{expandIcon}</div>\n              )}\n              {isLoading && loadingIcon && (\n                <div className={`${menuItemPrefixCls}-loading-icon`}>{loadingIcon}</div>\n              )}\n            </li>\n          )\n        }}\n      </List>\n    </ul>\n  )\n}\n"]}

package/es/tntd-cascader/rc-cascader/index.less

@@ -11,8 +11,8 @@
 
       .tntd-cascader-menu-item {
         display: flex;
-        line-height: 20px;
-        padding: 6px 12px;
+        line-height: 22px;
+        padding: 5px 12px;
         .tntd-cascader-menu-item-content {
           flex: 1;
           overflow: hidden;

package/lib/dropdown/style/index.less

@@ -161,6 +161,7 @@
         &-icon {
           color: @text-color-secondary;
           font-style: normal;
+          margin-right: 0 !important;
           .iconfont-size-under-12px(10px);
         }
       }

package/lib/tntd-cascader/rc-cascader/OptionList/Column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Column.d.ts","sourceRoot":"","sources":["../../../../src/tntd-cascader/rc-cascader/OptionList/Column.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAK9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAGrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,SAAS,2BAA2B,CAAA;AAEjD,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,iBAAiB,EAAE,CAAA;IAC5B,qCAAqC;IACrC,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAA;IACvB,2CAA2C;IAC3C,aAAa,EAAE,KAAK,CAAC,GAAG,EAAE,CAAA;IAC1B,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAC7D,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAA;IAC9C,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC1B,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC9B,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,CAAA;IACxB,YAAY,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAA;IACpD,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,KAAK,CAAC,SAAS,CAAA;IAClD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,SAAS,EACT,QAAQ,EACR,OAAO,EACP,WAAW,EACX,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,EACL,eAAe,EACf,YAAiB,EACjB,OAAO,EACP,UAAc,GACf,EAAE,WAAW,qBAsMb"}
+{"version":3,"file":"Column.d.ts","sourceRoot":"","sources":["../../../../src/tntd-cascader/rc-cascader/OptionList/Column.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAK9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAGrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,SAAS,2BAA2B,CAAA;AAEjD,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,iBAAiB,EAAE,CAAA;IAC5B,qCAAqC;IACrC,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAA;IACvB,2CAA2C;IAC3C,aAAa,EAAE,KAAK,CAAC,GAAG,EAAE,CAAA;IAC1B,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAC7D,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAA;IAC9C,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC1B,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC9B,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,CAAA;IACxB,YAAY,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAA;IACpD,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,KAAK,CAAC,SAAS,CAAA;IAClD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,SAAS,EACT,QAAQ,EACR,OAAO,EACP,WAAW,EACX,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,EACL,eAAe,EACf,YAAiB,EACjB,OAAO,EACP,UAAc,GACf,EAAE,WAAW,qBAsNb"}

package/lib/tntd-cascader/rc-cascader/OptionList/Column.js

@@ -129,6 +129,7 @@ function Column(_ref) {
     }
     return 180;
   }, [optionsNum, optionHeight]);
+  var dropDownVisibleRef = React.useRef(dropdownVisible);
   var _React$useContext = React.useContext(_context["default"]),
     fieldNames = _React$useContext.fieldNames,
     changeOnSelect = _React$useContext.changeOnSelect,
@@ -137,10 +138,14 @@ function Column(_ref) {
     loadingIcon = _React$useContext.loadingIcon,
     dropdownMenuColumnStyle = _React$useContext.dropdownMenuColumnStyle;
   var hoverOpen = expandTrigger === 'hover';
+  // 将drop展示赋值给ref
+  React.useEffect(function () {
+    dropDownVisibleRef.current = dropdownVisible;
+  }, [dropdownVisible]);
   /** 单选情况下滚动到相应的位置 */
   React.useEffect(function () {
     var timer = null;
-    if (ref.current && ref.current.scrollTo && !multiple && dropdownVisible) {
+    if (ref.current && ref.current.scrollTo && !multiple && dropdownVisible && dropDownVisibleRef.current) {
       var index = options.findIndex(function (it) {
         return it[fieldNames.value] === activeValue;
       });
@@ -149,6 +154,7 @@ function Column(_ref) {
           ref.current.scrollTo((optionHeight || 36) * index);
         }, 5);
       }
+      dropDownVisibleRef.current = false;
     }
     return function () {
       if (timer) {

package/lib/tntd-cascader/rc-cascader/OptionList/Column.js.map

@@ -1 +1 @@
-{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/rc-cascader/OptionList/Column.tsx"],"names":[],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport * as React from 'react'\nimport classNames from 'classnames'\nimport { isLeaf, toPathKey } from '../utils/commonUtil'\nimport CascaderContext from '../context'\nimport Checkbox from './Checkbox'\nimport type { DefaultOptionType, SingleValueType } from '../Cascader'\nimport { SEARCH_MARK } from '../hooks/useSearchOptions'\nimport List, { ListRef } from 'rc-virtual-list'\nimport type { RenderItem } from '../context'\n\nexport const FIX_LABEL = '__cascader_fix_label__'\n\nexport interface ColumnProps {\n  prefixCls: string\n  multiple?: boolean\n  options: DefaultOptionType[]\n  /** Current Column opened item key */\n  activeValue?: React.Key\n  /** The value path before current column */\n  prevValuePath: React.Key[]\n  onToggleOpen: (open: boolean) => void\n  onSelect: (valuePath: SingleValueType, leaf: boolean) => void\n  onActive: (valuePath: SingleValueType) => void\n  checkedSet: Set<React.Key>\n  halfCheckedSet: Set<React.Key>\n  loadingKeys: React.Key[]\n  isSelectable: (option: DefaultOptionType) => boolean\n  renderItem?: (item: RenderItem) => React.ReactNode\n  searchValue?: string\n  level?: number\n  dropdownVisible?: boolean\n  optionHeight?: number\n}\n\nexport default function Column({\n  prefixCls,\n  multiple,\n  options,\n  activeValue,\n  prevValuePath,\n  onToggleOpen,\n  onSelect,\n  onActive,\n  checkedSet,\n  halfCheckedSet,\n  loadingKeys,\n  isSelectable,\n  renderItem,\n  searchValue,\n  level,\n  dropdownVisible,\n  optionHeight = 32,\n  isEmpty,\n  optionsNum = 7,\n}: ColumnProps) {\n  const ref = React.useRef<ListRef>(null)\n  const menuPrefixCls = `${prefixCls}-menu ${prefixCls}-menu-${level}`\n  const menuItemPrefixCls = `${prefixCls}-menu-item`\n\n  const listHeight = React.useMemo(() => {\n    if (optionsNum) {\n      return Math.ceil((optionHeight || 36) * optionsNum) || 180\n    }\n    return 180\n  }, [optionsNum, optionHeight])\n\n  const {\n    fieldNames,\n    changeOnSelect,\n    expandTrigger,\n    expandIcon,\n    loadingIcon,\n    dropdownMenuColumnStyle,\n  } = React.useContext(CascaderContext)\n\n  const hoverOpen = expandTrigger === 'hover'\n\n  /** 单选情况下滚动到相应的位置 */\n  React.useEffect(() => {\n    let timer = null\n    if (ref.current && ref.current.scrollTo && !multiple && dropdownVisible) {\n      const index = options.findIndex((it) => it[fieldNames.value] === activeValue)\n\n      if (index > 0 && !isNaN(index)) {\n        timer = window.setTimeout(() => {\n          ref.current.scrollTo((optionHeight || 36) * index)\n        }, 5)\n      }\n    }\n\n    return () => {\n      if (timer) {\n        window.clearTimeout(timer)\n      }\n      timer = null\n    }\n  }, [multiple, activeValue, options, fieldNames, dropdownVisible, optionHeight])\n\n  // ============================ Option ============================\n  const optionInfoList = React.useMemo(\n    () =>\n      options.map((option) => {\n        const { disabled } = option\n        const searchOptions = option[SEARCH_MARK]\n        const label = option[FIX_LABEL] ?? option[fieldNames.label]\n        const value = option[fieldNames.value]\n\n        const isMergedLeaf = isLeaf(option, fieldNames)\n\n        // Get real value of option. Search option is different way.\n        const fullPath = searchOptions\n          ? // @ts-ignore\n            searchOptions.map((opt) => opt[fieldNames.value])\n          : [...prevValuePath, value]\n        const fullPathKey = toPathKey(fullPath)\n\n        const isLoading = loadingKeys.includes(fullPathKey)\n\n        // >>>>> checked\n        const checked = checkedSet.has(fullPathKey)\n\n        // >>>>> halfChecked\n        const halfChecked = halfCheckedSet.has(fullPathKey)\n\n        return {\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }\n      }),\n    [options, checkedSet, fieldNames, halfCheckedSet, loadingKeys, prevValuePath]\n  )\n  // ============================ Render ============================\n  return (\n    <ul className={menuPrefixCls} role=\"menu\" style={!isEmpty ? { height: listHeight + 'px' } : {}}>\n      <List\n        className={\n          optionInfoList[0].fullPathKey === '__EMPTY__' || !!searchValue\n            ? 'rc-virtual-list-full'\n            : ''\n        }\n        data={optionInfoList}\n        height={isEmpty ? 'auto' : listHeight}\n        itemHeight={optionHeight || 36}\n        itemKey=\"fullPathKey\"\n        ref={ref}\n      >\n        {({\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }) => {\n          // >>>>> Open\n          const triggerOpenPath = () => {\n            if (!disabled && (!hoverOpen || !isMergedLeaf)) {\n              onActive(fullPath)\n            }\n          }\n\n          // >>>>> Selection\n          const triggerSelect = () => {\n            if (isSelectable(option)) {\n              onSelect(fullPath, isMergedLeaf)\n            }\n          }\n\n          // >>>>> Title\n          let title: string\n          if (typeof option.title === 'string') {\n            title = option.title\n          } else if (typeof label === 'string') {\n            title = label\n          }\n          return (\n            <li\n              key={fullPathKey}\n              className={classNames(menuItemPrefixCls, {\n                [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,\n                [`${menuItemPrefixCls}-active`]: activeValue === value,\n                [`${menuItemPrefixCls}-disabled`]: disabled,\n                [`${menuItemPrefixCls}-loading`]: isLoading,\n              })}\n              style={dropdownMenuColumnStyle}\n              role=\"menuitemcheckbox\"\n              // @ts-ignore\n              title={title}\n              aria-checked={checked}\n              data-path-key={fullPathKey}\n              onClick={() => {\n                triggerOpenPath()\n                if (!multiple || isMergedLeaf) {\n                  triggerSelect()\n                }\n              }}\n              onDoubleClick={() => {\n                if (changeOnSelect) {\n                  onToggleOpen(false)\n                }\n              }}\n              onMouseEnter={() => {\n                if (hoverOpen) {\n                  triggerOpenPath()\n                }\n              }}\n              onMouseDown={(e) => {\n                // Prevent selector from blurring\n                e.preventDefault()\n              }}\n            >\n              {multiple && (\n                <Checkbox\n                  prefixCls={`${prefixCls}-checkbox`}\n                  checked={checked}\n                  halfChecked={halfChecked}\n                  disabled={disabled}\n                  onClick={(e: React.MouseEvent<HTMLSpanElement>) => {\n                    e.stopPropagation()\n                    triggerSelect()\n                  }}\n                />\n              )}\n              <div className={`${menuItemPrefixCls}-content`}>\n                {optionInfoList[0].fullPathKey !== '__EMPTY__' && renderItem\n                  ? renderItem(option, level)\n                  : label}\n              </div>\n              {!isLoading && expandIcon && !isMergedLeaf && (\n                <div className={`${menuItemPrefixCls}-expand-icon`}>{expandIcon}</div>\n              )}\n              {isLoading && loadingIcon && (\n                <div className={`${menuItemPrefixCls}-loading-icon`}>{loadingIcon}</div>\n              )}\n            </li>\n          )\n        }}\n      </List>\n    </ul>\n  )\n}\n"]}
+{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/rc-cascader/OptionList/Column.tsx"],"names":[],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport * as React from 'react'\nimport classNames from 'classnames'\nimport { isLeaf, toPathKey } from '../utils/commonUtil'\nimport CascaderContext from '../context'\nimport Checkbox from './Checkbox'\nimport type { DefaultOptionType, SingleValueType } from '../Cascader'\nimport { SEARCH_MARK } from '../hooks/useSearchOptions'\nimport List, { ListRef } from 'rc-virtual-list'\nimport type { RenderItem } from '../context'\n\nexport const FIX_LABEL = '__cascader_fix_label__'\n\nexport interface ColumnProps {\n  prefixCls: string\n  multiple?: boolean\n  options: DefaultOptionType[]\n  /** Current Column opened item key */\n  activeValue?: React.Key\n  /** The value path before current column */\n  prevValuePath: React.Key[]\n  onToggleOpen: (open: boolean) => void\n  onSelect: (valuePath: SingleValueType, leaf: boolean) => void\n  onActive: (valuePath: SingleValueType) => void\n  checkedSet: Set<React.Key>\n  halfCheckedSet: Set<React.Key>\n  loadingKeys: React.Key[]\n  isSelectable: (option: DefaultOptionType) => boolean\n  renderItem?: (item: RenderItem) => React.ReactNode\n  searchValue?: string\n  level?: number\n  dropdownVisible?: boolean\n  optionHeight?: number\n}\n\nexport default function Column({\n  prefixCls,\n  multiple,\n  options,\n  activeValue,\n  prevValuePath,\n  onToggleOpen,\n  onSelect,\n  onActive,\n  checkedSet,\n  halfCheckedSet,\n  loadingKeys,\n  isSelectable,\n  renderItem,\n  searchValue,\n  level,\n  dropdownVisible,\n  optionHeight = 32,\n  isEmpty,\n  optionsNum = 7,\n}: ColumnProps) {\n  const ref = React.useRef<ListRef>(null)\n  const menuPrefixCls = `${prefixCls}-menu ${prefixCls}-menu-${level}`\n  const menuItemPrefixCls = `${prefixCls}-menu-item`\n\n  const listHeight = React.useMemo(() => {\n    if (optionsNum) {\n      return Math.ceil((optionHeight || 36) * optionsNum) || 180\n    }\n    return 180\n  }, [optionsNum, optionHeight])\n\n  const dropDownVisibleRef = React.useRef(dropdownVisible)\n\n  const {\n    fieldNames,\n    changeOnSelect,\n    expandTrigger,\n    expandIcon,\n    loadingIcon,\n    dropdownMenuColumnStyle,\n  } = React.useContext(CascaderContext)\n\n  const hoverOpen = expandTrigger === 'hover'\n\n  // 将drop展示赋值给ref\n  React.useEffect(() => {\n    dropDownVisibleRef.current = dropdownVisible\n  }, [dropdownVisible])\n\n  /** 单选情况下滚动到相应的位置 */\n  React.useEffect(() => {\n    let timer = null\n\n    if (\n      ref.current &&\n      ref.current.scrollTo &&\n      !multiple &&\n      dropdownVisible &&\n      dropDownVisibleRef.current\n    ) {\n      const index = options.findIndex((it) => it[fieldNames.value] === activeValue)\n\n      if (index > 0 && !isNaN(index)) {\n        timer = window.setTimeout(() => {\n          ref.current.scrollTo((optionHeight || 36) * index)\n        }, 5)\n      }\n\n      dropDownVisibleRef.current = false\n    }\n\n    return () => {\n      if (timer) {\n        window.clearTimeout(timer)\n      }\n      timer = null\n    }\n  }, [multiple, activeValue, options, fieldNames, dropdownVisible, optionHeight])\n\n  // ============================ Option ============================\n  const optionInfoList = React.useMemo(\n    () =>\n      options.map((option) => {\n        const { disabled } = option\n        const searchOptions = option[SEARCH_MARK]\n        const label = option[FIX_LABEL] ?? option[fieldNames.label]\n        const value = option[fieldNames.value]\n\n        const isMergedLeaf = isLeaf(option, fieldNames)\n\n        // Get real value of option. Search option is different way.\n        const fullPath = searchOptions\n          ? // @ts-ignore\n            searchOptions.map((opt) => opt[fieldNames.value])\n          : [...prevValuePath, value]\n        const fullPathKey = toPathKey(fullPath)\n\n        const isLoading = loadingKeys.includes(fullPathKey)\n\n        // >>>>> checked\n        const checked = checkedSet.has(fullPathKey)\n\n        // >>>>> halfChecked\n        const halfChecked = halfCheckedSet.has(fullPathKey)\n\n        return {\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }\n      }),\n    [options, checkedSet, fieldNames, halfCheckedSet, loadingKeys, prevValuePath]\n  )\n  // ============================ Render ============================\n  return (\n    <ul className={menuPrefixCls} role=\"menu\" style={!isEmpty ? { height: listHeight + 'px' } : {}}>\n      <List\n        className={\n          optionInfoList[0].fullPathKey === '__EMPTY__' || !!searchValue\n            ? 'rc-virtual-list-full'\n            : ''\n        }\n        data={optionInfoList}\n        height={isEmpty ? 'auto' : listHeight}\n        itemHeight={optionHeight || 36}\n        itemKey=\"fullPathKey\"\n        ref={ref}\n      >\n        {({\n          disabled,\n          label,\n          value,\n          isLeaf: isMergedLeaf,\n          isLoading,\n          checked,\n          halfChecked,\n          option,\n          fullPath,\n          fullPathKey,\n        }) => {\n          // >>>>> Open\n          const triggerOpenPath = () => {\n            if (!disabled && (!hoverOpen || !isMergedLeaf)) {\n              onActive(fullPath)\n            }\n          }\n\n          // >>>>> Selection\n          const triggerSelect = () => {\n            if (isSelectable(option)) {\n              onSelect(fullPath, isMergedLeaf)\n            }\n          }\n\n          // >>>>> Title\n          let title: string\n          if (typeof option.title === 'string') {\n            title = option.title\n          } else if (typeof label === 'string') {\n            title = label\n          }\n          return (\n            <li\n              key={fullPathKey}\n              className={classNames(menuItemPrefixCls, {\n                [`${menuItemPrefixCls}-expand`]: !isMergedLeaf,\n                [`${menuItemPrefixCls}-active`]: activeValue === value,\n                [`${menuItemPrefixCls}-disabled`]: disabled,\n                [`${menuItemPrefixCls}-loading`]: isLoading,\n              })}\n              style={dropdownMenuColumnStyle}\n              role=\"menuitemcheckbox\"\n              // @ts-ignore\n              title={title}\n              aria-checked={checked}\n              data-path-key={fullPathKey}\n              onClick={() => {\n                triggerOpenPath()\n                if (!multiple || isMergedLeaf) {\n                  triggerSelect()\n                }\n              }}\n              onDoubleClick={() => {\n                if (changeOnSelect) {\n                  onToggleOpen(false)\n                }\n              }}\n              onMouseEnter={() => {\n                if (hoverOpen) {\n                  triggerOpenPath()\n                }\n              }}\n              onMouseDown={(e) => {\n                // Prevent selector from blurring\n                e.preventDefault()\n              }}\n            >\n              {multiple && (\n                <Checkbox\n                  prefixCls={`${prefixCls}-checkbox`}\n                  checked={checked}\n                  halfChecked={halfChecked}\n                  disabled={disabled}\n                  onClick={(e: React.MouseEvent<HTMLSpanElement>) => {\n                    e.stopPropagation()\n                    triggerSelect()\n                  }}\n                />\n              )}\n              <div className={`${menuItemPrefixCls}-content`}>\n                {optionInfoList[0].fullPathKey !== '__EMPTY__' && renderItem\n                  ? renderItem(option, level)\n                  : label}\n              </div>\n              {!isLoading && expandIcon && !isMergedLeaf && (\n                <div className={`${menuItemPrefixCls}-expand-icon`}>{expandIcon}</div>\n              )}\n              {isLoading && loadingIcon && (\n                <div className={`${menuItemPrefixCls}-loading-icon`}>{loadingIcon}</div>\n              )}\n            </li>\n          )\n        }}\n      </List>\n    </ul>\n  )\n}\n"]}

package/lib/tntd-cascader/rc-cascader/index.less

@@ -11,8 +11,8 @@
 
       .tntd-cascader-menu-item {
         display: flex;
-        line-height: 20px;
-        padding: 6px 12px;
+        line-height: 22px;
+        padding: 5px 12px;
         .tntd-cascader-menu-item-content {
           flex: 1;
           overflow: hidden;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "3.0.40",
+    "version": "3.0.41",
     "license": "MIT",
     "scripts": {
         "start": "heft start --storybook",

package/es/checkbox/checkbox-group.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-require("react");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
-var _connect = require("../connect");
-var _previewText = require("../preview-text");
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
-var _default = exports["default"] = (0, _connect.connectReadonlyComponent)(_checkbox["default"].Group, _previewText.PreviewText.Select);

package/es/checkbox/checkbox-group.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"checkbox-group.js","sourceRoot":"","sources":["../../src/checkbox/checkbox-group.tsx"],"names":[],"mappings":"AAAA,OAAkC,OAAO,CAAA;AACzC,OAAO,QAAQ,MAAM,kBAAkB,CAAA;AAEvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAM7C,eAAe,wBAAwB,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA","sourcesContent":["import React, { forwardRef } from 'react'\nimport Checkbox from 'antd/es/checkbox'\nimport type { CheckboxGroupProps as AntdCheckboxGroupProps } from 'antd/es/checkbox/Group'\nimport { connectReadonlyComponent } from '../connect'\nimport { PreviewText } from '../preview-text'\n\nexport type CheckboxGroupProps = AntdCheckboxGroupProps & {\n  readonly?: boolean\n}\n\nexport default connectReadonlyComponent(Checkbox.Group, PreviewText.Select)\n"]}