From f57a8cf8ba0cd10a54abf35d960d8fb90266fa6b Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Wed, 1 Nov 2023 16:15:40 -0700 Subject: Lists updates: curate lists and blocklists (#1689) * Add lists screen * Update Lists screen and List create/edit modal to support curate lists * Rework the ProfileList screen and add curatelist support * More ProfileList progress * Update list modals * Rename mutelists to modlists * Layout updates/fixes * More layout fixes * Modal fixes * List list screen updates * Update feed page to give more info * Layout fixes to ListAddUser modal * Layout fixes to FlatList and Feed on desktop * Layout fix to LoadLatestBtn on Web * Handle did resolution before showing the ProfileList screen * Rename the CustomFeed routes to ProfileFeed for consistency * Fix layout issues with the pager and feeds * Factor out some common code * Fix UIs for mobile * Fix user list rendering * Fix: dont bubble custom feed errors in the merge feed * Refactor feed models to reduce usage of the SavedFeeds model * Replace CustomFeedModel with FeedSourceModel which abstracts feed-generators and lists * Add the ability to pin lists * Add pinned lists to mobile * Remove dead code * Rework the ProfileScreenHeader to create more real-estate for action buttons * Improve layout behavior on web mobile breakpoints * Refactor feed & list pages to use new Tabs layout component * Refactor to ProfileSubpageHeader * Implement modlist block and mute * Switch to new api and just modify state on modlist actions * Fix some UI overflows * Fix: dont show edit buttons on lists you dont own * Fix alignment issue on long titles * Improve loading and error states for feeds & lists * Update list dropdown icons for ios * Fetch feed display names in the mergefeed * Improve rendering off offline feeds in the feed-listing page * Update Feeds listing UI to react to changes in saved/pinned state * Refresh list and feed on posts tab press * Fix pinned feed ordering UI * Fixes to list pinning * Remove view=simple qp * Add list to feed tuners * Render richtext * Add list href * Add 'view avatar' * Remove unused import * Fix missing import * Correctly reflect block by list state * Replace the component with the more effective component * Improve the responsiveness of the PagerWithHeader * Fix visual jank in the feed loading state * Improve performance of the PagerWithHeader * Fix a case that would cause the header to animate too aggressively * Add the ability to scroll to top by tapping the selected tab * Fix unit test runner * Update modlists test * Add curatelist tests * Fix: remove link behavior in ListAddUser modal * Fix some layout jank in the PagerWithHeader on iOS * Simplify ListItems header rendering * Wait for the appview to recognize the list before proceeding with list creation * Fix glitch in the onPageSelecting index of the Pager * Fix until() * Copy fix Co-authored-by: Eric Bailey --------- Co-authored-by: Eric Bailey --- src/view/com/util/Views.web.tsx | 60 ++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 18 deletions(-) (limited to 'src/view/com/util/Views.web.tsx') diff --git a/src/view/com/util/Views.web.tsx b/src/view/com/util/Views.web.tsx index fda0a9b86..1c2edc0cc 100644 --- a/src/view/com/util/Views.web.tsx +++ b/src/view/com/util/Views.web.tsx @@ -14,9 +14,7 @@ import React from 'react' import { - FlatList as RNFlatList, FlatListProps, - ScrollView as RNScrollView, ScrollViewProps, StyleSheet, View, @@ -25,16 +23,29 @@ import { import {addStyle} from 'lib/styles' import {usePalette} from 'lib/hooks/usePalette' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' +import Animated from 'react-native-reanimated' interface AddedProps { - desktopFixedHeight?: boolean + desktopFixedHeight?: boolean | number } export function CenteredView({ style, + sideBorders, ...props -}: React.PropsWithChildren) { - style = addStyle(style, styles.container) +}: React.PropsWithChildren) { + const pal = usePalette('default') + const {isMobile} = useWebMediaQueries() + if (!isMobile) { + style = addStyle(style, styles.container) + } + if (sideBorders) { + style = addStyle(style, { + borderLeftWidth: 1, + borderRightWidth: 1, + }) + style = addStyle(style, pal.border) + } return } @@ -46,14 +57,16 @@ export const FlatList = React.forwardRef(function FlatListImpl( desktopFixedHeight, ...props }: React.PropsWithChildren & AddedProps>, - ref: React.Ref, + ref: React.Ref>, ) { const pal = usePalette('default') const {isMobile} = useWebMediaQueries() - contentContainerStyle = addStyle( - contentContainerStyle, - styles.containerScroll, - ) + if (!isMobile) { + contentContainerStyle = addStyle( + contentContainerStyle, + styles.containerScroll, + ) + } if (contentOffset && contentOffset?.y !== 0) { // NOTE // we use paddingTop & contentOffset to space around the floating header @@ -68,7 +81,14 @@ export const FlatList = React.forwardRef(function FlatListImpl( }) } if (desktopFixedHeight) { - style = addStyle(style, styles.fixedHeight) + if (typeof desktopFixedHeight === 'number') { + // @ts-ignore Web only -prf + style = addStyle(style, { + height: `calc(100vh - ${desktopFixedHeight}px)`, + }) + } else { + style = addStyle(style, styles.fixedHeight) + } if (!isMobile) { // NOTE // react native web produces *three* wrapping divs @@ -85,7 +105,7 @@ export const FlatList = React.forwardRef(function FlatListImpl( } } return ( - ( export const ScrollView = React.forwardRef(function ScrollViewImpl( {contentContainerStyle, ...props}: React.PropsWithChildren, - ref: React.Ref, + ref: React.Ref, ) { const pal = usePalette('default') - contentContainerStyle = addStyle( - contentContainerStyle, - styles.containerScroll, - ) + const {isMobile} = useWebMediaQueries() + if (!isMobile) { + contentContainerStyle = addStyle( + contentContainerStyle, + styles.containerScroll, + ) + } return ( - -- cgit 1.4.1