From a74e9aa34115fb62cc7e60ee2e8b9bc0f5c2ac93 Mon Sep 17 00:00:00 2001
From: Brendan Allan <brendonovich@outlook.com>
Date: Sun, 13 Aug 2023 10:27:42 -0700
Subject: [PATCH] Store portal elements as state instead of refs (#1212)

i :heart: dan abramov
---
 .../Explorer/QuickPreview/Context.tsx         |  8 ++---
 .../app/$libraryId/Explorer/View/index.tsx    |  3 +-
 interface/app/$libraryId/TopBar/Layout.tsx    | 12 +++----
 interface/app/$libraryId/TopBar/Portal.tsx    | 10 ++----
 interface/app/$libraryId/TopBar/index.tsx     | 32 +++++++++----------
 5 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/interface/app/$libraryId/Explorer/QuickPreview/Context.tsx b/interface/app/$libraryId/Explorer/QuickPreview/Context.tsx
index 2326bb9de..2c05bef4d 100644
--- a/interface/app/$libraryId/Explorer/QuickPreview/Context.tsx
+++ b/interface/app/$libraryId/Explorer/QuickPreview/Context.tsx
@@ -1,18 +1,18 @@
-import { PropsWithChildren, RefObject, createContext, useContext, useRef } from 'react';
+import { PropsWithChildren, createContext, useContext, useState } from 'react';
 
 interface QuickPreviewContext {
-	ref: RefObject<HTMLDivElement>;
+	ref: HTMLDivElement | null;
 }
 
 const QuickPreviewContext = createContext<QuickPreviewContext | null>(null);
 
 export const QuickPreviewContextProvider = ({ children }: PropsWithChildren) => {
-	const ref = useRef<HTMLDivElement>(null);
+	const [ref, setRef] = useState<HTMLDivElement | null>(null);
 
 	return (
 		<QuickPreviewContext.Provider value={{ ref }}>
 			{children}
-			<div ref={ref} />
+			<div ref={setRef} />
 		</QuickPreviewContext.Provider>
 	);
 };
diff --git a/interface/app/$libraryId/Explorer/View/index.tsx b/interface/app/$libraryId/Explorer/View/index.tsx
index f3f8638e4..fe31a45ec 100644
--- a/interface/app/$libraryId/Explorer/View/index.tsx
+++ b/interface/app/$libraryId/Explorer/View/index.tsx
@@ -172,8 +172,7 @@ export default memo(
 					)}
 				</div>
 
-				{quickPreviewCtx.ref.current &&
-					createPortal(<QuickPreview />, quickPreviewCtx.ref.current)}
+				{quickPreviewCtx.ref && createPortal(<QuickPreview />, quickPreviewCtx.ref)}
 			</>
 		);
 	}
diff --git a/interface/app/$libraryId/TopBar/Layout.tsx b/interface/app/$libraryId/TopBar/Layout.tsx
index 6105ef2ec..d74e36a29 100644
--- a/interface/app/$libraryId/TopBar/Layout.tsx
+++ b/interface/app/$libraryId/TopBar/Layout.tsx
@@ -1,21 +1,21 @@
-import { RefObject, createContext, useContext, useRef } from 'react';
+import { createContext, useContext, useState } from 'react';
 import { Outlet } from 'react-router';
 import TopBar from '.';
 
 interface TopBarContext {
-	left: RefObject<HTMLDivElement>;
-	right: RefObject<HTMLDivElement>;
+	left: HTMLDivElement | null;
+	right: HTMLDivElement | null;
 }
 
 const TopBarContext = createContext<TopBarContext | null>(null);
 
 export const Component = () => {
-	const left = useRef<HTMLDivElement>(null);
-	const right = useRef<HTMLDivElement>(null);
+	const [left, setLeft] = useState<HTMLDivElement | null>(null);
+	const [right, setRight] = useState<HTMLDivElement | null>(null);
 
 	return (
 		<TopBarContext.Provider value={{ left, right }}>
-			<TopBar leftRef={left} rightRef={right} />
+			<TopBar leftRef={setLeft} rightRef={setRight} />
 			<Outlet />
 		</TopBarContext.Provider>
 	);
diff --git a/interface/app/$libraryId/TopBar/Portal.tsx b/interface/app/$libraryId/TopBar/Portal.tsx
index 550b74c9c..0fbd733e0 100644
--- a/interface/app/$libraryId/TopBar/Portal.tsx
+++ b/interface/app/$libraryId/TopBar/Portal.tsx
@@ -2,17 +2,13 @@ import { ReactNode } from 'react';
 import { createPortal } from 'react-dom';
 import { useTopBarContext } from './Layout';
 
-interface Props {
-	left?: ReactNode;
-	right?: ReactNode;
-}
-export const TopBarPortal = ({ left, right }: Props) => {
+export const TopBarPortal = (props: { left?: ReactNode; right?: ReactNode }) => {
 	const ctx = useTopBarContext();
 
 	return (
 		<>
-			{left && ctx.left.current && createPortal(left, ctx.left.current)}
-			{right && ctx.right.current && createPortal(right, ctx.right.current)}
+			{props.left && ctx.left && createPortal(props.left, ctx.left)}
+			{props.right && ctx.right && createPortal(props.right, ctx.right)}
 		</>
 	);
 };
diff --git a/interface/app/$libraryId/TopBar/index.tsx b/interface/app/$libraryId/TopBar/index.tsx
index 551e3fbb3..95bae6bf8 100644
--- a/interface/app/$libraryId/TopBar/index.tsx
+++ b/interface/app/$libraryId/TopBar/index.tsx
@@ -1,33 +1,31 @@
-import { RefObject } from 'react';
+import { Ref } from 'react';
 import { NavigationButtons } from './NavigationButtons';
 import SearchBar from './SearchBar';
 
 export const TOP_BAR_HEIGHT = 46;
 
 interface Props {
-	leftRef?: RefObject<HTMLDivElement>;
-	rightRef?: RefObject<HTMLDivElement>;
+	leftRef?: Ref<HTMLDivElement>;
+	rightRef?: Ref<HTMLDivElement>;
 }
 
-const TopBar = (props: Props) => {
-	return (
-		<div
-			data-tauri-drag-region
-			className="
+const TopBar = (props: Props) => (
+	<div
+		data-tauri-drag-region
+		className="
 				duration-250 top-bar-blur absolute left-0 top-0 z-50 flex
 				h-[46px] w-full flex-row items-center justify-center overflow-hidden
 				border-b border-sidebar-divider bg-app/90 px-3.5
 				transition-[background-color,border-color] ease-out
 			"
-		>
-			<div data-tauri-drag-region className="flex flex-1 flex-row items-center">
-				<NavigationButtons />
-				<div ref={props.leftRef} />
-			</div>
-			<SearchBar />
-			<div className="flex-1" ref={props.rightRef} />
+	>
+		<div data-tauri-drag-region className="flex flex-1 flex-row items-center">
+			<NavigationButtons />
+			<div ref={props.leftRef} />
 		</div>
-	);
-};
+		<SearchBar />
+		<div className="flex-1" ref={props.rightRef} />
+	</div>
+);
 
 export default TopBar;