diff --git a/package.json b/package.json
index e53b32c..99ba838 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"react-dom": "^17.0.2",
"react-router-dom": "6",
"react-scripts": "5.0.0",
+ "resize-observer-polyfill": "^1.5.1",
"styled-components": "^5.3.3",
"typescript": "^4.4.2",
"web-vitals": "^2.1.0"
diff --git a/src/App.tsx b/src/App.tsx
index 6f731a4..3021702 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,16 +1,11 @@
-import { Outlet, Link } from "react-router-dom";
+import { Outlet } from "react-router-dom";
-import { Menu } from "./components/Menu";
+import { MainMenu } from "./components/Menu";
function App() {
return (
-
+
);
diff --git a/src/components/Common/Nav.styled.ts b/src/components/Common/Nav.styled.ts
deleted file mode 100644
index c828f17..0000000
--- a/src/components/Common/Nav.styled.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from "styled-components";
-
-export const Nav = styled.nav`
- border-bottom: solid 1px;
- padding-bottom: 1rem;
- padding-left: 1rem;
-`;
-Nav.displayName = "Nav";
diff --git a/src/components/Common/RouteHeader/RouteHeader.tsx b/src/components/Common/RouteHeader/RouteHeader.tsx
deleted file mode 100644
index 3f42a2c..0000000
--- a/src/components/Common/RouteHeader/RouteHeader.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from "react";
-import { HeaderBar } from "./styles";
-
-type RouteHeaderProps = {
- title: string,
-};
-
-export const RouteHeader = React.forwardRef(
- (props, ref) => (
-
- {props.title}
-
- ),
-);
-RouteHeader.displayName = "RouteHeader"; // Required due to forwardRef().
-
diff --git a/src/components/Common/RouteHeader/index.ts b/src/components/Common/RouteHeader/index.ts
deleted file mode 100644
index 3c77bbe..0000000
--- a/src/components/Common/RouteHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./RouteHeader";
diff --git a/src/components/Common/RouteHeader/styles.ts b/src/components/Common/RouteHeader/styles.ts
deleted file mode 100644
index 64a9439..0000000
--- a/src/components/Common/RouteHeader/styles.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import styled from "styled-components";
-
-export const HeaderBar = styled.header`
- top: 0;
- left: 0;
- right: 0;
- z-index: 5;
- padding: 0 0.3em;
- background-color: ${p => p.theme.colors.grey};
- height: 20px;
- font-family: ${p => p.theme.fonts.accent};
- font-size: 0.8em;
-`;
-HeaderBar.displayName = "HeaderBar";
diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx
index adba3c6..94f2988 100644
--- a/src/components/Menu/Menu.tsx
+++ b/src/components/Menu/Menu.tsx
@@ -1,29 +1,43 @@
-import { FC, Children } from "react";
+import React, { Children } from "react";
+import { Link } from "react-router-dom";
import { InlineCluster } from "@bedrock-layout/inline-cluster";
+import useForwardedRef from "@bedrock-layout/use-forwarded-ref";
import { MenuBar, MenuItem } from "./styles";
import f1Logo from "../../public/images/logos/f1-logo-red.svg";
+export const MainMenu = React.forwardRef(
+ (_, ref) => (
+
+ ),
+);
+MainMenu.displayName = "MainMenu";
+
type MenuProps = {
+ children: React.ReactNode,
title: string,
};
-export const Menu: FC = ({
- title,
- children,
-}) => {
- const childrenArray = Children.toArray(children);
- return (
-
-
- {title}
-
-
- );
-};
+export const Menu = React.forwardRef(
+ (props, ref) => {
+ const innerRef = useForwardedRef(ref);
+ const childrenArray = Children.toArray(props.children);
+ return (
+
+
+ {props.title}
+
+
+ );
+ },
+);
+Menu.displayName = "Menu";
diff --git a/src/components/Menu/styles.ts b/src/components/Menu/styles.ts
index 56d1e31..722c1e7 100644
--- a/src/components/Menu/styles.ts
+++ b/src/components/Menu/styles.ts
@@ -10,7 +10,7 @@ export const MenuBar = styled(InlineCluster).attrs(() => ({
align: "center",
}))`
background-image: linear-gradient(to right, #f0f0f0, #fff);
- border-block-end: 1px solid #303030;
+ border-block-end: 1px solid ${p => p.theme.colors.darkGrey};
`;
type MenuItemProps = {
@@ -22,12 +22,12 @@ export const MenuItem = styled(PadBox).attrs(() => ({
})) `
border-radius: 0.25rem;
> a {
- color: #333;
+ color: ${p => p.theme.colors.darkGrey};
text-decoration: none;
font-weight: 900;
}
:hover {
- background: #303030;
+ background: ${p => p.theme.colors.darkGrey};
> a {
color: white;
}
diff --git a/src/index.tsx b/src/index.tsx
index 6722ea9..60f5c1f 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -3,8 +3,7 @@ import ReactDOM from "react-dom";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import { ThemeProvider } from "styled-components";
-// import "./index.css";
-// import "./clear.css";
+import "./clear.css";
import App from "./App";
import Broadcast from "./routes/BroadcastRoute";
diff --git a/src/routes/BroadcastRoute.tsx b/src/routes/BroadcastRoute.tsx
index 7e519cc..8cdfbce 100644
--- a/src/routes/BroadcastRoute.tsx
+++ b/src/routes/BroadcastRoute.tsx
@@ -1,21 +1,14 @@
-import { useEffect, useRef, useState } from "react";
-
import { FullScreenContainer } from "./styles";
import { Layout } from "../components/Broadcast/Layout";
-import { RouteHeader } from "../components/Common/RouteHeader";
+import { MainMenu } from "../components/Menu";
+import { useDimensions } from "../utils/hooks";
export default function Broadcast() {
- const [height, setHeight] = useState(0);
- const ref = useRef < HTMLHeadElement>(null);
-
- useEffect(() => {
- if (ref?.current != null)
- setHeight(ref.current.clientHeight);
- });
+ const [ref, { height }] = useDimensions();
return (
-
+
);
diff --git a/src/shared/theme.ts b/src/shared/theme.ts
index fabe5b5..0017c16 100644
--- a/src/shared/theme.ts
+++ b/src/shared/theme.ts
@@ -10,6 +10,7 @@ export const theme = {
blue: "#387af5",
pink: "#eb57a3",
grey: "#aaa",
+ darkGrey: "#303030",
videoFrameBG: "#333",
},
};
diff --git a/src/utils/hooks.ts b/src/utils/hooks.ts
new file mode 100644
index 0000000..2c5652a
--- /dev/null
+++ b/src/utils/hooks.ts
@@ -0,0 +1,34 @@
+import React, { useEffect, useRef, useState } from "react";
+import ResizeObserver from "resize-observer-polyfill";
+
+export const useDimensions = () => {
+ const ref = useRef(null);
+ const [width, setWidth] = useState(0);
+ const [height, setHeight] = useState(0);
+
+ useEffect(() => {
+ const element = ref.current;
+ if (element == null) return;
+ const resizeObserver = new ResizeObserver(entries => {
+ if (!Array.isArray(entries)) return;
+ if (!entries.length) return;
+
+ const entry = entries[0];
+ const boundingRect = entry.target.getBoundingClientRect();
+ if (width !== boundingRect.width) setWidth(boundingRect.width);
+ if (height !== boundingRect.height) setHeight(boundingRect.height);
+ });
+ resizeObserver.observe(element);
+
+ return () => resizeObserver.unobserve(element);
+ }, [height, width]);
+
+ // Returning correctly with generics apparently requires type def here.
+ return [
+ ref,
+ { width, height },
+ ] as [
+ React.RefObject,
+ { height: number, width: number },
+ ];
+};
diff --git a/yarn.lock b/yarn.lock
index b514882..f5326c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7803,6 +7803,11 @@ requires-port@^1.0.0:
resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+resize-observer-polyfill@^1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+ integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
resolve-cwd@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"