diff options
author | Paul Frazee <pfrazee@gmail.com> | 2024-07-02 21:25:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-02 21:25:19 -0700 |
commit | a3d4fb652b888ba81aecbf0e81a954968ea65d39 (patch) | |
tree | e78df8bf670baee080fa77b198db30058a012589 /src/view/shell | |
parent | 6694a33603544511441474819216d51482d19827 (diff) | |
download | voidsky-a3d4fb652b888ba81aecbf0e81a954968ea65d39.tar.zst |
Guided tour for new users (#4690)
* Add home guided tour (WIP) * Add web handling of the tour * Switch to our fork of rn-tourguide * Bump guided-tour * Fix alignment on android * Implement home page tour trigger after account creation * Add new_user_guided_tour gate * Add a title line to the tour tooltips * A11y improvements: proper labels, focus capture, scroll capture * Silence type error * Native a11y * Use FocusScope * Switch to useWebBodyScrollLock() --------- Co-authored-by: Eric Bailey <git@esb.lol>
Diffstat (limited to 'src/view/shell')
-rw-r--r-- | src/view/shell/bottom-bar/BottomBar.tsx | 25 | ||||
-rw-r--r-- | src/view/shell/bottom-bar/BottomBarWeb.tsx | 11 | ||||
-rw-r--r-- | src/view/shell/desktop/LeftNav.tsx | 22 |
3 files changed, 35 insertions, 23 deletions
diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx index b5ad92b4c..80886b320 100644 --- a/src/view/shell/bottom-bar/BottomBar.tsx +++ b/src/view/shell/bottom-bar/BottomBar.tsx @@ -45,6 +45,7 @@ import { Message_Stroke2_Corner0_Rounded as Message, Message_Stroke2_Corner0_Rounded_Filled as MessageFilled, } from '#/components/icons/Message' +import {HomeTourExploreWrapper} from '#/tours/HomeTour' import {styles} from './BottomBarStyles' type TabOptions = @@ -162,17 +163,19 @@ export function BottomBar({navigation}: BottomTabBarProps) { <Btn testID="bottomBarSearchBtn" icon={ - isAtSearch ? ( - <MagnifyingGlassFilled - width={iconWidth + 2} - style={[styles.ctrlIcon, pal.text, styles.searchIcon]} - /> - ) : ( - <MagnifyingGlass - width={iconWidth + 2} - style={[styles.ctrlIcon, pal.text, styles.searchIcon]} - /> - ) + <HomeTourExploreWrapper> + {isAtSearch ? ( + <MagnifyingGlassFilled + width={iconWidth + 2} + style={[styles.ctrlIcon, pal.text, styles.searchIcon]} + /> + ) : ( + <MagnifyingGlass + width={iconWidth + 2} + style={[styles.ctrlIcon, pal.text, styles.searchIcon]} + /> + )} + </HomeTourExploreWrapper> } onPress={onPressSearch} accessibilityRole="search" diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx index 21c253ee0..c89d2a63c 100644 --- a/src/view/shell/bottom-bar/BottomBarWeb.tsx +++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx @@ -41,6 +41,7 @@ import { UserCircle_Filled_Corner0_Rounded as UserCircleFilled, UserCircle_Stroke2_Corner0_Rounded as UserCircle, } from '#/components/icons/UserCircle' +import {HomeTourExploreWrapper} from '#/tours/HomeTour' import {styles} from './BottomBarStyles' export function BottomBarWeb() { @@ -94,10 +95,12 @@ export function BottomBarWeb() { {({isActive}) => { const Icon = isActive ? MagnifyingGlassFilled : MagnifyingGlass return ( - <Icon - width={iconWidth + 2} - style={[styles.ctrlIcon, pal.text, styles.searchIcon]} - /> + <HomeTourExploreWrapper> + <Icon + width={iconWidth + 2} + style={[styles.ctrlIcon, pal.text, styles.searchIcon]} + /> + </HomeTourExploreWrapper> ) }} </NavItem> diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx index ca8073f57..49fb7fc99 100644 --- a/src/view/shell/desktop/LeftNav.tsx +++ b/src/view/shell/desktop/LeftNav.tsx @@ -63,6 +63,7 @@ import { UserCircle_Filled_Corner0_Rounded as UserCircleFilled, UserCircle_Stroke2_Corner0_Rounded as UserCircle, } from '#/components/icons/UserCircle' +import {HomeTourExploreWrapper} from '#/tours/HomeTour' import {router} from '../../../routes' const NAV_ICON_WIDTH = 28 @@ -340,14 +341,19 @@ export function DesktopLeftNav() { iconFilled={<HomeFilled width={NAV_ICON_WIDTH} style={pal.text} />} label={_(msg`Home`)} /> - <NavItem - href="/search" - icon={<MagnifyingGlass style={pal.text} width={NAV_ICON_WIDTH} />} - iconFilled={ - <MagnifyingGlassFilled style={pal.text} width={NAV_ICON_WIDTH} /> - } - label={_(msg`Search`)} - /> + <HomeTourExploreWrapper> + <NavItem + href="/search" + icon={<MagnifyingGlass style={pal.text} width={NAV_ICON_WIDTH} />} + iconFilled={ + <MagnifyingGlassFilled + style={pal.text} + width={NAV_ICON_WIDTH} + /> + } + label={_(msg`Search`)} + /> + </HomeTourExploreWrapper> <NavItem href="/notifications" count={numUnreadNotifications} |