From a060af5a89d298ec865281d957b6bca531743812 Mon Sep 17 00:00:00 2001 From: Michael Neeley Date: Tue, 17 May 2022 16:23:21 -0400 Subject: [PATCH] fix: repair tags list on tabs (#2506) * fix: repair tags list on tabs I've chosen to make it more restrictive than it was before since these features were broken anyway. plus adding arbritrary props here isn't the right level of customization for us moving forward * fixed route params --- .../src/TabsConnected/Tabs.js | 5 ++-- .../src/TabsConnected/createTab.js | 23 ++++--------------- templates/mobile/theme.js | 1 + 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/packages/apollos-ui-connected/src/TabsConnected/Tabs.js b/packages/apollos-ui-connected/src/TabsConnected/Tabs.js index 13b48bb32..fa71ce31f 100644 --- a/packages/apollos-ui-connected/src/TabsConnected/Tabs.js +++ b/packages/apollos-ui-connected/src/TabsConnected/Tabs.js @@ -87,12 +87,13 @@ const Tabs = ({ tabs }) => { }, [client]); const tabNavs = useMemo( () => - tabs.map(({ title, icon, feed }) => ({ + tabs.map(({ title, icon, feed }, i) => ({ title, icon, component: createTab({ featureFeedId: feed.id, options: { + headerLargeTitle: i !== 0, ...(ApollosConfig.TABS[title]?.showLogo ? { headerCenter: HeaderLogo } : {}), @@ -102,9 +103,9 @@ const Tabs = ({ tabs }) => { ...(ApollosConfig.TABS[title]?.showProfile ? { headerLeft: ProfileButton } : {}), - ...(ApollosConfig.TABS[title] ?? {}), }, title, + showTags: ApollosConfig.TABS[title]?.showTags || false, }), })), [tabs] diff --git a/packages/apollos-ui-connected/src/TabsConnected/createTab.js b/packages/apollos-ui-connected/src/TabsConnected/createTab.js index 01bd4d349..00c590dbe 100644 --- a/packages/apollos-ui-connected/src/TabsConnected/createTab.js +++ b/packages/apollos-ui-connected/src/TabsConnected/createTab.js @@ -11,13 +11,13 @@ import FeaturesFeedConnected from '../FeaturesFeedConnected'; import ContentFeed from '../ContentFeedConnected'; import TagFilterConnected from '../TagFilterConnected'; -const Tab = ({ useTagFilter, feedViewProps, additionalFeatures }) => { +const Tab = () => { const navigation = useNavigation(); const route = useRoute(); const [filteredTags, setFilteredTags] = useState([]); return ( <> - {useTagFilter ? ( + {route.params.showTags ? ( { openUrl={openUrl} featureFeedId={route.params.featureFeedId} navigation={navigation} - feedViewProps={feedViewProps} - additionalFeatures={additionalFeatures} /> )} @@ -40,33 +38,20 @@ const Tab = ({ useTagFilter, feedViewProps, additionalFeatures }) => { ); }; -Tab.propTypes = { - useTagFilter: PropTypes.bool, - feedViewProps: PropTypes.shape({}), - additionalFeatures: PropTypes.shape({}), -}; - -Tab.defaultProps = { - useTagFilter: false, - feedViewProps: {}, - additionalFeatures: {}, -}; - -export const createTab = ({ featureFeedId, title, screenOptions, options }) => { +export const createTab = ({ featureFeedId, title, options, showTags }) => { const TabStack = createNativeStackNavigator(); const TabNav = () => (