From b951ef5ce4fe152d0e2147b38a22de09c97fc1fb Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 14 Dec 2022 13:50:51 +0900 Subject: [PATCH] Fix staff list scroll behaviors --- front/packages/primitives/src/avatar.tsx | 6 +++--- front/packages/ui/src/details/header.tsx | 9 +++------ front/packages/ui/src/details/index.tsx | 8 ++++++-- front/packages/ui/src/details/staff.tsx | 2 +- front/packages/ui/src/fetch-infinite.web.tsx | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/front/packages/primitives/src/avatar.tsx b/front/packages/primitives/src/avatar.tsx index 37fd3156..ca00a86a 100644 --- a/front/packages/primitives/src/avatar.tsx +++ b/front/packages/primitives/src/avatar.tsx @@ -36,15 +36,15 @@ export const Avatar = ({ size?: number; isLoading?: boolean; } & Stylable) => { - const { css } = useYoshiki(); + const { css, theme } = useYoshiki(); if (isLoading) return ; return ( - + {src ? ( {alt} ) : ( - + )} ); diff --git a/front/packages/ui/src/details/header.tsx b/front/packages/ui/src/details/header.tsx index 5e6453f5..2c805393 100644 --- a/front/packages/ui/src/details/header.tsx +++ b/front/packages/ui/src/details/header.tsx @@ -22,7 +22,6 @@ import { Movie, QueryIdentifier, Show, getDisplayDate, Genre, Studio } from "@ky import { Container, H1, - Main, ImageBackground, Skeleton, Poster, @@ -39,10 +38,9 @@ import { A, ts, } from "@kyoo/primitives"; -import { ScrollView } from "moti"; import { Fragment } from "react"; import { useTranslation } from "react-i18next"; -import { StyleSheet, View } from "react-native"; +import { View } from "react-native"; import { Theme, md, @@ -57,7 +55,6 @@ import { Stylable, } from "yoshiki/native"; import { Fetch } from "../fetch"; -import { Navbar } from "../navbar"; const TitleLine = ({ isLoading, @@ -283,7 +280,7 @@ export const Header = ({ query, slug }: { query: QueryIdentifier; return ( {({ isLoading, ...data }) => ( - + <> ; genres={data?.genres} {...css({ paddingTop: { xs: 0, md: ts(2) } })} /> - + )} ); diff --git a/front/packages/ui/src/details/index.tsx b/front/packages/ui/src/details/index.tsx index b416124a..734ac867 100644 --- a/front/packages/ui/src/details/index.tsx +++ b/front/packages/ui/src/details/index.tsx @@ -19,6 +19,8 @@ */ import { Movie, MovieP, QueryIdentifier, QueryPage } from "@kyoo/models"; +import { Platform, ScrollView } from "react-native"; +import { useYoshiki } from "yoshiki/native"; import { TransparentLayout } from "../layout"; import { Header } from "./header"; import { Staff } from "./staff"; @@ -32,11 +34,13 @@ const query = (slug: string): QueryIdentifier => ({ }); export const MovieDetails: QueryPage<{ slug: string }> = ({ slug }) => { + const { css } = useYoshiki(); + return ( - <> +
- + ); }; diff --git a/front/packages/ui/src/details/staff.tsx b/front/packages/ui/src/details/staff.tsx index 3a80db4a..b55a3e57 100644 --- a/front/packages/ui/src/details/staff.tsx +++ b/front/packages/ui/src/details/staff.tsx @@ -32,7 +32,7 @@ export const Staff = ({ slug }: { slug: string }) => { {/* */} diff --git a/front/packages/ui/src/fetch-infinite.web.tsx b/front/packages/ui/src/fetch-infinite.web.tsx index 4d40682d..72881fc3 100644 --- a/front/packages/ui/src/fetch-infinite.web.tsx +++ b/front/packages/ui/src/fetch-infinite.web.tsx @@ -60,7 +60,7 @@ const InfiniteScroll = ({ { display: "flex", alignItems: "flex-start", - overflow: "overlay", + overflow: "auto", }, layout == "vertical" && { flexDirection: "column",