From dde28fecf0c65ef85dc5c5f54dd26b98fd6e35f0 Mon Sep 17 00:00:00 2001 From: Pedro Bern Date: Sat, 30 Jan 2021 18:53:01 -0300 Subject: [PATCH] feat: export useCollapsibleStyle hook --- src/createCollapsibleTabs.tsx | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/createCollapsibleTabs.tsx b/src/createCollapsibleTabs.tsx index 48bf36b7..2a22af34 100644 --- a/src/createCollapsibleTabs.tsx +++ b/src/createCollapsibleTabs.tsx @@ -681,17 +681,17 @@ const createCollapsibleTabs = () => { return scrollHandler } - const useStyle = () => { + const useCollapsibleStyle = () => { const { headerHeight, tabBarHeight, containerHeight } = useTabsContext() const windowWidth = useWindowDimensions().width return { - _style: { width: windowWidth }, - _contentContainerStyle: { + style: { width: windowWidth }, + contentContainerStyle: { minHeight: (containerHeight || 0) + headerHeight, paddingTop: headerHeight + tabBarHeight, }, - _progressViewOffset: headerHeight + tabBarHeight, + progressViewOffset: headerHeight + tabBarHeight, } } @@ -703,7 +703,11 @@ const createCollapsibleTabs = () => { const name = useTabNameContext() const { refMap } = useTabsContext() const scrollHandler = useScrollHandlerY(name) - const { _style, _contentContainerStyle, _progressViewOffset } = useStyle() + const { + style: _style, + contentContainerStyle: _contentContainerStyle, + progressViewOffset, + } = useCollapsibleStyle() return ( () => { // @ts-ignore contentContainerStyle, ]} - progressViewOffset={_progressViewOffset} + progressViewOffset={progressViewOffset} onScroll={scrollHandler} scrollEventThrottle={16} {...rest} @@ -733,7 +737,10 @@ const createCollapsibleTabs = () => { const name = useTabNameContext() const { refMap } = useTabsContext() const scrollHandler = useScrollHandlerY(name) - const { _style, _contentContainerStyle, _progressViewOffset } = useStyle() + const { + style: _style, + contentContainerStyle: _contentContainerStyle, + } = useCollapsibleStyle() return ( () => { // @ts-ignore contentContainerStyle, ]} - progressViewOffset={_progressViewOffset} onScroll={scrollHandler} scrollEventThrottle={16} {...rest} @@ -755,7 +761,14 @@ const createCollapsibleTabs = () => { ) } - return { FlatList, ScrollView, Container, useTabsContext, Lazy } + return { + FlatList, + ScrollView, + Container, + useTabsContext, + useCollapsibleStyle, + Lazy, + } } const styles = StyleSheet.create({