fix(mobile): change how slider height is calculated (#8049)

This commit is contained in:
pengx17
2024-09-02 14:10:36 +00:00
parent 87da792c4c
commit e1310b65cd
3 changed files with 27 additions and 29 deletions

View File

@@ -601,6 +601,7 @@ jobs:
- lint - lint
- check-yarn-binary - check-yarn-binary
- e2e-test - e2e-test
- e2e-mobile-test
- e2e-migration-test - e2e-migration-test
- unit-test - unit-test
- server-test - server-test

View File

@@ -2,7 +2,7 @@ import { useI18n } from '@affine/i18n';
import { ArrowLeftSmallIcon } from '@blocksuite/icons/rc'; import { ArrowLeftSmallIcon } from '@blocksuite/icons/rc';
import { Slot } from '@radix-ui/react-slot'; import { Slot } from '@radix-ui/react-slot';
import clsx from 'clsx'; import clsx from 'clsx';
import { useCallback, useContext, useEffect, useRef, useState } from 'react'; import { useCallback, useContext, useMemo, useState } from 'react';
import { observeResize } from '../../../utils'; import { observeResize } from '../../../utils';
import { Button } from '../../button'; import { Button } from '../../button';
@@ -33,9 +33,29 @@ export const MobileMenu = ({
const [sliderHeight, setSliderHeight] = useState(0); const [sliderHeight, setSliderHeight] = useState(0);
const { setOpen: pSetOpen } = useContext(MobileMenuContext); const { setOpen: pSetOpen } = useContext(MobileMenuContext);
const finalOpen = rootOptions?.open ?? open; const finalOpen = rootOptions?.open ?? open;
const sliderRef = useRef<HTMLDivElement>(null);
const activeIndex = subMenus.length; const activeIndex = subMenus.length;
// dynamic height for slider
const onSliderRef = useMemo(() => {
let unsub: (() => void) | null = null;
return (sliderDiv: HTMLDivElement | null) => {
unsub?.();
if (!sliderDiv || !finalOpen) return;
const active = sliderDiv.querySelector(
`.${styles.menuContent}[data-index="${activeIndex}"]`
);
if (!active) return;
// for the situation that content is loaded asynchronously
unsub = observeResize(active, entry => {
setSliderHeight(entry.borderBoxSize[0].blockSize);
});
};
}, [activeIndex, finalOpen]);
const onOpenChange = useCallback( const onOpenChange = useCallback(
(open: boolean) => { (open: boolean) => {
if (!open) { if (!open) {
@@ -57,31 +77,6 @@ export const MobileMenu = ({
[onOpenChange, open] [onOpenChange, open]
); );
// dynamic height for slider
useEffect(() => {
if (!finalOpen) return;
let observer: () => void;
const t = setTimeout(() => {
const slider = sliderRef.current;
if (!slider) return;
const active = slider.querySelector(
`.${styles.menuContent}[data-index="${activeIndex}"]`
);
if (!active) return;
// for the situation that content is loaded asynchronously
observer = observeResize(active, entry => {
setSliderHeight(entry.borderBoxSize[0].blockSize);
});
}, 0);
return () => {
clearTimeout(t);
observer?.();
};
}, [activeIndex, finalOpen]);
const t = useI18n(); const t = useI18n();
/** /**
@@ -122,7 +117,7 @@ export const MobileMenu = ({
}} }}
> >
<div <div
ref={sliderRef} ref={onSliderRef}
className={styles.slider} className={styles.slider}
style={{ style={{
transform: `translateX(-${100 * activeIndex}%)`, transform: `translateX(-${100 * activeIndex}%)`,

View File

@@ -23,9 +23,11 @@ const config: PlaywrightTestConfig = {
}, },
}, },
], ],
expect: {
timeout: process.env.CI ? 15_000 : 5_000,
},
use: { use: {
baseURL: 'http://localhost:8080/', baseURL: 'http://localhost:8080/',
actionTimeout: 10 * 1000,
locale: 'en-US', locale: 'en-US',
// Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer // Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer
// You can open traces locally(`npx playwright show-trace trace.zip`) // You can open traces locally(`npx playwright show-trace trace.zip`)