antd-mobile 5.38.0 → 5.38.1

package/2x/es/components/ellipsis/ellipsis.js

@@ -1,10 +1,9 @@
-import React, { useMemo, useRef, useState } from 'react';
-import runes from 'runes2';
-import { mergeProps } from '../../utils/with-default-props';
+import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { useResizeEffect } from '../../utils/use-resize-effect';
-import { useIsomorphicLayoutEffect } from 'ahooks';
+import { mergeProps } from '../../utils/with-default-props';
 import { withStopPropagation } from '../../utils/with-stop-propagation';
+import useMeasure from './useMeasure';
 const classPrefix = `adm-ellipsis`;
 const defaultProps = {
   direction: 'end',
@@ -18,134 +17,41 @@ const defaultProps = {
 };
 export const Ellipsis = p => {
   const props = mergeProps(defaultProps, p);
-  const rootRef = useRef(null);
-  const expandElRef = useRef(null);
-  const collapseElRef = useRef(null);
-  const [ellipsised, setEllipsised] = useState({});
-  const [expanded, setExpanded] = useState(props.defaultExpanded);
-  const [exceeded, setExceeded] = useState(false);
-  const chars = useMemo(() => runes(props.content), [props.content]);
-  function getSubString(start, end) {
-    return chars.slice(start, end).join('');
-  }
-  function calcEllipsised() {
-    var _a, _b;
-    const root = rootRef.current;
-    if (!root) return;
-    const originDisplay = root.style.display;
-    root.style.display = 'block';
-    const originStyle = window.getComputedStyle(root);
-    const container = document.createElement('div');
-    const styleNames = Array.prototype.slice.apply(originStyle);
-    styleNames.forEach(name => {
-      container.style.setProperty(name, originStyle.getPropertyValue(name));
-    });
-    root.style.display = originDisplay;
-    container.style.height = 'auto';
-    container.style.minHeight = 'auto';
-    container.style.maxHeight = 'auto';
-    container.style.textOverflow = 'clip';
-    container.style.webkitLineClamp = 'unset';
-    container.style.display = 'block';
-    const lineHeight = pxToNumber(originStyle.lineHeight);
-    const maxHeight = Math.floor(lineHeight * (props.rows + 0.5) + pxToNumber(originStyle.paddingTop) + pxToNumber(originStyle.paddingBottom));
-    container.innerText = props.content;
-    document.body.appendChild(container);
-    if (container.offsetHeight <= maxHeight) {
-      setExceeded(false);
-    } else {
-      setExceeded(true);
-      const end = props.content.length;
-      const collapseEl = typeof props.collapseText === 'string' ? props.collapseText : (_a = collapseElRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML;
-      const expandEl = typeof props.expandText === 'string' ? props.expandText : (_b = expandElRef.current) === null || _b === void 0 ? void 0 : _b.innerHTML;
-      const actionText = expanded ? collapseEl : expandEl;
-      function check(left, right) {
-        if (right - left <= 1) {
-          if (props.direction === 'end') {
-            return {
-              leading: getSubString(0, left) + '...'
-            };
-          } else {
-            return {
-              tailing: '...' + getSubString(right, end)
-            };
-          }
-        }
-        const middle = Math.round((left + right) / 2);
-        if (props.direction === 'end') {
-          container.innerHTML = getSubString(0, middle) + '...' + actionText;
-        } else {
-          container.innerHTML = actionText + '...' + getSubString(middle, end);
-        }
-        if (container.offsetHeight <= maxHeight) {
-          if (props.direction === 'end') {
-            return check(middle, right);
-          } else {
-            return check(left, middle);
-          }
-        } else {
-          if (props.direction === 'end') {
-            return check(left, middle);
-          } else {
-            return check(middle, right);
-          }
-        }
-      }
-      function checkMiddle(leftPart, rightPart) {
-        if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
-          return {
-            leading: getSubString(0, leftPart[0]) + '...',
-            tailing: '...' + getSubString(rightPart[1], end)
-          };
-        }
-        const leftPartMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
-        const rightPartMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
-        container.innerHTML = getSubString(0, leftPartMiddle) + '...' + actionText + '...' + getSubString(rightPartMiddle, end);
-        if (container.offsetHeight <= maxHeight) {
-          return checkMiddle([leftPartMiddle, leftPart[1]], [rightPart[0], rightPartMiddle]);
-        } else {
-          return checkMiddle([leftPart[0], leftPartMiddle], [rightPartMiddle, rightPart[1]]);
-        }
-      }
-      const middle = Math.floor((0 + end) / 2);
-      const ellipsised = props.direction === 'middle' ? checkMiddle([0, middle], [middle, end]) : check(0, end);
-      setEllipsised(ellipsised);
-    }
-    document.body.removeChild(container);
-  }
-  useResizeEffect(calcEllipsised, rootRef);
-  useIsomorphicLayoutEffect(() => {
-    calcEllipsised();
-  }, [props.content, props.direction, props.rows, props.expandText, props.collapseText]);
-  const expandActionElement = !!props.expandText && withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
-    ref: expandElRef,
+  const {
+    content,
+    direction,
+    rows,
+    expandText,
+    collapseText,
+    stopPropagationForActionButtons,
+    onContentClick,
+    defaultExpanded
+  } = props;
+  // ============================ Refs ============================
+  const rootRef = React.useRef(null);
+  // ========================== Expanded ==========================
+  const [expanded, setExpanded] = React.useState(defaultExpanded);
+  const expandNode = expandText ? withStopPropagation(stopPropagationForActionButtons, React.createElement("a", {
     onClick: () => {
       setExpanded(true);
     }
-  }, props.expandText));
-  const collapseActionElement = !!props.collapseText && withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
-    ref: collapseElRef,
+  }, expandText)) : null;
+  const collapseNode = collapseText ? withStopPropagation(stopPropagationForActionButtons, React.createElement("a", {
     onClick: () => {
       setExpanded(false);
     }
-  }, props.collapseText));
-  const renderContent = () => {
-    if (!exceeded) return props.content;
-    if (expanded) return React.createElement(React.Fragment, null, props.content, collapseActionElement);
-    return React.createElement(React.Fragment, null, ellipsised.leading, expandActionElement, ellipsised.tailing);
-  };
+  }, collapseText)) : null;
+  // ========================== Ellipsis ==========================
+  const [measureNodes, forceResize] = useMeasure(rootRef, content, rows, direction, expanded, expandNode, collapseNode);
+  useResizeEffect(forceResize, rootRef);
+  // =========================== Render ===========================
   return withNativeProps(props, React.createElement("div", {
     ref: rootRef,
     className: classPrefix,
     onClick: e => {
       if (e.target === e.currentTarget) {
-        props.onContentClick(e);
+        onContentClick(e);
       }
     }
-  }, renderContent()));
-};
-function pxToNumber(value) {
-  if (!value) return 0;
-  const match = value.match(/^\d*(\.\d*)?/);
-  return match ? Number(match[0]) : 0;
-}
+  }, measureNodes));
+};

package/2x/es/components/ellipsis/useMeasure.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export default function useMeasure(containerRef: React.RefObject<HTMLDivElement>, content: string, rows: number, direction: 'start' | 'end' | 'middle', expanded: boolean, expandNode: React.ReactElement | null, collapseNode: React.ReactElement | null): readonly [React.JSX.Element, () => void];

package/2x/es/components/ellipsis/useMeasure.js

@@ -0,0 +1,101 @@
+import { useEvent } from 'rc-util';
+import React from 'react';
+import runes from 'runes2';
+const ELLIPSIS_TEXT = '...';
+const measureStyle = {
+  visibility: 'hidden',
+  whiteSpace: 'inherit',
+  lineHeight: 'inherit',
+  fontSize: 'inherit'
+};
+export default function useMeasure(containerRef, content, rows, direction, expanded, expandNode, collapseNode) {
+  const contentChars = React.useMemo(() => runes(content), [content]);
+  const [maxHeight, setMaxHeight] = React.useState(0);
+  const [walkingIndexes, setWalkingIndexes] = React.useState([0, 0]);
+  const midIndex = Math.ceil((walkingIndexes[0] + walkingIndexes[1]) / 2);
+  const [status, setStatus] = React.useState(100 /* STABLE_NO_ELLIPSIS */);
+  // ============================ Refs ============================
+  const singleRowMeasureRef = React.useRef(null);
+  const fullMeasureRef = React.useRef(null);
+  const midMeasureRef = React.useRef(null);
+  const startMeasure = useEvent(() => {
+    setStatus(1 /* PREPARE */);
+    setWalkingIndexes([0, direction === 'middle' ? Math.ceil(contentChars.length / 2) : contentChars.length]);
+  });
+  // Initialize
+  React.useLayoutEffect(() => {
+    startMeasure();
+  }, [contentChars, rows]);
+  // Measure element height
+  React.useLayoutEffect(() => {
+    var _a, _b;
+    if (status === 1 /* PREPARE */) {
+      const fullMeasureHeight = ((_a = fullMeasureRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0;
+      const singleRowMeasureHeight = ((_b = singleRowMeasureRef.current) === null || _b === void 0 ? void 0 : _b.offsetHeight) || 0;
+      const rowMeasureHeight = singleRowMeasureHeight * rows;
+      if (fullMeasureHeight <= rowMeasureHeight) {
+        setStatus(100 /* STABLE_NO_ELLIPSIS */);
+      } else {
+        setMaxHeight(rowMeasureHeight);
+        setStatus(2 /* MEASURE_WALKING */);
+      }
+    }
+  }, [status]);
+  // Walking measure
+  React.useLayoutEffect(() => {
+    var _a;
+    if (status === 2 /* MEASURE_WALKING */) {
+      const diff = walkingIndexes[1] - walkingIndexes[0];
+      const midHeight = ((_a = midMeasureRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0;
+      if (diff > 1) {
+        if (midHeight > maxHeight) {
+          setWalkingIndexes([walkingIndexes[0], midIndex]);
+        } else {
+          setWalkingIndexes([midIndex, walkingIndexes[1]]);
+        }
+      } else {
+        if (midHeight > maxHeight) {
+          setWalkingIndexes([walkingIndexes[0], walkingIndexes[0]]);
+        } else {
+          setWalkingIndexes([walkingIndexes[1], walkingIndexes[1]]);
+        }
+        setStatus(99 /* STABLE_ELLIPSIS */);
+      }
+    }
+  }, [status, walkingIndexes]);
+  // =========================== Render ===========================
+  /** Render by cut index */
+  const renderContent = index => {
+    const prefixContent = contentChars.slice(0, index);
+    const suffixContent = contentChars.slice(contentChars.length - index);
+    return React.createElement(React.Fragment, null, direction === 'start' && React.createElement(React.Fragment, null, expandNode, ELLIPSIS_TEXT), direction !== 'start' && prefixContent.join(''), direction === 'middle' && React.createElement(React.Fragment, null, ELLIPSIS_TEXT, expandNode, ELLIPSIS_TEXT), direction !== 'end' && suffixContent.join(''), direction === 'end' && React.createElement(React.Fragment, null, ELLIPSIS_TEXT, expandNode));
+  };
+  const finalContent = React.useMemo(() => {
+    if (expanded || status === 100 /* STABLE_NO_ELLIPSIS */) {
+      return React.createElement(React.Fragment, {
+        key: 'display'
+      }, content, status === 99 /* STABLE_ELLIPSIS */ && collapseNode);
+    }
+    if (status === 99 /* STABLE_ELLIPSIS */) {
+      return renderContent(midIndex);
+    }
+    return null;
+  }, [expanded, status, content, collapseNode, midIndex]);
+  const allNodes = React.createElement(React.Fragment, null, status === 1 /* PREPARE */ && React.createElement("div", {
+    key: 'full',
+    "aria-hidden": true,
+    ref: fullMeasureRef,
+    style: measureStyle
+  }, content, expandNode), status === 1 /* PREPARE */ && React.createElement("div", {
+    key: 'stable',
+    "aria-hidden": true,
+    ref: singleRowMeasureRef,
+    style: measureStyle
+  }, '\u00A0'), status === 2 /* MEASURE_WALKING */ && React.createElement("div", {
+    key: 'walking-mid',
+    "aria-hidden": true,
+    ref: midMeasureRef,
+    style: measureStyle
+  }, renderContent(midIndex)), finalContent);
+  return [allNodes, startMeasure];
+}

package/2x/es/components/ellipsis/~ellipsis.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import type { FC, ReactNode } from 'react';
+import { NativeProps } from '../../utils/native-props';
+import { PropagationEvent } from '../../utils/with-stop-propagation';
+export declare type EllipsisProps = {
+    content: string;
+    direction?: 'start' | 'end' | 'middle';
+    rows?: number;
+    expandText?: ReactNode;
+    collapseText?: ReactNode;
+    stopPropagationForActionButtons?: PropagationEvent[];
+    onContentClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    defaultExpanded?: boolean;
+} & NativeProps;
+export declare const Ellipsis: FC<EllipsisProps>;

package/2x/es/components/ellipsis/~ellipsis.js

@@ -0,0 +1,151 @@
+import React, { useMemo, useRef, useState } from 'react';
+import runes from 'runes2';
+import { mergeProps } from '../../utils/with-default-props';
+import { withNativeProps } from '../../utils/native-props';
+import { useResizeEffect } from '../../utils/use-resize-effect';
+import { useIsomorphicLayoutEffect } from 'ahooks';
+import { withStopPropagation } from '../../utils/with-stop-propagation';
+const classPrefix = `adm-ellipsis`;
+const defaultProps = {
+  direction: 'end',
+  rows: 1,
+  expandText: '',
+  content: '',
+  collapseText: '',
+  stopPropagationForActionButtons: [],
+  onContentClick: () => {},
+  defaultExpanded: false
+};
+export const Ellipsis = p => {
+  const props = mergeProps(defaultProps, p);
+  const rootRef = useRef(null);
+  const expandElRef = useRef(null);
+  const collapseElRef = useRef(null);
+  const [ellipsised, setEllipsised] = useState({});
+  const [expanded, setExpanded] = useState(props.defaultExpanded);
+  const [exceeded, setExceeded] = useState(false);
+  const chars = useMemo(() => runes(props.content), [props.content]);
+  function getSubString(start, end) {
+    return chars.slice(start, end).join('');
+  }
+  function calcEllipsised() {
+    var _a, _b;
+    const root = rootRef.current;
+    if (!root) return;
+    const originDisplay = root.style.display;
+    root.style.display = 'block';
+    const originStyle = window.getComputedStyle(root);
+    const container = document.createElement('div');
+    const styleNames = Array.prototype.slice.apply(originStyle);
+    styleNames.forEach(name => {
+      container.style.setProperty(name, originStyle.getPropertyValue(name));
+    });
+    root.style.display = originDisplay;
+    container.style.height = 'auto';
+    container.style.minHeight = 'auto';
+    container.style.maxHeight = 'auto';
+    container.style.textOverflow = 'clip';
+    container.style.webkitLineClamp = 'unset';
+    container.style.display = 'block';
+    const lineHeight = pxToNumber(originStyle.lineHeight);
+    const maxHeight = Math.floor(lineHeight * (props.rows + 0.5) + pxToNumber(originStyle.paddingTop) + pxToNumber(originStyle.paddingBottom));
+    container.innerText = props.content;
+    document.body.appendChild(container);
+    if (container.offsetHeight <= maxHeight) {
+      setExceeded(false);
+    } else {
+      setExceeded(true);
+      const end = props.content.length;
+      const collapseEl = typeof props.collapseText === 'string' ? props.collapseText : (_a = collapseElRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML;
+      const expandEl = typeof props.expandText === 'string' ? props.expandText : (_b = expandElRef.current) === null || _b === void 0 ? void 0 : _b.innerHTML;
+      const actionText = expanded ? collapseEl : expandEl;
+      function check(left, right) {
+        if (right - left <= 1) {
+          if (props.direction === 'end') {
+            return {
+              leading: getSubString(0, left) + '...'
+            };
+          } else {
+            return {
+              tailing: '...' + getSubString(right, end)
+            };
+          }
+        }
+        const middle = Math.round((left + right) / 2);
+        if (props.direction === 'end') {
+          container.innerHTML = getSubString(0, middle) + '...' + actionText;
+        } else {
+          container.innerHTML = actionText + '...' + getSubString(middle, end);
+        }
+        if (container.offsetHeight <= maxHeight) {
+          if (props.direction === 'end') {
+            return check(middle, right);
+          } else {
+            return check(left, middle);
+          }
+        } else {
+          if (props.direction === 'end') {
+            return check(left, middle);
+          } else {
+            return check(middle, right);
+          }
+        }
+      }
+      function checkMiddle(leftPart, rightPart) {
+        if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
+          return {
+            leading: getSubString(0, leftPart[0]) + '...',
+            tailing: '...' + getSubString(rightPart[1], end)
+          };
+        }
+        const leftPartMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
+        const rightPartMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
+        container.innerHTML = getSubString(0, leftPartMiddle) + '...' + actionText + '...' + getSubString(rightPartMiddle, end);
+        if (container.offsetHeight <= maxHeight) {
+          return checkMiddle([leftPartMiddle, leftPart[1]], [rightPart[0], rightPartMiddle]);
+        } else {
+          return checkMiddle([leftPart[0], leftPartMiddle], [rightPartMiddle, rightPart[1]]);
+        }
+      }
+      const middle = Math.floor((0 + end) / 2);
+      const ellipsised = props.direction === 'middle' ? checkMiddle([0, middle], [middle, end]) : check(0, end);
+      setEllipsised(ellipsised);
+    }
+    document.body.removeChild(container);
+  }
+  useResizeEffect(calcEllipsised, rootRef);
+  useIsomorphicLayoutEffect(() => {
+    calcEllipsised();
+  }, [props.content, props.direction, props.rows, props.expandText, props.collapseText]);
+  const expandActionElement = !!props.expandText && withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
+    ref: expandElRef,
+    onClick: () => {
+      setExpanded(true);
+    }
+  }, props.expandText));
+  const collapseActionElement = !!props.collapseText && withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
+    ref: collapseElRef,
+    onClick: () => {
+      setExpanded(false);
+    }
+  }, props.collapseText));
+  const renderContent = () => {
+    if (!exceeded) return props.content;
+    if (expanded) return React.createElement(React.Fragment, null, props.content, collapseActionElement);
+    return React.createElement(React.Fragment, null, ellipsised.leading, expandActionElement, ellipsised.tailing);
+  };
+  return withNativeProps(props, React.createElement("div", {
+    ref: rootRef,
+    className: classPrefix,
+    onClick: e => {
+      if (e.target === e.currentTarget) {
+        props.onContentClick(e);
+      }
+    }
+  }, renderContent()));
+};
+function pxToNumber(value) {
+  if (!value) return 0;
+  const match = value.match(/^\d*(\.\d*)?/);
+  return match ? Number(match[0]) : 0;
+}

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.38.0",
+  "version": "5.38.1",
   "homepage": "https://github.com/ant-design/ant-design-mobile#readme",
   "bugs": {
     "url": "https://github.com/ant-design/ant-design-mobile/issues"