diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-04-21 19:34:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-21 19:34:07 -0500 |
commit | bbc2ab334de06c3ac8069b5e18a2ba76433f2f6a (patch) | |
tree | e909672c07f08e1f45c34542e3e6a4ee9b670bd5 | |
parent | 38eb299011672fc840849ae51e67adefef882bec (diff) | |
download | voidsky-bbc2ab334de06c3ac8069b5e18a2ba76433f2f6a.tar.zst |
Hotfix feed sizing (#510)
* Fix home feed sizing on web * Bump api@0.2.8
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/view/com/posts/Feed.tsx | 2 | ||||
-rw-r--r-- | src/view/com/util/Views.web.tsx | 13 | ||||
-rw-r--r-- | yarn.lock | 8 |
4 files changed, 19 insertions, 6 deletions
diff --git a/package.json b/package.json index aef018a81..f4e400b0f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "e2e:run": "detox test --configuration ios.sim.debug --take-screenshots all" }, "dependencies": { - "@atproto/api": "0.2.7", + "@atproto/api": "0.2.8", "@bam.tech/react-native-image-resizer": "^3.0.4", "@braintree/sanitize-url": "^6.0.2", "@expo/webpack-config": "^18.0.1", diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/Feed.tsx index bd07f9b11..998cfe0c9 100644 --- a/src/view/com/posts/Feed.tsx +++ b/src/view/com/posts/Feed.tsx @@ -179,6 +179,8 @@ export const Feed = observer(function Feed({ onEndReachedThreshold={0.6} removeClippedSubviews={true} contentOffset={{x: 0, y: headerOffset * -1}} + // @ts-ignore our .web version only -prf + desktopFixedHeight /> )} </View> diff --git a/src/view/com/util/Views.web.tsx b/src/view/com/util/Views.web.tsx index 63121d938..804192a37 100644 --- a/src/view/com/util/Views.web.tsx +++ b/src/view/com/util/Views.web.tsx @@ -25,6 +25,10 @@ import { import {addStyle, colors} from 'lib/styles' import {usePalette} from 'lib/hooks/usePalette' +interface AddedProps { + desktopFixedHeight?: boolean +} + export function CenteredView({ style, ...props @@ -38,8 +42,9 @@ export const FlatList = React.forwardRef(function <ItemT>( contentContainerStyle, style, contentOffset, + desktopFixedHeight, ...props - }: React.PropsWithChildren<FlatListProps<ItemT>>, + }: React.PropsWithChildren<FlatListProps<ItemT> & AddedProps>, ref: React.Ref<RNFlatList>, ) { const pal = usePalette('default') @@ -60,6 +65,9 @@ export const FlatList = React.forwardRef(function <ItemT>( paddingTop: Math.abs(contentOffset.y), }) } + if (desktopFixedHeight) { + style = addStyle(style, styles.fixedHeight) + } return ( <RNFlatList ref={ref} @@ -122,4 +130,7 @@ const styles = StyleSheet.create({ containerDark: { backgroundColor: colors.gray7, }, + fixedHeight: { + height: '100vh', + }, }) diff --git a/yarn.lock b/yarn.lock index 635de6c18..6de066d5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,10 +30,10 @@ tlds "^1.234.0" typed-emitter "^2.1.0" -"@atproto/api@0.2.7": - version "0.2.7" - resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.2.7.tgz#ca917a8e7f5054c32c11ce09c82424fbe24112cd" - integrity sha512-Sz+lLD5apC2f0FSClkElIrt4w+aLgzqJ/wqtFO7xuQH8+hGfxdfGuVIK5GEDQ7epeDlWvVhVSouP6ZdGSKKtSA== +"@atproto/api@0.2.8": + version "0.2.8" + resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.2.8.tgz#92ed413804ecb43aaa45ec18afc93d6f2b28a689" + integrity sha512-LfPgtf3UNg2W/AxHkJMJrLNT9QAD6bi16Sw5Zt3mgANrDnHWGygA7gRpeNdgVI+kFEhQfrIItemJvWLIB9BJDQ== dependencies: "@atproto/common-web" "*" "@atproto/uri" "*" |