Fix double padding in Dialog.InnerFlatList on web (#5986)
* remove extra padding on web * pass prop
This commit is contained in:
@@ -267,7 +267,10 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
|
|||||||
|
|
||||||
export const InnerFlatList = React.forwardRef<
|
export const InnerFlatList = React.forwardRef<
|
||||||
ListMethods,
|
ListMethods,
|
||||||
ListProps<any> & {webInnerStyle?: StyleProp<ViewStyle>}
|
ListProps<any> & {
|
||||||
|
webInnerStyle?: StyleProp<ViewStyle>
|
||||||
|
webInnerContentContainerStyle?: StyleProp<ViewStyle>
|
||||||
|
}
|
||||||
>(function InnerFlatList({style, ...props}, ref) {
|
>(function InnerFlatList({style, ...props}, ref) {
|
||||||
const insets = useSafeAreaInsets()
|
const insets = useSafeAreaInsets()
|
||||||
const {nativeSnapPoint, disableDrag, setDisableDrag} = useDialogContext()
|
const {nativeSnapPoint, disableDrag, setDisableDrag} = useDialogContext()
|
||||||
|
|||||||
@@ -210,21 +210,26 @@ export const ScrollableInner = Inner
|
|||||||
|
|
||||||
export const InnerFlatList = React.forwardRef<
|
export const InnerFlatList = React.forwardRef<
|
||||||
FlatList,
|
FlatList,
|
||||||
FlatListProps<any> & {label: string} & {webInnerStyle?: StyleProp<ViewStyle>}
|
FlatListProps<any> & {label: string} & {
|
||||||
>(function InnerFlatList({label, style, webInnerStyle, ...props}, ref) {
|
webInnerStyle?: StyleProp<ViewStyle>
|
||||||
|
webInnerContentContainerStyle?: StyleProp<ViewStyle>
|
||||||
|
}
|
||||||
|
>(function InnerFlatList(
|
||||||
|
{label, style, webInnerStyle, webInnerContentContainerStyle, ...props},
|
||||||
|
ref,
|
||||||
|
) {
|
||||||
const {gtMobile} = useBreakpoints()
|
const {gtMobile} = useBreakpoints()
|
||||||
return (
|
return (
|
||||||
<Inner
|
<Inner
|
||||||
label={label}
|
label={label}
|
||||||
style={[
|
style={[
|
||||||
|
a.overflow_hidden,
|
||||||
|
a.px_0,
|
||||||
// @ts-ignore web only -sfn
|
// @ts-ignore web only -sfn
|
||||||
{
|
{maxHeight: 'calc(-36px + 100vh)'},
|
||||||
paddingHorizontal: 0,
|
|
||||||
maxHeight: 'calc(-36px + 100vh)',
|
|
||||||
overflow: 'hidden',
|
|
||||||
},
|
|
||||||
webInnerStyle,
|
webInnerStyle,
|
||||||
]}>
|
]}
|
||||||
|
contentContainerStyle={[a.px_0, webInnerContentContainerStyle]}>
|
||||||
<FlatList
|
<FlatList
|
||||||
ref={ref}
|
ref={ref}
|
||||||
style={[gtMobile ? a.px_2xl : a.px_xl, flatten(style)]}
|
style={[gtMobile ? a.px_2xl : a.px_xl, flatten(style)]}
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ function GifList({
|
|||||||
a.mb_lg,
|
a.mb_lg,
|
||||||
a.flex_row,
|
a.flex_row,
|
||||||
a.align_center,
|
a.align_center,
|
||||||
!gtMobile && isWeb && a.gap_md,
|
!gtMobile && web(a.gap_md),
|
||||||
]}>
|
]}>
|
||||||
{/* cover top corners */}
|
{/* cover top corners */}
|
||||||
<View
|
<View
|
||||||
@@ -209,6 +209,7 @@ function GifList({
|
|||||||
native([a.px_xl, {minHeight: height}]),
|
native([a.px_xl, {minHeight: height}]),
|
||||||
web(a.h_full_vh),
|
web(a.h_full_vh),
|
||||||
]}
|
]}
|
||||||
|
style={[web(a.h_full_vh)]}
|
||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<>
|
<>
|
||||||
{listHeader}
|
{listHeader}
|
||||||
@@ -238,8 +239,6 @@ function GifList({
|
|||||||
onEndReached={onEndReached}
|
onEndReached={onEndReached}
|
||||||
onEndReachedThreshold={4}
|
onEndReachedThreshold={4}
|
||||||
keyExtractor={(item: Gif) => item.id}
|
keyExtractor={(item: Gif) => item.id}
|
||||||
// @ts-expect-error web only
|
|
||||||
style={isWeb && {minHeight: '100vh'}}
|
|
||||||
keyboardDismissMode="on-drag"
|
keyboardDismissMode="on-drag"
|
||||||
ListFooterComponent={
|
ListFooterComponent={
|
||||||
hasData ? (
|
hasData ? (
|
||||||
|
|||||||
Reference in New Issue
Block a user