Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix resizing loop of analytics view #150

Merged
merged 2 commits into from
Apr 24, 2024
Merged

fix: fix resizing loop of analytics view #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43ef05f
fix: fix resizing loop of analytics view
LinaYahya Apr 23, 2024
626ba10
fix: remove console.log's
LinaYahya Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions src/components/Analytics/AnalyticsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ import {
buildAnalyticsDetailedQuestionTabMenuCy,
} from '../../config/selectors';
import { useElementWidth } from '../../hooks/useElementWidth';
import {
useMaxAvailableHeightInWindow,
useMaxAvailableHeightWithParentHeight,
} from '../../hooks/useMaxAvailableHeight';
import { QUIZ_TRANSLATIONS } from '../../langs/constants';
import { getFirstOrUndefined } from '../../utils/array';
import { QuizContext } from '../context/QuizContext';
Expand Down Expand Up @@ -62,13 +58,8 @@ const AnalyticsMenu = (): JSX.Element => {
const chartContainerRef = useRef(null);
const stackElem = useRef(null);
const sideMenuElem = useRef(null);

const chartTabs = useRef(null);
const maxResultViewHeight = useMaxAvailableHeightInWindow(null);
const maxHeightScrollableMenu = useMaxAvailableHeightWithParentHeight(
maxResultViewHeight,
chartTabs.current
);

const [tab, setTab] = useState(0);

const questionById = useMemo(
Expand Down Expand Up @@ -186,23 +177,20 @@ const AnalyticsMenu = (): JSX.Element => {

return order.length > 0 ? (
responses && nValidResponses && nValidResponses > 0 ? (
<Box data-cy={ANALYTICS_CONTAINER_CY} sx={{ height: '100%' }}>
<Stack direction="row" ref={stackElem} sx={{ height: '100%' }}>
<Box data-cy={ANALYTICS_CONTAINER_CY}>
<Stack direction="row" ref={stackElem}>
<Box
ref={sideMenuElem}
sx={{
minWidth: '8em',
maxWidth: '12em',
maxHeight: maxResultViewHeight,
}}
>
<Box
sx={{
borderBottom: 1,
borderColor: 'divider',
mb: 4,
maxHeight: maxResultViewHeight / 2,
overflow: 'auto',
}}
ref={chartTabs}
>
Expand Down Expand Up @@ -235,7 +223,7 @@ const AnalyticsMenu = (): JSX.Element => {
})}
</Tabs>
</Box>
<Box sx={{ overflow: 'auto', maxHeight: maxHeightScrollableMenu }}>
<Box>
<AutoScrollableMenu
links={charts}
elemRefs={chartRefs}
Expand All @@ -248,7 +236,6 @@ const AnalyticsMenu = (): JSX.Element => {
sx={{
overflow: 'auto',
width: '100%',
height: maxResultViewHeight,
scrollBehavior: 'smooth',
}}
ref={chartContainerRef}
Expand Down
7 changes: 7 additions & 0 deletions src/components/navigation/AutoScrollableMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@ const AutoScrollableMenu = ({
}
}, [initiallyClickedId, clickOnLink]);

useEffect(() => {
const el = document.getElementById(highlightedLink);
if (el) {
el.scrollIntoView(true);
}
}, [highlightedLink]);

return (
<Stack data-cy={AUTO_SCROLLABLE_MENU_LINK_LIST_CY}>
{links?.map(({ label, id, link }) => {
Expand Down
Loading