From 44a75c4133490107130ce28dfab2912050f86455 Mon Sep 17 00:00:00 2001 From: passing-dream Date: Tue, 29 Jul 2025 20:05:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8next.js?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ellipsis/useMeasure.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/ellipsis/useMeasure.tsx b/src/components/ellipsis/useMeasure.tsx index 4686bf84a2..6dcc6bf2a0 100644 --- a/src/components/ellipsis/useMeasure.tsx +++ b/src/components/ellipsis/useMeasure.tsx @@ -1,3 +1,4 @@ +import { useIsomorphicLayoutEffect } from 'ahooks' import { useEvent } from 'rc-util' import React from 'react' import { unstable_batchedUpdates } from 'react-dom' @@ -60,12 +61,12 @@ export default function useMeasure( }) // Initialize - React.useLayoutEffect(() => { + useIsomorphicLayoutEffect(() => { startMeasure() }, [contentChars, rows]) // Measure element height - React.useLayoutEffect(() => { + useIsomorphicLayoutEffect(() => { if (status === MEASURE_STATUS.PREPARE) { const fullMeasureHeight = fullMeasureRef.current?.offsetHeight || 0 const singleRowMeasureHeight = @@ -82,7 +83,7 @@ export default function useMeasure( }, [status]) // Walking measure - React.useLayoutEffect(() => { + useIsomorphicLayoutEffect(() => { if (status === MEASURE_STATUS.MEASURE_WALKING) { const diff = walkingIndexes[1] - walkingIndexes[0] const midHeight = midMeasureRef.current?.offsetHeight || 0 From 3fbe174bb28797ef10513fffb08d8dac4b86a77f Mon Sep 17 00:00:00 2001 From: Passing-of-A-Dream Date: Wed, 30 Jul 2025 16:28:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor(deps):=20=E4=BB=8E=20ahooks=20?= =?UTF-8?q?=E7=9A=84=20useIsomorphicLayoutEffect=20=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=20rc-util=20=E7=9A=84=20useLayoutEffect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ellipsis/useMeasure.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ellipsis/useMeasure.tsx b/src/components/ellipsis/useMeasure.tsx index 6dcc6bf2a0..3ef221e159 100644 --- a/src/components/ellipsis/useMeasure.tsx +++ b/src/components/ellipsis/useMeasure.tsx @@ -1,5 +1,5 @@ -import { useIsomorphicLayoutEffect } from 'ahooks' import { useEvent } from 'rc-util' +import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect' import React from 'react' import { unstable_batchedUpdates } from 'react-dom' import runes from 'runes2' @@ -61,12 +61,12 @@ export default function useMeasure( }) // Initialize - useIsomorphicLayoutEffect(() => { + useLayoutEffect(() => { startMeasure() }, [contentChars, rows]) // Measure element height - useIsomorphicLayoutEffect(() => { + useLayoutEffect(() => { if (status === MEASURE_STATUS.PREPARE) { const fullMeasureHeight = fullMeasureRef.current?.offsetHeight || 0 const singleRowMeasureHeight = @@ -83,7 +83,7 @@ export default function useMeasure( }, [status]) // Walking measure - useIsomorphicLayoutEffect(() => { + useLayoutEffect(() => { if (status === MEASURE_STATUS.MEASURE_WALKING) { const diff = walkingIndexes[1] - walkingIndexes[0] const midHeight = midMeasureRef.current?.offsetHeight || 0 From 3e79a6ad1cdc7c56e5824324dbcb90074cf66bae Mon Sep 17 00:00:00 2001 From: Passing-of-A-Dream Date: Fri, 7 Nov 2025 14:14:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Space=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E5=AD=90?= =?UTF-8?q?=E9=A1=B9=E7=9A=84=E8=BE=B9=E8=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/space/space.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/space/space.less b/src/components/space/space.less index 9962b3c7ec..db38457382 100644 --- a/src/components/space/space.less +++ b/src/components/space/space.less @@ -25,12 +25,18 @@ } > .@{class-prefix-space}-item { margin-right: var(--gap-horizontal); + &:last-child { + margin-right: 0; + } } &.@{class-prefix-space}-wrap { flex-wrap: wrap; margin-bottom: calc(var(--gap-vertical) * -1); > .@{class-prefix-space}-item { padding-bottom: var(--gap-vertical); + &:last-child { + padding-bottom: 0; + } } } } From c8c7812f04f1514b0936701fcf5d9372f4e6574a Mon Sep 17 00:00:00 2001 From: Passing-of-A-Dream Date: Fri, 7 Nov 2025 14:50:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4Space=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=A4=9A=E4=BD=99=E7=9A=84=E5=BA=95=E9=83=A8=E9=97=B4?= =?UTF-8?q?=E8=B7=9D=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/space/space.less | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/space/space.less b/src/components/space/space.less index db38457382..58c79a0ddb 100644 --- a/src/components/space/space.less +++ b/src/components/space/space.less @@ -34,9 +34,6 @@ margin-bottom: calc(var(--gap-vertical) * -1); > .@{class-prefix-space}-item { padding-bottom: var(--gap-vertical); - &:last-child { - padding-bottom: 0; - } } } }