From 1bba1eb02af0b0fd12e888af5eed7c0e93bc07de Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Thu, 26 Jan 2023 18:55:09 +0900
Subject: [PATCH] Make subtitle's menu work on tv

---
 front/packages/primitives/src/menu.tsx        | 44 +++++++++++++------
 front/packages/primitives/src/menu.web.tsx    | 21 +++++----
 front/packages/primitives/src/type.ts         | 21 ---------
 .../src/player/components/right-buttons.tsx   |  3 --
 4 files changed, 40 insertions(+), 49 deletions(-)
 delete mode 100644 front/packages/primitives/src/type.ts

diff --git a/front/packages/primitives/src/menu.tsx b/front/packages/primitives/src/menu.tsx
index 0bdeb5b2..05ef65cb 100644
--- a/front/packages/primitives/src/menu.tsx
+++ b/front/packages/primitives/src/menu.tsx
@@ -21,8 +21,8 @@
 import { Portal } from "@gorhom/portal";
 import { ScrollView } from "moti";
 import { ComponentType, createContext, ReactNode, useContext, useEffect, useState } from "react";
-import { StyleSheet, Pressable } from "react-native";
-import { percent, px, sm, useYoshiki, xl } from "yoshiki/native";
+import { StyleSheet, Pressable, Platform, BackHandler } from "react-native";
+import { min, percent, px, sm, Theme, useYoshiki, vh, xl } from "yoshiki/native";
 import Close from "@material-symbols/svg-400/rounded/close-fill.svg";
 import { Icon, IconButton } from "./icons";
 import { PressableFeedback } from "./links";
@@ -52,6 +52,15 @@ const Menu = <AsProps,>({
 		else onMenuClose?.call(null);
 	}, [isOpen, onMenuClose, onMenuOpen]);
 
+	useEffect(() => {
+		const handler = BackHandler.addEventListener("hardwareBackPress", () => {
+			if (!isOpen) return false;
+			setOpen(false);
+			return true;
+		});
+		return () => handler.remove();
+	}, [isOpen]);
+
 	return (
 		<>
 			{/* @ts-ignore */}
@@ -75,28 +84,26 @@ const Menu = <AsProps,>({
 											width: percent(100),
 											alignSelf: "center",
 											borderTopLeftRadius: px(26),
-											borderTopRightRadius: { xs: px(26), xl: 0 },
-											paddingTop: { xs: px(26), xl: 0 },
-											marginTop: { xs: px(72), xl: 0 },
+											borderTopRightRadius: px(26),
+											paddingTop: px(26),
+											marginTop: px(72),
 										},
 										sm({
 											maxWidth: px(640),
 											marginHorizontal: px(56),
 										}),
-										xl({
+										Platform.isTV && {
 											top: 0,
 											right: 0,
 											marginRight: 0,
 											borderBottomLeftRadius: px(26),
-										}),
+											maxWidth: min(px(640), vh(45)),
+											marginHorizontal: px(56),
+											borderTopRightRadius: 0,
+											marginTop: 0,
+										},
 									])}
 								>
-									<IconButton
-										icon={Close}
-										color={theme.colors.black}
-										onPress={() => setOpen(false)}
-										{...css({ alignSelf: "flex-end", display: { xs: "none", xl: "flex" } })}
-									/>
 									{children}
 								</ScrollView>
 							</MenuContext.Provider>
@@ -127,6 +134,7 @@ const MenuItem = ({
 				setOpen?.call(null, false);
 				onSelect?.call(null);
 			}}
+			hasTVPreferredFocus={selected}
 			{...css(
 				{
 					paddingHorizontal: ts(2),
@@ -134,12 +142,20 @@ const MenuItem = ({
 					height: ts(5),
 					alignItems: "center",
 					flexDirection: "row",
+					focus: {
+						self: {
+							bg: (theme: Theme) => theme.alternate.accent,
+						},
+						// text: {
+						// 	color: (theme: Theme) => theme.alternate.contrast,
+						// },
+					},
 				},
 				props as any,
 			)}
 		>
 			{selected && <Icon icon={Check} color={theme.paragraph} size={24} />}
-			<P {...css({ paddingLeft: ts(2) + +!selected * px(24) })}>{label}</P>
+			<P {...css(["text", { paddingLeft: ts(2) + +!selected * px(24) }])}>{label}</P>
 		</PressableFeedback>
 	);
 };
diff --git a/front/packages/primitives/src/menu.web.tsx b/front/packages/primitives/src/menu.web.tsx
index d3c26e07..bcd39546 100644
--- a/front/packages/primitives/src/menu.web.tsx
+++ b/front/packages/primitives/src/menu.web.tsx
@@ -27,6 +27,7 @@ import { P } from "./text";
 import { ContrastArea } from "./themes";
 import { Icon } from "./icons";
 import Dot from "@material-symbols/svg-400/rounded/fiber_manual_record-fill.svg";
+import { focusReset } from "./utils";
 
 type YoshikiFunc<T> = (props: ReturnType<typeof useYoshiki>) => T;
 const YoshikiProvider = ({ children }: { children: YoshikiFunc<ReactNode> }) => {
@@ -115,18 +116,16 @@ const MenuItem = ({
 			<DropdownMenu.Item
 				onSelect={onSelect}
 				{...css(
-					[
-						{
-							display: "flex",
-							alignItems: "center",
-							padding: "8px",
-							height: "32px",
-							color: (theme) => theme.paragraph,
-							focus: {
-								boxShadow: "none",
-							},
+					{
+						display: "flex",
+						alignItems: "center",
+						padding: "8px",
+						height: "32px",
+						color: (theme) => theme.paragraph,
+						focus: {
+							self: focusReset,
 						},
-					],
+					},
 					props as any,
 				)}
 			>
diff --git a/front/packages/primitives/src/type.ts b/front/packages/primitives/src/type.ts
deleted file mode 100644
index 85d1bb1b..00000000
--- a/front/packages/primitives/src/type.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Kyoo - A portable and vast media library solution.
- * Copyright (c) Kyoo.
- *
- * See AUTHORS.md and LICENSE file in the project root for full license information.
- *
- * Kyoo is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * Kyoo is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import "react-native/tvos-types.d";
diff --git a/front/packages/ui/src/player/components/right-buttons.tsx b/front/packages/ui/src/player/components/right-buttons.tsx
index 78679f20..281bad75 100644
--- a/front/packages/ui/src/player/components/right-buttons.tsx
+++ b/front/packages/ui/src/player/components/right-buttons.tsx
@@ -28,11 +28,8 @@ import ClosedCaption from "@material-symbols/svg-400/rounded/closed_caption-fill
 import Fullscreen from "@material-symbols/svg-400/rounded/fullscreen-fill.svg";
 import FullscreenExit from "@material-symbols/svg-400/rounded/fullscreen_exit-fill.svg";
 import { Stylable, useYoshiki } from "yoshiki/native";
-import { createParam } from "solito";
 import { fullscreenAtom, subtitleAtom } from "../state";
 
-const { useParam } = createParam<{ subtitle?: string }>();
-
 export const RightButtons = ({
 	subtitles,
 	fonts,