From e95324fa41e7a447160dbff8c472b856ef40e6dd Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Fri, 3 Nov 2023 12:58:05 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(components):=20[table]=20tooltipO?= =?UTF-8?q?ptions.showAfter=20is=20not=20effe=E2=80=A6=20(#14735)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "fix(components): [table] tooltipOptions.showAfter is not effective (#13175)" This reverts commit 6238ec8456095b369fcf6e81a79440314cf774d5. --- packages/components/table/src/util.ts | 42 ++++++++------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/packages/components/table/src/util.ts b/packages/components/table/src/util.ts index 2d8c8faaa9..fb244ff4dc 100644 --- a/packages/components/table/src/util.ts +++ b/packages/components/table/src/util.ts @@ -364,24 +364,8 @@ export function createTablePopper( arrow.className = `${ns}-popper__arrow` return arrow } - function togglePopperVisible(display: 'none' | 'block') { - return { - name: 'updateState', - enabled: true, - phase: 'beforeWrite', - fn: ({ state }) => { - state.styles.popper.display = display - }, - requires: ['computeStyles'], - } - } function showPopper() { - if (tooltipOptions.showAfter) { - popperInstance?.setOptions({ - modifiers: [togglePopperVisible('block')], - }) - } - popperInstance?.update() + popperInstance && popperInstance.update() } removePopper?.() removePopper = () => { @@ -395,17 +379,19 @@ export function createTablePopper( } catch {} } let popperInstance: Nullable = null - const { onOpen, onClose } = useDelayedToggle({ - showAfter: tooltipOptions.showAfter, - hideAfter: tooltipOptions.hideAfter, - open: showPopper, - close: removePopper, - }) - const content = renderContent() + let onOpen = showPopper + let onClose = removePopper if (tooltipOptions.enterable) { - content.onmouseenter = onOpen - content.onmouseleave = onClose + ;({ onOpen, onClose } = useDelayedToggle({ + showAfter: tooltipOptions.showAfter, + hideAfter: tooltipOptions.hideAfter, + open: showPopper, + close: removePopper, + })) } + const content = renderContent() + content.onmouseenter = onOpen + content.onmouseleave = onClose const modifiers = [] if (tooltipOptions.offset) { modifiers.push({ @@ -425,9 +411,6 @@ export function createTablePopper( }, }) } - if (tooltipOptions.showAfter) { - modifiers.push(togglePopperVisible('none')) - } const popperOptions = tooltipOptions.popperOptions || {} popperInstance = createPopper(trigger, content, { placement: tooltipOptions.placement || 'top', @@ -440,7 +423,6 @@ export function createTablePopper( trigger.addEventListener('mouseenter', onOpen) trigger.addEventListener('mouseleave', onClose) scrollContainer?.addEventListener('scroll', removePopper) - onOpen() return popperInstance }