-
Notifications
You must be signed in to change notification settings - Fork 896
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Begin work on scroll buttons Wire up scroll buttons Only show scroll buttons on hover Clean up discover page Popular sources should use carousel Button opacity transitions Work when the container shrinks Begin work on pages Linking Improve perf Get link to align nicely Popular page Page headers localize Keep settings open on back pressed
- Loading branch information
1 parent
f3bac66
commit 4792000
Showing
14 changed files
with
312 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
components/brave_new_tab_ui/components/default/braveToday/customize/Carousel.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| // Copyright (c) 2022 The Brave Authors. All rights reserved. | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| // you can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| import * as React from 'react' | ||
| import styled, { css } from 'styled-components' | ||
| import Flex from '../../../Flex' | ||
| import FeedCard from './FeedCard' | ||
| import { ArrowRight } from './Icons' | ||
|
|
||
| const CARD_SIZE = 208 | ||
| const CARD_SIZE_PX = `${CARD_SIZE}px` | ||
| const CARD_GAP = '16px' | ||
|
|
||
| const ScrollButton = styled.button<{ hidden: boolean }>` | ||
| all: unset; | ||
| position: absolute; | ||
| width: 32px; | ||
| height: 32px; | ||
| top: 32px; | ||
| background: white; | ||
| border-radius: 32px; | ||
| box-shadow: 0px 1px 4px rgba(63, 76, 99, 0.35); | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| color: var(--text2); | ||
| cursor: pointer; | ||
| :hover { | ||
| box-shadow: 0px 1px 4px rgba(63, 76, 99, 0.5); | ||
| color: var(--interactive4); | ||
| } | ||
| ${p => p.hidden && css`opacity: 0;`} | ||
| transition: opacity 0.2s ease-in-out, color 0.2s ease-in-out; | ||
| ` | ||
|
|
||
| const ScrollButtonLeft = styled(ScrollButton)` | ||
| left: -16px; | ||
| transform: rotate(180deg); | ||
| ` | ||
|
|
||
| const ScrollButtonRight = styled(ScrollButton)` | ||
| right: -16px; | ||
| ` | ||
|
|
||
| const Container = styled(Flex)` | ||
| padding: 16px 0; | ||
| max-width: calc(${CARD_SIZE_PX} * 3 + ${CARD_GAP} * 2); | ||
| container-name: carousel; | ||
| container-type: inline-size; | ||
| &:not(:hover, :has(:focus-visible)) ${ScrollButton} { | ||
| opacity: 0; | ||
| } | ||
| ` | ||
|
|
||
| const Header = styled.div` | ||
| width: 100%; | ||
| font-weight: 600; | ||
| font-size: 16px; | ||
| margin: 8px 0; | ||
| ` | ||
|
|
||
| const Subtitle = styled.span` | ||
| font-size: 12px; | ||
| ` | ||
|
|
||
| const CarouselContainer = styled.div` | ||
| position: relative; | ||
| ` | ||
|
|
||
| const ItemsContainer = styled(Flex)` | ||
| margin: 8px 0; | ||
| overflow-x: auto; | ||
| scroll-snap-type: x mandatory; | ||
| &::-webkit-scrollbar { | ||
| display: none; | ||
| width: 0; | ||
| } | ||
| ` | ||
|
|
||
| const FeedCardContainer = styled.div` | ||
| min-width: calc((100cqi - ${CARD_GAP} * 2) / 3); | ||
| max-width: ${CARD_SIZE_PX}; | ||
| scroll-snap-align: start; | ||
| ` | ||
|
|
||
| interface Props { | ||
| title: string | JSX.Element | ||
| subtitle?: React.ReactNode | ||
| publisherIds: string[] | ||
| } | ||
|
|
||
| export default function Carousel (props: Props) { | ||
| const scrollContainerRef = React.useRef<HTMLDivElement>() | ||
| const [availableDirections, setAvailableDirections] = React.useState<'none' | 'left' | 'right' | 'both'>('right') | ||
| const updateAvailableDirections = React.useCallback(() => { | ||
| if (!scrollContainerRef.current) return | ||
|
|
||
| const end = scrollContainerRef.current.scrollWidth - scrollContainerRef.current.clientWidth | ||
| const scrollPos = scrollContainerRef.current.scrollLeft | ||
| if (end <= 0) { | ||
| setAvailableDirections('none') | ||
| } else if (end > scrollPos && scrollPos > 0) { | ||
| setAvailableDirections('both') | ||
| } else if (end > scrollPos) { | ||
| setAvailableDirections('right') | ||
| } else { | ||
| setAvailableDirections('left') | ||
| } | ||
| }, []) | ||
|
|
||
| const scroll = React.useCallback((dir: 'left' | 'right') => { | ||
| if (!scrollContainerRef.current) return | ||
|
|
||
| scrollContainerRef.current.scrollBy({ | ||
| behavior: 'smooth', | ||
| left: CARD_SIZE * (dir === 'left' ? -1 : 1) | ||
| }) | ||
| }, []) | ||
|
|
||
| return ( | ||
| <Container direction='column'> | ||
| <Flex direction='row' gap={8} align='center'> | ||
| <Header>{props.title}</Header> | ||
| </Flex> | ||
| {props.subtitle && <Subtitle> | ||
| {props.subtitle} | ||
| </Subtitle>} | ||
| <CarouselContainer> | ||
| <ItemsContainer direction='row' gap={CARD_GAP} ref={scrollContainerRef as any} onScroll={updateAvailableDirections}> | ||
| {props.publisherIds.map(p => <FeedCardContainer key={p}> | ||
| <FeedCard publisherId={p}/> | ||
| </FeedCardContainer>)} | ||
| </ItemsContainer> | ||
| <ScrollButtonLeft onClick={() => scroll('left')} hidden={availableDirections === 'right' || availableDirections === 'none'}> | ||
| {ArrowRight} | ||
| </ScrollButtonLeft> | ||
| <ScrollButtonRight onClick={() => scroll('right')} hidden={availableDirections === 'left' || availableDirections === 'none'}> | ||
| {ArrowRight} | ||
| </ScrollButtonRight> | ||
| </CarouselContainer> | ||
| </Container> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
components/brave_new_tab_ui/components/default/braveToday/customize/CustomizeLink.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import styled from 'styled-components' | ||
|
|
||
| const CustomizeLink = styled.button` | ||
| all: unset; | ||
| font-weight: 600; | ||
| font-size: 12px; | ||
| line-height: 18px; | ||
| color: var(--interactive5); | ||
| cursor: pointer; | ||
| ` | ||
| export default CustomizeLink |
53 changes: 53 additions & 0 deletions
53
components/brave_new_tab_ui/components/default/braveToday/customize/CustomizePage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import * as React from 'react' | ||
| import styled from 'styled-components' | ||
| import { getLocale } from '../../../../../common/locale' | ||
| import Button from '../../../../../web-components/button' | ||
| import Flex from '../../../Flex' | ||
| import { useBraveNews } from './Context' | ||
| import { BackArrow } from './Icons' | ||
|
|
||
| const BackButtonContainer = styled.div` | ||
| all: unset; | ||
| flex: 1; | ||
| &> button { | ||
| --inner-border-size: 0; | ||
| --outer-border-size: 0; | ||
| padding: 0; | ||
| &:hover { | ||
| --inner-border-size: 0; | ||
| --outer-border-size: 0; | ||
| } | ||
| } | ||
| ` | ||
|
|
||
| const Header = styled.span` | ||
| font-weight: 500; | ||
| font-size: 16px; | ||
| color: var(--text01); | ||
| flex: 5; | ||
| text-align: center; | ||
| ` | ||
|
|
||
| const Spacer = styled.div`flex: 1;` | ||
|
|
||
| export default function CustomizePage (props: { | ||
| title: string | ||
| children: React.ReactNode | ||
| }) { | ||
| const { setCustomizePage } = useBraveNews() | ||
| return <Flex direction="column"> | ||
| <Flex align="center"> | ||
| <BackButtonContainer> | ||
| <Button onClick={() => setCustomizePage('news')}> | ||
| {BackArrow} | ||
| {getLocale('braveNewsBackButton')} | ||
| </Button> | ||
| </BackButtonContainer> | ||
| <Header>{props.title}</Header> | ||
| <Spacer /> | ||
| </Flex> | ||
| {props.children} | ||
| </Flex> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.