Development to Main, week 40 #114
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…navigation-components
…mponents feature/OP-67/navigation-components
lencodes
suggested changes
Oct 9, 2023
Comment on lines
+46
to
+52
| const screenWidth = window.innerWidth; | ||
|
|
||
| React.useEffect(() => { | ||
| if (screenWidth > 992) { | ||
| setSubNavIsOpen({}); | ||
| } | ||
| }, [screenWidth]); |
There was a problem hiding this comment.
I think this is not triggering on the "right" moments. screenWidth seems to update sometimes, I think whenever the React lifecycle is triggered by some other side effect.
To accurately keep track of a screen width, we can register (and un-register when needed) a listener, like so (dummy code):
const [screenWidth, setScreenWidth] = React.useState<number | undefined>(undefined);
React.useEffect(() => {
const handleScreenResize = (e: TypeThis) => setScreenWidth(e.path_to_width);
window.addEventListener("resize", handleScreenResize); // add listener
return () => window.removeEventListener("resize", handleScreenResize) // remove listener when component is removed
}, []) // only trigger once
| @@ -26,6 +26,7 @@ export interface TopNavProps { | |||
|
|
|||
| export const PrimaryTopNav = ({ items, mobileLogo, layoutClassName }: TopNavProps): JSX.Element => { | |||
| const [isOpen, setIsOpen] = React.useState<boolean>(false); | |||
| const [subNavIsOpen, setSubNavIsOpen] = React.useState({}); | |||
There was a problem hiding this comment.
I think we should type this state, it's unclear what it's expecting.
Comment on lines
+39
to
+44
| const handleSubItemMenu = (idx: number, value: boolean) => { | ||
| setSubNavIsOpen({ | ||
| ...subNavIsOpen, | ||
| [idx as keyof typeof subNavIsOpen]: value, | ||
| }); | ||
| }; |
There was a problem hiding this comment.
This seems like a complex way to keep track of the open sub items. Previously, I think, we just let the css handle everything. Why the change?
Comment on lines
+67
to
+92
| onClick={() => | ||
| !subItems | ||
| ? handleItemClick(handleClick) | ||
| : screenWidth > 992 | ||
| ? handleItemClick(handleClick) | ||
| : handleSubItemMenu(idx, !subNavIsOpen[idx as keyof typeof subNavIsOpen] ?? true) | ||
| } | ||
| className={clsx(styles.li, current && styles.current)} | ||
| key={idx} | ||
| > | ||
| <Link className={clsx(styles.link, styles.label)}> | ||
| <Link | ||
| className={clsx( | ||
| styles.link, | ||
| styles.label, | ||
| subItems && styles.mobileLink, | ||
| current && styles.currentLink, | ||
| )} | ||
| > | ||
| {icon} | ||
| {label} | ||
| {label}{" "} | ||
| {subItems && screenWidth < 992 && ( | ||
| <FontAwesomeIcon | ||
| className={clsx(styles.toggleIcon, subNavIsOpen[idx as keyof typeof subNavIsOpen] && styles.isOpen)} | ||
| icon={faChevronRight} | ||
| /> | ||
| )} |
There was a problem hiding this comment.
I find this a bit complex, see my other comment as well.
Is this because a top-level item can have a link and have sub-items?
feature/XW-87/select-WCAG
feature/XW-87/select-WCAG
feature/XW-87/select-WCAG
feature/OP-57/pagination
feature/OP-57/pagination
…gination Revert "feature/OP-57/pagination"
…gination Revert "feature/OP-57/pagination"
…lect-WCAG Revert "feature/XW-87/select-WCAG"
…lect-WCAG Revert "feature/XW-87/select-WCAG"
…lect-WCAG Revert "feature/XW-87/select-WCAG"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.