From 977e433dd93eb8c5e48bd60857222464a068a45a Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Wed, 5 Jan 2022 15:17:38 -0500 Subject: [PATCH] ISSUE-013 - Refactored the method that isActive and isHovered work for the MainMenu nav buttons. --- src/components/Menu/Menu.tsx | 83 +++++++++++++++++++++-------------- src/components/Menu/styles.ts | 22 ++++------ 2 files changed, 58 insertions(+), 47 deletions(-) diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx index 31e6b9f..5241e18 100644 --- a/src/components/Menu/Menu.tsx +++ b/src/components/Menu/Menu.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { NavLink } from "react-router-dom"; +import { Link, NavLink } from "react-router-dom"; import { InlineCluster } from "@bedrock-layout/inline-cluster"; import useForwardedRef from "@bedrock-layout/use-forwarded-ref"; @@ -9,54 +9,44 @@ import f1Logo from "../../public/images/logos/f1-logo-red.svg"; export const MainMenu = React.forwardRef( (_, ref) => ( - - Home - Broadcast Page - + ), ); MainMenu.displayName = "MainMenu"; type MenuProps = { - children: React.ReactNode, + links: Array<{label: string, to: string}>, title: string, }; -export const Menu = React.forwardRef( +const Menu = React.forwardRef( (props, ref) => { const innerRef = useForwardedRef(ref); - const childrenArray = React.Children.toArray(props.children); - const [hovered, setHovered] = useState(-1); - const [active, setActive] = useState(-1); - - const hackIsActive = (i: number) => ({ isActive }: { isActive: boolean}) => { - if (isActive) setActive(i); - return ""; - }; - - // Insert mouse event props to these children. - const newChildren = childrenArray.map((child, i) => { - if (React.isValidElement(child)) { - return React.cloneElement(child, { - onMouseEnter: () => setHovered(i), - onMouseLeave: () => setHovered(-1), - className: hackIsActive(i), - }); - } - return child; - }); + const [hoveredIndex, setHoveredIndex] = useState(-1); return ( - Formula One logo + + Formula One logo + {props.title} @@ -65,3 +55,30 @@ export const Menu = React.forwardRef( }, ); Menu.displayName = "Menu"; + +type MenuNavLinkProps = { + to: string, + label: string, + isHovered: boolean, + onMouseLeave?: () => void, + onMouseEnter?: () => void, +}; +const MenuNavLink = ({ to, label, isHovered, onMouseLeave, onMouseEnter }: MenuNavLinkProps) => ( +
  • + + {({ isActive }) => ( + + {label} + + )} + +
  • +); diff --git a/src/components/Menu/styles.ts b/src/components/Menu/styles.ts index 4849b8c..ea35d5e 100644 --- a/src/components/Menu/styles.ts +++ b/src/components/Menu/styles.ts @@ -18,29 +18,23 @@ export const MenuBar = styled(InlineCluster).attrs(() => ({ `; type MenuItemProps = { - hovered?: boolean, - active?: boolean, + isHovered?: boolean, + isActive?: boolean, }; export const MenuItem = styled(PadBox).attrs(() => ({ - as: "li", padding: ["sm", "lg"], }))` border-radius: 0.25rem; - > a { - color: ${p => p.theme.colors.darkGrey}; - text-decoration: none; - font-family: ${p => p.theme.fonts.f1Regular}; - font-size: 0.8em; - } + color: ${p => p.theme.colors.darkGrey}; + font-family: ${p => p.theme.fonts.f1Regular}; + font-size: 0.8em; - ${({ active }) => active && css` + ${({ isActive }) => isActive && css` background: ${p => p.theme.colors.lightGrey}; `} - ${({ hovered }) => hovered && css` + ${({ isHovered }) => isHovered && css` background: ${p => p.theme.colors.darkGrey}; - > a { - color: white; - } + color: white; `} `;