Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Use constant instead of enum to reduce package size #48406

Merged
merged 3 commits into from
Apr 12, 2024
Merged

refactor: Use constant instead of enum to reduce package size #48406

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad69f8a
feat: optimize code
kiner-tang Apr 11, 2024
f9b3e49
feat: optimize code
kiner-tang Apr 11, 2024
9cafe91
feat: optimize code
kiner-tang Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 16 additions & 18 deletions components/typography/Base/Ellipsis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@ const MeasureText = React.forwardRef<MeasureTextRef, MeasureTextProps>(
display: 'block',
left: 0,
top: 0,
// zIndex: -9999,
// visibility: 'hidden',
pointerEvents: 'none',

backgroundColor: 'rgba(255, 0, 0, 0.65)',

...style,
}}
>
Expand Down Expand Up @@ -118,10 +114,12 @@ export interface EllipsisProps {
}

// Measure for the `text` is exceed the `rows` or not
const STATUS_MEASURE_NONE = 0;
const STATUS_MEASURE_START = 1;
const STATUS_MEASURE_NEED_ELLIPSIS = 2;
const STATUS_MEASURE_NO_NEED_ELLIPSIS = 3;
enum STATUS_MEASURE {
NONE = 0,
START = 1,
NEED_ELLIPSIS = 2,
NO_NEED_ELLIPSIS = 3,
}
kiner-tang marked this conversation as resolved.
Show resolved Hide resolved

const lineClipStyle: React.CSSProperties = {
display: '-webkit-box',
Expand Down Expand Up @@ -151,24 +149,24 @@ export default function EllipsisMeasure(props: EllipsisProps) {
const symbolRowEllipsisRef = React.useRef<MeasureTextRef>(null);

const [canEllipsis, setCanEllipsis] = React.useState(false);
const [needEllipsis, setNeedEllipsis] = React.useState(STATUS_MEASURE_NONE);
const [needEllipsis, setNeedEllipsis] = React.useState<STATUS_MEASURE>(STATUS_MEASURE.NONE);
const [ellipsisHeight, setEllipsisHeight] = React.useState(0);

// Trigger start measure
useLayoutEffect(() => {
if (enableMeasure && width && nodeLen) {
setNeedEllipsis(STATUS_MEASURE_START);
setNeedEllipsis(STATUS_MEASURE.START);
} else {
setNeedEllipsis(STATUS_MEASURE_NONE);
setNeedEllipsis(STATUS_MEASURE.NONE);
}
}, [width, text, rows, enableMeasure, nodeList]);

// Measure process
useLayoutEffect(() => {
if (needEllipsis === STATUS_MEASURE_START) {
if (needEllipsis === STATUS_MEASURE.START) {
const isOverflow = !!needEllipsisRef.current?.isExceed();

setNeedEllipsis(isOverflow ? STATUS_MEASURE_NEED_ELLIPSIS : STATUS_MEASURE_NO_NEED_ELLIPSIS);
setNeedEllipsis(isOverflow ? STATUS_MEASURE.NEED_ELLIPSIS : STATUS_MEASURE.NO_NEED_ELLIPSIS);
setEllipsisCutIndex(isOverflow ? [0, nodeLen] : null);
setCanEllipsis(isOverflow);

Expand Down Expand Up @@ -216,7 +214,7 @@ export default function EllipsisMeasure(props: EllipsisProps) {
// ========================= Text Content =========================
const finalContent = React.useMemo(() => {
if (
needEllipsis !== STATUS_MEASURE_NEED_ELLIPSIS ||
needEllipsis !== STATUS_MEASURE.NEED_ELLIPSIS ||
!ellipsisCutIndex ||
ellipsisCutIndex[0] !== ellipsisCutIndex[1]
) {
Expand All @@ -225,8 +223,8 @@ export default function EllipsisMeasure(props: EllipsisProps) {
// Limit the max line count to avoid scrollbar blink
// https://github.com/ant-design/ant-design/issues/42958
if (
needEllipsis !== STATUS_MEASURE_NO_NEED_ELLIPSIS &&
needEllipsis !== STATUS_MEASURE_NONE
needEllipsis !== STATUS_MEASURE.NO_NEED_ELLIPSIS &&
needEllipsis !== STATUS_MEASURE.NONE
) {
return (
<span
Expand Down Expand Up @@ -260,7 +258,7 @@ export default function EllipsisMeasure(props: EllipsisProps) {
{finalContent}

{/* Measure if current content is exceed the rows */}
{needEllipsis === STATUS_MEASURE_START && (
{needEllipsis === STATUS_MEASURE.START && (
<>
{/** With `rows` */}
<MeasureText
Expand Down Expand Up @@ -301,7 +299,7 @@ export default function EllipsisMeasure(props: EllipsisProps) {
)}

{/* Real size overflow measure */}
{needEllipsis === STATUS_MEASURE_NEED_ELLIPSIS &&
{needEllipsis === STATUS_MEASURE.NEED_ELLIPSIS &&
ellipsisCutIndex &&
ellipsisCutIndex[0] !== ellipsisCutIndex[1] && (
<MeasureText
Expand Down