Fix misaligned tooltip positions in modal dialogs
This commit fixes a bug that causes tooltips to be slightly misaligned.
Tooltip positioning was incorrect during modal transitions due to their
initial movement, causing tooltips to align incorrectly at the start of
the animation rather than the end.
One way to solve this would be using `autoUpdate` from `floating-ui`
with `animationFrame: true`. However, this recalculates positions tens
of times per second, impacting performance. This is a monkey solution.
This commit adopts a more efficient approach by updating tooltip
positions only at the end of the transitions, which reduces calculations
and conserves resources.
Key changes:
- Addd transition end event listener for updating tooltip positions.
- Use throttling to eliminate excessive position recalculations.
Other supporting changes:
- Improve throttle function to support efficient recalculations of
positions:
- Add ability to optionally exclude the first execution (leading
call).
- Refactor to simplify it make it easier to follow and read.
- Fix a bug where initial calls were incorrectly throttled if
`dateNow()` returned `0`.
- Introduce and use a global hook for efficient DOM event management.
This greatily introduce safety, reuse and testability of event
listening.
This commit is contained in:
@@ -0,0 +1,79 @@
|
||||
import {
|
||||
onBeforeUnmount,
|
||||
shallowRef,
|
||||
watch,
|
||||
type Ref,
|
||||
} from 'vue';
|
||||
|
||||
export interface UseEventListener {
|
||||
(): TargetEventListener;
|
||||
}
|
||||
|
||||
export const useAutoUnsubscribedEventListener: UseEventListener = () => ({
|
||||
startListening: (eventTargetSource, eventType, eventHandler) => {
|
||||
const eventTargetRef = isEventTarget(eventTargetSource)
|
||||
? shallowRef(eventTargetSource)
|
||||
: eventTargetSource;
|
||||
return startListeningRef(
|
||||
eventTargetRef,
|
||||
eventType,
|
||||
eventHandler,
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
type EventTargetRef = Readonly<Ref<EventTarget | undefined>>;
|
||||
|
||||
type EventTargetOrRef = EventTargetRef | EventTarget;
|
||||
|
||||
function isEventTarget(obj: EventTargetOrRef): obj is EventTarget {
|
||||
return obj instanceof EventTarget;
|
||||
}
|
||||
|
||||
export interface TargetEventListener {
|
||||
startListening<TEvent extends keyof HTMLElementEventMap>(
|
||||
eventTargetSource: EventTargetOrRef,
|
||||
eventType: TEvent,
|
||||
eventHandler: (event: HTMLElementEventMap[TEvent]) => void,
|
||||
): void;
|
||||
}
|
||||
|
||||
function startListeningRef<TEvent extends keyof HTMLElementEventMap>(
|
||||
eventTargetRef: Readonly<Ref<EventTarget | undefined>>,
|
||||
eventType: TEvent,
|
||||
eventHandler: (event: HTMLElementEventMap[TEvent]) => void,
|
||||
): void {
|
||||
const eventListenerManager = new EventListenerManager();
|
||||
watch(() => eventTargetRef.value, (element) => {
|
||||
eventListenerManager.removeListenerIfExists();
|
||||
if (!element) {
|
||||
return;
|
||||
}
|
||||
eventListenerManager.addListener(element, eventType, eventHandler);
|
||||
}, { immediate: true });
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
eventListenerManager.removeListenerIfExists();
|
||||
});
|
||||
}
|
||||
|
||||
class EventListenerManager {
|
||||
private removeListener: (() => void) | null = null;
|
||||
|
||||
public removeListenerIfExists() {
|
||||
if (this.removeListener === null) {
|
||||
return;
|
||||
}
|
||||
this.removeListener();
|
||||
this.removeListener = null;
|
||||
}
|
||||
|
||||
public addListener<TEvent extends keyof HTMLElementEventMap>(
|
||||
eventTarget: EventTarget,
|
||||
eventType: TEvent,
|
||||
eventHandler: (event: HTMLElementEventMap[TEvent]) => void,
|
||||
) {
|
||||
eventTarget.addEventListener(eventType, eventHandler);
|
||||
this.removeListener = () => eventTarget.removeEventListener(eventType, eventHandler);
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,14 @@
|
||||
import { onBeforeMount, onBeforeUnmount } from 'vue';
|
||||
import { useAutoUnsubscribedEventListener, type UseEventListener } from '@/presentation/components/Shared/Hooks/UseAutoUnsubscribedEventListener';
|
||||
|
||||
export function useEscapeKeyListener(callback: () => void) {
|
||||
const onKeyUp = (event: KeyboardEvent) => {
|
||||
export function useEscapeKeyListener(
|
||||
callback: () => void,
|
||||
eventTarget: EventTarget = document,
|
||||
useEventListener: UseEventListener = useAutoUnsubscribedEventListener,
|
||||
): void {
|
||||
const { startListening } = useEventListener();
|
||||
startListening(eventTarget, 'keyup', (event) => {
|
||||
if (event.key === 'Escape') {
|
||||
callback();
|
||||
}
|
||||
};
|
||||
|
||||
onBeforeMount(() => {
|
||||
window.addEventListener('keyup', onKeyUp);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keyup', onKeyUp);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -19,7 +19,8 @@
|
||||
|
||||
<script lang="ts">
|
||||
import {
|
||||
defineComponent, ref, watchEffect, nextTick,
|
||||
defineComponent, ref, watchEffect,
|
||||
nextTick, inject,
|
||||
} from 'vue';
|
||||
import ModalOverlay from './ModalOverlay.vue';
|
||||
import ModalContent from './ModalContent.vue';
|
||||
@@ -28,6 +29,8 @@ import { useCurrentFocusToggle } from './Hooks/UseCurrentFocusToggle';
|
||||
import { useEscapeKeyListener } from './Hooks/UseEscapeKeyListener';
|
||||
import { useAllTrueWatcher } from './Hooks/UseAllTrueWatcher';
|
||||
|
||||
export const INJECTION_KEY_ESCAPE_LISTENER = Symbol('useEscapeKeyListener');
|
||||
|
||||
export default defineComponent({
|
||||
components: {
|
||||
ModalOverlay,
|
||||
@@ -49,6 +52,11 @@ export default defineComponent({
|
||||
/* eslint-enable @typescript-eslint/no-unused-vars */
|
||||
},
|
||||
setup(props, { emit }) {
|
||||
const listenEscapeKey: typeof useEscapeKeyListener = inject(
|
||||
INJECTION_KEY_ESCAPE_LISTENER,
|
||||
useEscapeKeyListener,
|
||||
);
|
||||
|
||||
const isRendered = ref(false);
|
||||
const isOpen = ref(false);
|
||||
const overlayTransitionedOut = ref(false);
|
||||
@@ -56,7 +64,7 @@ export default defineComponent({
|
||||
|
||||
useLockBodyBackgroundScroll(isOpen);
|
||||
useCurrentFocusToggle(isOpen);
|
||||
useEscapeKeyListener(() => handleEscapeKeyUp());
|
||||
listenEscapeKey(() => handleEscapeKeyUp());
|
||||
|
||||
const {
|
||||
onAllConditionsMet: onModalFullyTransitionedOut,
|
||||
|
||||
@@ -35,6 +35,9 @@ import {
|
||||
} from '@floating-ui/vue';
|
||||
import { defineComponent, shallowRef, computed } from 'vue';
|
||||
import { useResizeObserverPolyfill } from '@/presentation/components/Shared/Hooks/UseResizeObserverPolyfill';
|
||||
import { throttle } from '@/application/Common/Timing/Throttle';
|
||||
import { type TargetEventListener } from '@/presentation/components/Shared/Hooks/UseAutoUnsubscribedEventListener';
|
||||
import { injectKey } from '@/presentation/injectionSymbols';
|
||||
import type { CSSProperties } from 'vue';
|
||||
|
||||
const GAP_BETWEEN_TOOLTIP_AND_TRIGGER_IN_PX = 2;
|
||||
@@ -48,9 +51,12 @@ export default defineComponent({
|
||||
const triggeringElement = shallowRef<HTMLElement | undefined>();
|
||||
const arrowElement = shallowRef<HTMLElement | undefined>();
|
||||
|
||||
const eventListener = injectKey((keys) => keys.useAutoUnsubscribedEventListener);
|
||||
useResizeObserverPolyfill();
|
||||
|
||||
const { floatingStyles, middlewareData, placement } = useFloating(
|
||||
const {
|
||||
floatingStyles, middlewareData, placement, update,
|
||||
} = useFloating(
|
||||
triggeringElement,
|
||||
tooltipDisplayElement,
|
||||
{
|
||||
@@ -68,6 +74,17 @@ export default defineComponent({
|
||||
},
|
||||
);
|
||||
|
||||
/*
|
||||
Not using `float-ui`'s `autoUpdate` with `animationFrame: true` because it updates tooltips on
|
||||
every frame through `requestAnimationFrame`. This behavior is analogous to a continuous loop
|
||||
(often 60 updates per second and more depending on the refresh rate), which can be excessively
|
||||
performance-intensive. It's overkill for the application needs and a monkey solution due to
|
||||
its brute-force nature.
|
||||
*/
|
||||
setupTransitionEndEvents(throttle(() => {
|
||||
update();
|
||||
}, 400, { excludeLeadingCall: true }), eventListener);
|
||||
|
||||
const arrowStyles = computed<CSSProperties>(() => {
|
||||
if (!middlewareData.value.arrow) {
|
||||
return {
|
||||
@@ -126,6 +143,19 @@ function getCounterpartBoxOffsetProperty(placement: Placement): keyof CSSPropert
|
||||
const currentSide = placement.split('-')[0] as Side;
|
||||
return sideCounterparts[currentSide];
|
||||
}
|
||||
|
||||
function setupTransitionEndEvents(
|
||||
handler: () => void,
|
||||
listener: TargetEventListener,
|
||||
) {
|
||||
const transitionEndEvents: readonly (keyof HTMLElementEventMap)[] = [
|
||||
'transitionend',
|
||||
'transitioncancel',
|
||||
];
|
||||
transitionEndEvents.forEach((eventName) => {
|
||||
listener.startListening(document.body, eventName, handler);
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
Reference in New Issue
Block a user