Optimized the new Welcome UI and style fixes #16164
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
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,26 +5,34 @@ | |
|
|
||
| import * as React from 'react' | ||
| import * as S from './style' | ||
| import classnames from '$web-common/classnames' | ||
|
|
||
| import WebAnimationPlayer from '../../api/web_animation_player' | ||
| import DataContext from '../../state/context' | ||
| import { shouldPlayAnimations } from '../../state/hooks' | ||
|
|
||
| import Stars01 from '../svg/stars01' | ||
| import Stars02 from '../svg/stars02' | ||
| import Stars03 from '../svg/stars03' | ||
| import Stars04 from '../svg/stars04' | ||
| import fullCompositeBgUrl from '../../assets/[email protected]' | ||
| import skyBgUrl from '../../assets/sky.webp' | ||
|
|
||
| interface BackgroundProps { | ||
| children?: JSX.Element | ||
| static: boolean | ||
| onLoad?: () => void | ||
| } | ||
|
|
||
| function Background (props: BackgroundProps) { | ||
| const ref = React.useRef<HTMLDivElement>(null) | ||
| const { setScenes } = React.useContext(DataContext) | ||
| const [hasLoaded, setHasLoaded] = React.useState(false) | ||
| const isReadyForAnimation = hasLoaded && !props.static | ||
|
|
||
| React.useEffect(() => { | ||
| if (!ref.current) return | ||
| if (!isReadyForAnimation) return | ||
|
|
||
| const s1 = new WebAnimationPlayer() | ||
| const s2 = new WebAnimationPlayer() | ||
|
|
@@ -55,43 +63,66 @@ function AnimatedBackground (props: { children?: JSX.Element }) { | |
| .to(stars04, { transform: 'scale(1.5)' }) | ||
|
|
||
| setScenes({ s1, s2 }) | ||
| }, [isReadyForAnimation]) | ||
|
|
||
| React.useEffect(() => { | ||
| if (!ref.current) return | ||
| if (!isReadyForAnimation) return | ||
|
|
||
| const s1 = new WebAnimationPlayer() | ||
| const starsContainer = ref.current.querySelector('.stars-container') | ||
| const hillsContainer = ref.current.querySelector('.hills-container') | ||
|
|
||
| s1.to(starsContainer, { opacity: 1 }, { delay: 250 }) | ||
| .to(hillsContainer, { opacity: 1 }, { delay: 250 }) | ||
|
|
||
| const lastAnimationEl = s1.animations[s1.animations.length - 1] | ||
| lastAnimationEl.addEventListener('finish', () => props.onLoad?.()) | ||
|
|
||
| s1.play() | ||
| }, [isReadyForAnimation]) | ||
|
|
||
|
|
||
| const handleImgLoad = () => { | ||
| setHasLoaded(true) | ||
|
|
||
| // When animations are disabled, we trigger onLoad instantly | ||
| if (!shouldPlayAnimations) { | ||
| props.onLoad?.() | ||
| } | ||
| } | ||
|
|
||
| return ( | ||
| <S.Box ref={isReadyForAnimation ? ref : null}> | ||
| {isReadyForAnimation && ( | ||
| <div className="stars-container"> | ||
| <Stars01 /> | ||
| <Stars02 /> | ||
| <Stars03 /> | ||
| <Stars04 /> | ||
| </div> | ||
| )} | ||
| <div className="content-box"> | ||
| {props.children} | ||
| </div> | ||
| <img | ||
| // We animate the background image via CSS only. | ||
| className={classnames({ | ||
| 'background-img': true, | ||
| 'is-visible': hasLoaded | ||
| })} | ||
| src={!props.static ? skyBgUrl : fullCompositeBgUrl} | ||
| onLoad={handleImgLoad} | ||
| /> | ||
| {isReadyForAnimation && ( | ||
| <div className="hills-container"> | ||
| <div className="hills-base hills03"></div> | ||
| <div className="hills-base hills02"></div> | ||
| <div className="hills-base hills01"></div> | ||
| <div className="pyramid"></div> | ||
| </div> | ||
| )} | ||
| </S.Box> | ||
| ) | ||
| } | ||
|
|
||
| export default Background | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // 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 https://mozilla.org/MPL/2.0/. | ||
|
|
||
| import * as React from 'react' | ||
| import styled from 'styled-components' | ||
| import { LoaderIcon } from 'brave-ui/components/icons' | ||
|
|
||
| const Loading = styled('div')` | ||
| width: 100%; | ||
| height: 100%; | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| ` | ||
|
|
||
| const Graphic = styled('div')` | ||
| width: 50px; | ||
| height: 50px; | ||
| align-self: center; | ||
|
|
||
| svg { | ||
| fill: white; | ||
| } | ||
| ` | ||
|
|
||
| export default function Loader () { | ||
| const [show, setShow] = React.useState(false) | ||
|
|
||
| React.useEffect(() => { | ||
| const timerId = setTimeout(() => setShow(true), 100) | ||
|
|
||
| return () => { | ||
| clearTimeout(timerId) | ||
| } | ||
| }, []) | ||
|
|
||
| return ( | ||
| <Loading aria-busy='true'> | ||
| <Graphic aria-label='Loading'> | ||
| { show ? <LoaderIcon /> : null } | ||
| </Graphic> | ||
| </Loading> | ||
| ) | ||
| } |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The content of the function does not use
isReadyForAnimation- should it?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, the content should not use
isReadyForAnimation.We check for
ref.currentinside the body of useEffect. If the handle of ref is null then it won't create WAAPI objects.<S.Box ref={isReadyForAnimation ? ref : null}>There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps that wasn't clear. I should revise this to add another condition. What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well either way it needs a comment. But yes it seems clearer to have all the logic for that in 1 place. The
refattribute doesn't need to know whether animation will be used on that ref, so maybe it's clearer to do make that decision based onisReadyForAnimationin in this effect... otherwise we're splitting the logic....The other option you could consider, which may be better is not using
React.useReffor this and instead usingReact.useCallback((ref) => {...and passing that to the ref prop in the JSX. That will avoid having to use a ref but sync an effect on a prop. You would perform the contents of both effects in the callback when the incomingrefparam is truthy.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added anther check. an easier route.