Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

fix(ui-mode): recalculate dialog position (#37849)

Adam Gastineau7fef644b537d
diff --git a/packages/web/src/shared/dialog.tsx b/packages/web/src/shared/dialog.tsx
index b43984b09d..7f0de8973f 100644
--- a/packages/web/src/shared/dialog.tsx
+++ b/packages/web/src/shared/dialog.tsx
@@ -46,8 +46,8 @@ export const Dialog: React.FC<React.PropsWithChildren<DialogProps>> = ({
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [_, setRecalculateDimensionsCount] = React.useState(0);
- const dialogMeasure = useMeasureForRef(dialogRef);
- const anchorMeasure = useMeasureForRef(anchor);
+ const [dialogMeasure] = useMeasureForRef(dialogRef);
+ const [anchorMeasure, recalculateAnchorMeasure] = useMeasureForRef(anchor);
const position = dialogPosition(dialogMeasure, anchorMeasure, verticalOffset);
React.useEffect(() => {
@@ -77,6 +77,8 @@ export const Dialog: React.FC<React.PropsWithChildren<DialogProps>> = ({
return () => {};
}, [open, requestClose]);
+ React.useLayoutEffect(() => recalculateAnchorMeasure(), [open, recalculateAnchorMeasure]);
+
React.useEffect(() => {
const onResize = () => setRecalculateDimensionsCount(count => count + 1);
diff --git a/packages/web/src/uiUtils.ts b/packages/web/src/uiUtils.ts
index c24a1da6e7..f7e94f1b52 100644
--- a/packages/web/src/uiUtils.ts
+++ b/packages/web/src/uiUtils.ts
@@ -38,26 +38,32 @@ export function useAsyncMemo<T>(fn: () => Promise<T>, deps: React.DependencyList
// Tracks the element's bounding box.
export function useMeasure<T extends Element>() {
const ref = React.useRef<T | null>(null);
- return [useMeasureForRef(ref), ref] as const;
+ const [measure] = useMeasureForRef(ref);
+ return [measure, ref] as const;
}
-export function useMeasureForRef<T extends Element>(ref?: React.RefObject<T | null>) {
+export function useMeasureForRef<T extends Element>(ref?: React.RefObject<T | null>): [DOMRect, () => void] {
const [measure, setMeasure] = React.useState(new DOMRect(0, 0, 10, 10));
+ const recalculateMeasure = React.useCallback(() => {
+ const target = ref?.current;
+ if (target)
+ setMeasure(target.getBoundingClientRect());
+ }, [ref]);
+
React.useLayoutEffect(() => {
const target = ref?.current;
if (!target)
return;
- const update = () => setMeasure(target.getBoundingClientRect());
- update();
- const resizeObserver = new ResizeObserver(update);
+ recalculateMeasure();
+ const resizeObserver = new ResizeObserver(recalculateMeasure);
resizeObserver.observe(target);
- window.addEventListener('resize', update);
+ window.addEventListener('resize', recalculateMeasure);
return () => {
resizeObserver.disconnect();
- window.removeEventListener('resize', update);
+ window.removeEventListener('resize', recalculateMeasure);
};
- }, [ref]);
- return measure;
+ }, [recalculateMeasure, ref]);
+ return [measure, recalculateMeasure];
}
export function msToString(ms: number): string {