@chaoswise/ui 3.0.22 → 3.1.0

package/lib/Antd5/typography/Base/CopyBtn.js

@@ -8,36 +8,36 @@ import CheckOutlined from '@ant-design/icons/CheckOutlined';
 import CopyOutlined from '@ant-design/icons/CopyOutlined';
 import LoadingOutlined from '@ant-design/icons/LoadingOutlined';
 import classNames from 'classnames';
-import TransButton from '../../_util/transButton';
 import Tooltip from '../../tooltip';
 import { getNode, toList } from './util';
-var CopyBtn = function CopyBtn(props) {
-  var prefixCls = props.prefixCls,
-    copied = props.copied,
-    locale = props.locale,
-    iconOnly = props.iconOnly,
-    tooltips = props.tooltips,
-    icon = props.icon,
-    btnLoading = props.loading,
-    tabIndex = props.tabIndex,
-    onCopy = props.onCopy;
+var CopyBtn = function CopyBtn(_ref) {
+  var prefixCls = _ref.prefixCls,
+    copied = _ref.copied,
+    locale = _ref.locale,
+    iconOnly = _ref.iconOnly,
+    tooltips = _ref.tooltips,
+    icon = _ref.icon,
+    tabIndex = _ref.tabIndex,
+    onCopy = _ref.onCopy,
+    btnLoading = _ref.loading;
   var tooltipNodes = toList(tooltips);
   var iconNodes = toList(icon);
-  var _ref = locale !== null && locale !== void 0 ? locale : {},
-    copiedText = _ref.copied,
-    copyText = _ref.copy;
-  var copyTitle = copied ? getNode(tooltipNodes[1], copiedText) : getNode(tooltipNodes[0], copyText);
+  var _ref2 = locale !== null && locale !== void 0 ? locale : {},
+    copiedText = _ref2.copied,
+    copyText = _ref2.copy;
   var systemStr = copied ? copiedText : copyText;
+  var copyTitle = getNode(tooltipNodes[copied ? 1 : 0], systemStr);
   var ariaLabel = typeof copyTitle === 'string' ? copyTitle : systemStr;
   return _jsx(Tooltip, {
     title: copyTitle,
-    children: _jsx(TransButton, {
+    children: _jsx("button", {
+      type: "button",
       className: classNames("".concat(prefixCls, "-copy"), _defineProperty(_defineProperty({}, "".concat(prefixCls, "-copy-success"), copied), "".concat(prefixCls, "-copy-icon-only"), iconOnly)),
       onClick: onCopy,
       "aria-label": ariaLabel,
       tabIndex: tabIndex,
       children: copied ? getNode(iconNodes[1], _jsx(CheckOutlined, {}), true) : getNode(iconNodes[0], btnLoading ? _jsx(LoadingOutlined, {}) : _jsx(CopyOutlined, {}), true)
     })
-  }, "copy");
+  });
 };
 export default CopyBtn;

package/lib/Antd5/typography/Base/Ellipsis.js

@@ -1,3 +1,4 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -8,7 +9,6 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -18,6 +18,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import * as React from 'react';
 import toArray from 'rc-util/lib/Children/toArray';
 import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
+import { isValidText } from './util';
 var MeasureText = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var style = _ref.style,
     children = _ref.children;
@@ -47,21 +48,11 @@ var MeasureText = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     children: children
   });
 });
-function cuttable(node) {
-  var type = _typeof(node);
-  return type === 'string' || type === 'number';
-}
-function getNodesLen(nodeList) {
-  var totalLen = 0;
-  nodeList.forEach(function (node) {
-    if (cuttable(node)) {
-      totalLen += String(node).length;
-    } else {
-      totalLen += 1;
-    }
-  });
-  return totalLen;
-}
+var getNodesLen = function getNodesLen(nodeList) {
+  return nodeList.reduce(function (totalLen, node) {
+    return totalLen + (isValidText(node) ? String(node).length : 1);
+  }, 0);
+};
 function sliceNodes(nodeList, len) {
   var currLen = 0;
   var currentNodeList = [];
@@ -71,7 +62,7 @@ function sliceNodes(nodeList, len) {
       return currentNodeList;
     }
     var node = nodeList[i];
-    var canCut = cuttable(node);
+    var canCut = isValidText(node);
     var nodeLen = canCut ? String(node).length : 1;
     var nextLen = currLen + nodeLen;
     // Exceed but current not which means we need cut this
@@ -88,9 +79,10 @@ function sliceNodes(nodeList, len) {
 }
 // Measure for the `text` is exceed the `rows` or not
 var STATUS_MEASURE_NONE = 0;
-var STATUS_MEASURE_START = 1;
-var STATUS_MEASURE_NEED_ELLIPSIS = 2;
-var STATUS_MEASURE_NO_NEED_ELLIPSIS = 3;
+var STATUS_MEASURE_PREPARE = 1;
+var STATUS_MEASURE_START = 2;
+var STATUS_MEASURE_NEED_ELLIPSIS = 3;
+var STATUS_MEASURE_NO_NEED_ELLIPSIS = 4;
 var lineClipStyle = {
   display: '-webkit-box',
   overflow: 'hidden',
@@ -123,6 +115,7 @@ export default function EllipsisMeasure(props) {
     setEllipsisCutIndex = _React$useState2[1];
   var cutMidRef = React.useRef(null);
   // ========================= NeedEllipsis =========================
+  var measureWhiteSpaceRef = React.useRef(null);
   var needEllipsisRef = React.useRef(null);
   // Measure for `rows-1` height, to avoid operation exceed the line height
   var descRowsEllipsisRef = React.useRef(null);
@@ -139,17 +132,26 @@ export default function EllipsisMeasure(props) {
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     ellipsisHeight = _React$useState8[0],
     setEllipsisHeight = _React$useState8[1];
+  var _React$useState9 = React.useState(null),
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    parentWhiteSpace = _React$useState10[0],
+    setParentWhiteSpace = _React$useState10[1];
   // Trigger start measure
   useLayoutEffect(function () {
     if (enableMeasure && width && nodeLen) {
-      setNeedEllipsis(STATUS_MEASURE_START);
+      setNeedEllipsis(STATUS_MEASURE_PREPARE);
     } else {
       setNeedEllipsis(STATUS_MEASURE_NONE);
     }
   }, [width, text, rows, enableMeasure, nodeList]);
   // Measure process
   useLayoutEffect(function () {
-    if (needEllipsis === STATUS_MEASURE_START) {
+    if (needEllipsis === STATUS_MEASURE_PREPARE) {
+      setNeedEllipsis(STATUS_MEASURE_START);
+      // Parent ref `white-space`
+      var nextWhiteSpace = measureWhiteSpaceRef.current && getComputedStyle(measureWhiteSpaceRef.current).whiteSpace;
+      setParentWhiteSpace(nextWhiteSpace);
+    } else if (needEllipsis === STATUS_MEASURE_START) {
       var _needEllipsisRef$curr, _needEllipsisRef$curr2, _descRowsEllipsisRef$, _symbolRowEllipsisRef;
       var isOverflow = !!((_needEllipsisRef$curr = needEllipsisRef.current) !== null && _needEllipsisRef$curr !== void 0 && _needEllipsisRef$curr.isExceed());
       setNeedEllipsis(isOverflow ? STATUS_MEASURE_NEED_ELLIPSIS : STATUS_MEASURE_NO_NEED_ELLIPSIS);
@@ -160,8 +162,9 @@ export default function EllipsisMeasure(props) {
       // Get the height of `rows - 1` + symbol height
       var descRowsEllipsisHeight = rows === 1 ? 0 : ((_descRowsEllipsisRef$ = descRowsEllipsisRef.current) === null || _descRowsEllipsisRef$ === void 0 ? void 0 : _descRowsEllipsisRef$.getHeight()) || 0;
       var symbolRowEllipsisHeight = ((_symbolRowEllipsisRef = symbolRowEllipsisRef.current) === null || _symbolRowEllipsisRef === void 0 ? void 0 : _symbolRowEllipsisRef.getHeight()) || 0;
-      var rowsWithEllipsisHeight = descRowsEllipsisHeight + symbolRowEllipsisHeight;
-      var maxRowsHeight = Math.max(baseRowsEllipsisHeight, rowsWithEllipsisHeight);
+      var maxRowsHeight = Math.max(baseRowsEllipsisHeight,
+      // height of rows with ellipsis
+      descRowsEllipsisHeight + symbolRowEllipsisHeight);
       setEllipsisHeight(maxRowsHeight + 1);
       onEllipsis(isOverflow);
     }
@@ -181,37 +184,37 @@ export default function EllipsisMeasure(props) {
       if (maxIndex - minIndex === 1) {
         targetMidIndex = isOverflow ? minIndex : maxIndex;
       }
-      if (isOverflow) {
-        setEllipsisCutIndex([minIndex, targetMidIndex]);
-      } else {
-        setEllipsisCutIndex([targetMidIndex, maxIndex]);
-      }
+      setEllipsisCutIndex(isOverflow ? [minIndex, targetMidIndex] : [targetMidIndex, maxIndex]);
     }
   }, [ellipsisCutIndex, cutMidIndex]);
   // ========================= Text Content =========================
   var finalContent = React.useMemo(function () {
+    // Skip everything if `enableMeasure` is disabled
+    if (!enableMeasure) {
+      return children(nodeList, false);
+    }
     if (needEllipsis !== STATUS_MEASURE_NEED_ELLIPSIS || !ellipsisCutIndex || ellipsisCutIndex[0] !== ellipsisCutIndex[1]) {
       var content = children(nodeList, false);
-      // Limit the max line count to avoid scrollbar blink
+      // Limit the max line count to avoid scrollbar blink unless no need ellipsis
       // https://github.com/ant-design/ant-design/issues/42958
-      if (needEllipsis !== STATUS_MEASURE_NO_NEED_ELLIPSIS && needEllipsis !== STATUS_MEASURE_NONE) {
-        return _jsx("span", {
-          style: _objectSpread(_objectSpread({}, lineClipStyle), {}, {
-            WebkitLineClamp: rows
-          }),
-          children: content
-        });
+      if ([STATUS_MEASURE_NO_NEED_ELLIPSIS, STATUS_MEASURE_NONE].includes(needEllipsis)) {
+        return content;
       }
-      return content;
+      return _jsx("span", {
+        style: _objectSpread(_objectSpread({}, lineClipStyle), {}, {
+          WebkitLineClamp: rows
+        }),
+        children: content
+      });
     }
     return children(expanded ? nodeList : sliceNodes(nodeList, ellipsisCutIndex[0]), canEllipsis);
   }, [expanded, needEllipsis, ellipsisCutIndex, nodeList].concat(_toConsumableArray(miscDeps)));
   // ============================ Render ============================
   var measureStyle = {
     width: width,
-    whiteSpace: 'normal',
     margin: 0,
-    padding: 0
+    padding: 0,
+    whiteSpace: parentWhiteSpace === 'nowrap' ? 'normal' : 'inherit'
   };
   return _jsxs(_Fragment, {
     children: [finalContent, needEllipsis === STATUS_MEASURE_START && _jsxs(_Fragment, {
@@ -240,6 +243,11 @@ export default function EllipsisMeasure(props) {
       }),
       ref: cutMidRef,
       children: children(sliceNodes(nodeList, cutMidIndex), true)
+    }), needEllipsis === STATUS_MEASURE_PREPARE && _jsx("span", {
+      style: {
+        whiteSpace: 'inherit'
+      },
+      ref: measureWhiteSpaceRef
     })]
   });
 }

package/lib/Antd5/typography/Base/index.js

@@ -1,10 +1,10 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["prefixCls", "className", "style", "type", "disabled", "children", "ellipsis", "editable", "copyable", "component", "title"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -19,24 +19,24 @@ import EditOutlined from '@ant-design/icons/EditOutlined';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
 import toArray from 'rc-util/lib/Children/toArray';
-import useIsomorphicLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
+import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
 import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import omit from 'rc-util/lib/omit';
 import { composeRef } from 'rc-util/lib/ref';
 import { isStyleSupport } from '../../_util/styleChecker';
-import TransButton from '../../_util/transButton';
 import { ConfigContext } from '../../config-provider';
 import useLocale from '../../locale/useLocale';
 import Tooltip from '../../tooltip';
 import Editable from '../Editable';
 import useCopyClick from '../hooks/useCopyClick';
 import useMergedConfig from '../hooks/useMergedConfig';
-import useUpdatedEffect from '../hooks/useUpdatedEffect';
 import usePrevious from '../hooks/usePrevious';
+import useTooltipProps from '../hooks/useTooltipProps';
 import Typography from '../Typography';
 import CopyBtn from './CopyBtn';
 import Ellipsis from './Ellipsis';
 import EllipsisTooltip from './EllipsisTooltip';
+import { isEleEllipsis, isValidText } from './util';
 function wrapperDecorations(_ref, content) {
   var mark = _ref.mark,
     code = _ref.code,
@@ -108,7 +108,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   // Focus edit icon when back
   var prevEditing = usePrevious(editing);
-  useUpdatedEffect(function () {
+  useLayoutEffect(function () {
     if (!editing && prevEditing) {
       var _editIconRef$current;
       (_editIconRef$current = editIconRef.current) === null || _editIconRef$current === void 0 || _editIconRef$current.focus();
@@ -190,7 +190,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
       ellipsisConfig.expandable || enableEdit || enableCopy)
     );
   }, [mergedEnableEllipsis, ellipsisConfig, enableEdit, enableCopy]);
-  useIsomorphicLayoutEffect(function () {
+  useLayoutEffect(function () {
     if (enableEllipsis && !needMeasureEllipsis) {
       setIsLineClampSupport(isStyleSupport('webkitLineClamp'));
       setIsTextOverflowSupport(isStyleSupport('textOverflow'));
@@ -211,7 +211,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, [needMeasureEllipsis, isTextOverflowSupport, isLineClampSupport]);
   // We use effect to change from css ellipsis to js ellipsis.
   // To make SSR still can see the ellipsis.
-  useIsomorphicLayoutEffect(function () {
+  useLayoutEffect(function () {
     setCssEllipsis(canUseCssEllipsis && mergedEnableEllipsis);
   }, [canUseCssEllipsis, mergedEnableEllipsis]);
   var isMergedEllipsis = mergedEnableEllipsis && (cssEllipsis ? isNativeEllipsis : isJsEllipsis);
@@ -244,7 +244,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
   React.useEffect(function () {
     var textEle = typographyRef.current;
     if (enableEllipsis && cssEllipsis && textEle) {
-      var currentEllipsis = cssLineClamp ? textEle.offsetHeight < textEle.scrollHeight : textEle.offsetWidth < textEle.scrollWidth;
+      var currentEllipsis = isEleEllipsis(textEle);
       if (isNativeEllipsis !== currentEllipsis) {
         setIsNativeEllipsis(currentEllipsis);
       }
@@ -267,53 +267,19 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
     };
   }, [cssEllipsis, mergedEnableEllipsis]);
   // ========================== Tooltip ===========================
-  var tooltipProps = {};
-  if (ellipsisConfig.tooltip === true) {
-    var _editConfig$text;
-    tooltipProps = {
-      title: (_editConfig$text = editConfig.text) !== null && _editConfig$text !== void 0 ? _editConfig$text : _children
-    };
-  } else if (/*#__PURE__*/React.isValidElement(ellipsisConfig.tooltip)) {
-    tooltipProps = {
-      title: ellipsisConfig.tooltip
-    };
-  } else if (_typeof(ellipsisConfig.tooltip) === 'object') {
-    var _editConfig$text2;
-    tooltipProps = _objectSpread({
-      title: (_editConfig$text2 = editConfig.text) !== null && _editConfig$text2 !== void 0 ? _editConfig$text2 : _children
-    }, ellipsisConfig.tooltip);
-  } else {
-    tooltipProps = {
-      title: ellipsisConfig.tooltip
-    };
-  }
+  var tooltipProps = useTooltipProps(ellipsisConfig.tooltip, editConfig.text, _children);
   var topAriaLabel = React.useMemo(function () {
-    var isValid = function isValid(val) {
-      return ['string', 'number'].includes(_typeof(val));
-    };
     if (!enableEllipsis || cssEllipsis) {
       return undefined;
     }
-    if (isValid(editConfig.text)) {
-      return editConfig.text;
-    }
-    if (isValid(_children)) {
-      return _children;
-    }
-    if (isValid(title)) {
-      return title;
-    }
-    if (isValid(tooltipProps.title)) {
-      return tooltipProps.title;
-    }
-    return undefined;
+    return [editConfig.text, _children, title, tooltipProps.title].find(isValidText);
   }, [enableEllipsis, cssEllipsis, title, tooltipProps.title, isMergedEllipsis]);
   // =========================== Render ===========================
   // >>>>>>>>>>> Editing input
   if (editing) {
-    var _editConfig$text3;
+    var _editConfig$text;
     return _jsx(Editable, {
-      value: (_editConfig$text3 = editConfig.text) !== null && _editConfig$text3 !== void 0 ? _editConfig$text3 : typeof _children === 'string' ? _children : '',
+      value: (_editConfig$text = editConfig.text) !== null && _editConfig$text !== void 0 ? _editConfig$text : typeof _children === 'string' ? _children : '',
       onSave: onEditChange,
       onCancel: onEditCancel,
       onEnd: editConfig.onEnd,
@@ -332,13 +298,8 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var renderExpand = function renderExpand() {
     var expandable = ellipsisConfig.expandable,
       symbol = ellipsisConfig.symbol;
-    if (!expandable) {
-      return null;
-    }
-    if (expanded && expandable !== 'collapsible') {
-      return null;
-    }
-    return _jsx("a", {
+    return expandable ? _jsx("button", {
+      type: "button",
       className: "".concat(prefixCls, "-").concat(expanded ? 'collapse' : 'expand'),
       onClick: function onClick(e) {
         return onExpandClick(e, {
@@ -347,7 +308,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
       },
       "aria-label": expanded ? textLocale.collapse : textLocale === null || textLocale === void 0 ? void 0 : textLocale.expand,
       children: typeof symbol === 'function' ? symbol(expanded) : symbol
-    }, "expand");
+    }, "expand") : null;
   };
   // Edit
   var renderEdit = function renderEdit() {
@@ -361,7 +322,8 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var ariaLabel = typeof editTitle === 'string' ? editTitle : '';
     return triggerType.includes('icon') ? _jsx(Tooltip, {
       title: tooltip === false ? '' : editTitle,
-      children: _jsx(TransButton, {
+      children: _jsx("button", {
+        type: "button",
         ref: editIconRef,
         className: "".concat(prefixCls, "-edit"),
         onClick: onEditClick,
@@ -388,9 +350,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }), "copy");
   };
   var renderOperations = function renderOperations(canEllipsis) {
-    return [
-    // (renderExpanded || ellipsisConfig.collapsible) && renderExpand(),
-    canEllipsis && renderExpand(), renderEdit(), renderCopy()];
+    return [canEllipsis && renderExpand(), renderEdit(), renderCopy()];
   };
   var renderEllipsis = function renderEllipsis(canEllipsis) {
     return [canEllipsis && !expanded && _jsx("span", {
@@ -407,7 +367,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
         enableEllipsis: mergedEnableEllipsis,
         isEllipsis: isMergedEllipsis,
         children: _jsx(Typography, _objectSpread(_objectSpread({
-          className: classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-").concat(type), type), "".concat(prefixCls, "-disabled"), disabled), "".concat(prefixCls, "-ellipsis"), enableEllipsis), "".concat(prefixCls, "-single-line"), mergedEnableEllipsis && rows === 1 && !expanded), "".concat(prefixCls, "-ellipsis-single-line"), cssTextOverflow), "".concat(prefixCls, "-ellipsis-multiple-line"), cssLineClamp), className),
+          className: classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-").concat(type), type), "".concat(prefixCls, "-disabled"), disabled), "".concat(prefixCls, "-ellipsis"), enableEllipsis), "".concat(prefixCls, "-ellipsis-single-line"), cssTextOverflow), "".concat(prefixCls, "-ellipsis-multiple-line"), cssLineClamp), className),
           prefixCls: customizePrefixCls,
           style: _objectSpread(_objectSpread({}, style), {}, {
             WebkitLineClamp: cssLineClamp ? rows : undefined
@@ -426,7 +386,7 @@ var Base = /*#__PURE__*/React.forwardRef(function (props, ref) {
             width: ellipsisWidth,
             onEllipsis: onJsEllipsis,
             expanded: expanded,
-            miscDeps: [copied, expanded, copyLoading, enableEdit, enableCopy],
+            miscDeps: [copied, expanded, copyLoading, enableEdit, enableCopy, textLocale],
             children: function children(node, canEllipsis) {
               return wrapperDecorations(props, _jsxs(_Fragment, {
                 children: [node.length > 0 && canEllipsis && !expanded && topAriaLabel ? _jsx("span", {

package/lib/Antd5/typography/Base/util.js

@@ -1,3 +1,4 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 export function toList(val) {
   if (val === false) {
     return [false, false];
@@ -9,4 +10,33 @@ export function getNode(dom, defaultNode, needDom) {
     return defaultNode;
   }
   return dom || needDom && defaultNode;
-}
+}
+/**
+ * Check for element is native ellipsis
+ * ref:
+ * - https://github.com/ant-design/ant-design/issues/50143
+ * - https://github.com/ant-design/ant-design/issues/50414
+ */
+export function isEleEllipsis(ele) {
+  // Create a new div to get the size
+  var childDiv = document.createElement('em');
+  ele.appendChild(childDiv);
+  // For test case
+  if (process.env.NODE_ENV !== 'production') {
+    childDiv.className = 'ant-typography-css-ellipsis-content-measure';
+  }
+  var rect = ele.getBoundingClientRect();
+  var childRect = childDiv.getBoundingClientRect();
+  // Reset
+  ele.removeChild(childDiv);
+  // Range checker
+  return (
+    // Horizontal out of range
+    rect.left > childRect.left || childRect.right > rect.right ||
+    // Vertical out of range
+    rect.top > childRect.top || childRect.bottom > rect.bottom
+  );
+}
+export var isValidText = function isValidText(val) {
+  return ['string', 'number'].includes(_typeof(val));
+};

package/lib/Antd5/typography/Editable.js

@@ -43,7 +43,8 @@ var Editable = function Editable(props) {
     setCurrent(value);
   }, [value]);
   React.useEffect(function () {
-    if (ref.current && ref.current.resizableTextArea) {
+    var _ref$current;
+    if ((_ref$current = ref.current) !== null && _ref$current !== void 0 && _ref$current.resizableTextArea) {
       var textArea = ref.current.resizableTextArea.textArea;
       textArea.focus();
       var length = textArea.value.length;
@@ -76,25 +77,25 @@ var Editable = function Editable(props) {
       metaKey = _ref3.metaKey,
       shiftKey = _ref3.shiftKey;
     // Check if it's a real key
-    if (lastKeyCode.current === keyCode && !inComposition.current && !ctrlKey && !altKey && !metaKey && !shiftKey) {
-      if (keyCode === KeyCode.ENTER) {
-        confirmChange();
-        onEnd === null || onEnd === void 0 || onEnd();
-      } else if (keyCode === KeyCode.ESC) {
-        onCancel();
-      }
+    if (lastKeyCode.current !== keyCode || inComposition.current || ctrlKey || altKey || metaKey || shiftKey) {
+      return;
+    }
+    if (keyCode === KeyCode.ENTER) {
+      confirmChange();
+      onEnd === null || onEnd === void 0 || onEnd();
+    } else if (keyCode === KeyCode.ESC) {
+      onCancel();
     }
   };
   var onBlur = function onBlur() {
     confirmChange();
   };
-  var textClassName = component ? "".concat(prefixCls, "-").concat(component) : '';
   var _useStyle = useStyle(prefixCls),
     _useStyle2 = _slicedToArray(_useStyle, 3),
     wrapCSSVar = _useStyle2[0],
     hashId = _useStyle2[1],
     cssVarCls = _useStyle2[2];
-  var textAreaClassName = classNames(prefixCls, "".concat(prefixCls, "-edit-content"), _defineProperty({}, "".concat(prefixCls, "-rtl"), direction === 'rtl'), className, textClassName, hashId, cssVarCls);
+  var textAreaClassName = classNames(prefixCls, "".concat(prefixCls, "-edit-content"), _defineProperty(_defineProperty({}, "".concat(prefixCls, "-rtl"), direction === 'rtl'), "".concat(prefixCls, "-").concat(component), !!component), className, hashId, cssVarCls);
   return wrapCSSVar(_jsxs("div", {
     className: textAreaClassName,
     style: style,

package/lib/Antd5/typography/Title.js

@@ -16,16 +16,11 @@ var Title = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$level = props.level,
     level = _props$level === void 0 ? 1 : _props$level,
     restProps = _objectWithoutProperties(props, _excluded);
-  var component;
   if (process.env.NODE_ENV !== 'production') {
     var warning = devUseWarning('Typography.Title');
     warning(TITLE_ELE_LIST.includes(level), 'usage', 'Title only accept `1 | 2 | 3 | 4 | 5` as `level` value. And `5` need 4.6.0+ version.');
   }
-  if (TITLE_ELE_LIST.includes(level)) {
-    component = "h".concat(level);
-  } else {
-    component = 'h1';
-  }
+  var component = TITLE_ELE_LIST.includes(level) ? "h".concat(level) : "h1";
   return _jsx(Base, _objectSpread(_objectSpread({
     ref: ref
   }, restProps), {}, {

package/lib/Antd5/typography/Typography.js

@@ -36,15 +36,12 @@ var Typography = /*#__PURE__*/React.forwardRef(function (props, ref) {
     contextDirection = _React$useContext.direction,
     typography = _React$useContext.typography;
   var direction = typographyDirection !== null && typographyDirection !== void 0 ? typographyDirection : contextDirection;
-  var mergedRef = ref;
-  if (setContentRef) {
-    mergedRef = composeRef(ref, setContentRef);
-  }
+  var mergedRef = setContentRef ? composeRef(ref, setContentRef) : ref;
+  var prefixCls = getPrefixCls('typography', customizePrefixCls);
   if (process.env.NODE_ENV !== 'production') {
     var warning = devUseWarning('Typography');
     warning.deprecated(!setContentRef, 'setContentRef', 'ref');
   }
-  var prefixCls = getPrefixCls('typography', customizePrefixCls);
   // Style
   var _useStyle = useStyle(prefixCls),
     _useStyle2 = _slicedToArray(_useStyle, 3),
@@ -66,5 +63,4 @@ var Typography = /*#__PURE__*/React.forwardRef(function (props, ref) {
 if (process.env.NODE_ENV !== 'production') {
   Typography.displayName = 'Typography';
 }
-// es default export should use const instead of let
 export default Typography;

package/lib/Antd5/typography/hooks/useCopyClick.js

@@ -10,7 +10,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import * as React from 'react';
 import copy from 'copy-to-clipboard';
-import { useEvent } from 'rc-util';
+import useEvent from 'rc-util/lib/hooks/useEvent';
+import toList from '../../_util/toList';
 var useCopyClick = function useCopyClick(_ref) {
   var copyConfig = _ref.copyConfig,
     children = _ref.children;
@@ -60,7 +61,7 @@ var useCopyClick = function useCopyClick(_ref) {
             _context.t0 = copyConfig.text;
           case 11:
             text = _context.t0;
-            copy(text || String(children) || '', copyOptions);
+            copy(text || toList(children, true).join('') || '', copyOptions);
             setCopyLoading(false);
             setCopied(true);
             // Trigger tips update

package/lib/Antd5/typography/hooks/usePrevious.js

@@ -1,4 +1,4 @@
-import { useRef, useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 var usePrevious = function usePrevious(value) {
   var ref = useRef();
   useEffect(function () {

package/lib/Antd5/{message/assets/Close.js → typography/hooks/useTooltipProps.js}

@@ -1,22 +1,30 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { jsx as _jsx } from "react/jsx-runtime";
-import * as React from "react";
-var SvgClose = function SvgClose(props) {
-  return _jsx("svg", _objectSpread(_objectSpread({
-    width: 8,
-    height: 8,
-    xmlns: "http://www.w3.org/2000/svg"
-  }, props), {}, {
-    children: _jsx("path", {
-      d: "M7.535 7.41a.5.5 0 0 1-.707 0L4 4.582 1.172 7.41a.5.5 0 1 1-.707-.707l2.828-2.828L.465 1.047A.5.5 0 0 1 1.172.34L4 3.168 6.828.34a.5.5 0 0 1 .707.707L4.707 3.875l2.828 2.828a.5.5 0 0 1 0 .707Z",
-      fill: "currentColor",
-      fillRule: "evenodd"
-    })
-  }));
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import { isValidElement, useMemo } from 'react';
+var useTooltipProps = function useTooltipProps(tooltip, editConfigText, children) {
+  return useMemo(function () {
+    if (tooltip === true) {
+      return {
+        title: editConfigText !== null && editConfigText !== void 0 ? editConfigText : children
+      };
+    }
+    if (/*#__PURE__*/isValidElement(tooltip)) {
+      return {
+        title: tooltip
+      };
+    }
+    if (_typeof(tooltip) === 'object') {
+      return _objectSpread({
+        title: editConfigText !== null && editConfigText !== void 0 ? editConfigText : children
+      }, tooltip);
+    }
+    return {
+      title: tooltip
+    };
+  }, [tooltip, editConfigText, children]);
 };
-export default SvgClose;
+export default useTooltipProps;