-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
feat: add TabsIcon component family with icon tabs, scroll overflow detection, and collapse animation #29684
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
62d1b65
feat: add Tabs components and icons to component library
vinnyhoward 6c38079
feat(component-library): add TabsIcon component family and revert cha…
vinnyhoward d251ac1
fix: migrate TabsIconAnimationContext to TabsIcon folder
vinnyhoward 6ce49ec
fix(TabsIconTab): rename fillWidth to shouldFillWidth, add iconProps,…
vinnyhoward 1fef897
refactor: reduced dup logic related to animations/layout adjustments
vinnyhoward 097b394
fix: fill width
vinnyhoward 00376fb
Merge branch 'main' into feat-tmcu-591-homepage-hub-tabs-components
vinnyhoward ec72306
Merge branch 'main' into feat-tmcu-591-homepage-hub-tabs-components
vinnyhoward 7d69b3d
fix: update tab icons to be up to material ui standards
vinnyhoward ffa57ba
fix: remove changes to tabs
vinnyhoward File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
500 changes: 500 additions & 0 deletions
500
app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.test.tsx
Large diffs are not rendered by default.
Oops, something went wrong.
178 changes: 178 additions & 0 deletions
178
app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| // Third party dependencies. | ||
| import React, { useRef, useState } from 'react'; | ||
| import { Animated, ScrollView, LayoutChangeEvent } from 'react-native'; | ||
|
|
||
| // External dependencies. | ||
| import { useTailwind } from '@metamask/design-system-twrnc-preset'; | ||
| import { | ||
| Box, | ||
| BoxFlexDirection, | ||
| BoxAlignItems, | ||
| } from '@metamask/design-system-react-native'; | ||
|
|
||
| // Internal dependencies. | ||
| import TabsIconTab from '../TabsIconTab/TabsIconTab'; | ||
| import { TabsIconBarProps } from './TabsIconBar.types'; | ||
| import { useTabsBarLayout } from '../hooks/useTabsBarLayout'; | ||
|
|
||
| const TabsIconBar: React.FC<TabsIconBarProps> = ({ | ||
| tabs, | ||
| activeIndex, | ||
| onTabPress, | ||
| testID, | ||
| twClassName, | ||
| fillWidth = false, | ||
| collapseAnim, | ||
| ...boxProps | ||
| }) => { | ||
| const tw = useTailwind(); | ||
|
|
||
| const scrollViewRef = useRef<ScrollView>(null); | ||
| const underlineAnimated = useRef(new Animated.Value(0)).current; | ||
| const [underlineWidth, setUnderlineWidth] = useState(0); | ||
|
|
||
| // Height collapse animation — icon tabs always have a border-b row | ||
| const [tabRowHeight, setTabRowHeight] = useState(0); | ||
| const animatedHeight = | ||
| collapseAnim && tabRowHeight > 0 | ||
| ? collapseAnim.interpolate({ | ||
| inputRange: [0, 1], | ||
| outputRange: [tabRowHeight, 0], | ||
| }) | ||
| : undefined; | ||
|
|
||
| const { | ||
| isInitialized, | ||
| scrollEnabled, | ||
| handleContainerLayout, | ||
| handleTabLayout, | ||
| } = useTabsBarLayout({ | ||
| tabs, | ||
| activeIndex, | ||
| fillWidth, | ||
| scrollAnimated: false, | ||
| scrollViewRef, | ||
| onAnimateToTab: (layout, isFirstTime) => { | ||
| // Icon tabs: underline is 75% of the tab width, centered | ||
| const targetWidth = layout.width * 0.75; | ||
| const targetX = layout.x + layout.width * 0.125; | ||
|
|
||
| setUnderlineWidth(targetWidth); | ||
|
|
||
| if (isFirstTime) { | ||
| underlineAnimated.setValue(targetX); | ||
| return null; | ||
| } | ||
|
|
||
| return Animated.timing(underlineAnimated, { | ||
| toValue: targetX, | ||
| duration: 200, | ||
| useNativeDriver: true, | ||
| }); | ||
| }, | ||
| }); | ||
|
|
||
| const handleTabPress = (index: number) => { | ||
| const tab = tabs[index]; | ||
| if (!tab?.isDisabled) { | ||
| onTabPress(index); | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <Box | ||
| twClassName={`relative overflow-hidden border-b border-border-muted ${twClassName || ''}`} | ||
| testID={testID} | ||
| onLayout={handleContainerLayout as (layoutEvent: unknown) => void} | ||
| {...boxProps} | ||
| > | ||
| {scrollEnabled ? ( | ||
| <ScrollView | ||
| ref={scrollViewRef} | ||
| horizontal | ||
| showsHorizontalScrollIndicator={false} | ||
| style={tw.style('flex-grow-0')} | ||
| contentContainerStyle={tw.style('flex-row px-4')} | ||
| scrollsToTop={false} | ||
| > | ||
| <Box | ||
| flexDirection={BoxFlexDirection.Row} | ||
| alignItems={BoxAlignItems.Center} | ||
| twClassName="relative gap-6" | ||
| > | ||
| {tabs.map((tab, index) => ( | ||
| <TabsIconTab | ||
| key={tab.key} | ||
| label={tab.label} | ||
| iconName={tab.iconName} | ||
| isActive={index === activeIndex} | ||
| isDisabled={tab.isDisabled} | ||
| onPress={() => handleTabPress(index)} | ||
| onLayout={(layoutEvent) => handleTabLayout(index, layoutEvent)} | ||
| testID={tab.testID ?? `${testID}-tab-${index}`} | ||
| style={tw.style('py-2')} | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| /> | ||
| ))} | ||
|
|
||
| {activeIndex >= 0 && isInitialized && ( | ||
| <Animated.View | ||
| style={tw.style( | ||
| 'absolute -bottom-2px h-1 bg-icon-default z-1', | ||
| { | ||
| width: underlineWidth, | ||
| transform: [{ translateX: underlineAnimated }], | ||
| }, | ||
| )} | ||
| /> | ||
| )} | ||
| </Box> | ||
| </ScrollView> | ||
| ) : ( | ||
| <Animated.View | ||
| onLayout={({ | ||
| nativeEvent, | ||
| }: { | ||
| nativeEvent: LayoutChangeEvent['nativeEvent']; | ||
| }) => { | ||
| if (tabRowHeight === 0 && nativeEvent.layout.height > 0) { | ||
| setTabRowHeight(nativeEvent.layout.height); | ||
| } | ||
| }} | ||
| style={[ | ||
| tw.style( | ||
| `relative ${fillWidth ? 'flex-row items-center' : 'px-4 gap-6 flex-row items-center relative'} ${animatedHeight !== undefined ? 'overflow-hidden' : ''}`, | ||
| ), | ||
| animatedHeight !== undefined | ||
| ? { height: animatedHeight } | ||
| : undefined, | ||
| ]} | ||
| > | ||
| {tabs.map((tab, index) => ( | ||
| <TabsIconTab | ||
| key={tab.key} | ||
| label={tab.label} | ||
| iconName={tab.iconName} | ||
| isActive={index === activeIndex} | ||
| isDisabled={tab.isDisabled} | ||
| onPress={() => handleTabPress(index)} | ||
| onLayout={(layoutEvent) => handleTabLayout(index, layoutEvent)} | ||
| testID={tab.testID ?? `${testID}-tab-${index}`} | ||
| shouldFillWidth={fillWidth} | ||
| /> | ||
| ))} | ||
|
|
||
| {activeIndex >= 0 && isInitialized && ( | ||
| <Animated.View | ||
| style={tw.style('absolute -bottom-2px h-1 bg-icon-default z-1', { | ||
| width: underlineWidth, | ||
| transform: [{ translateX: underlineAnimated }], | ||
| })} | ||
| /> | ||
| )} | ||
| </Animated.View> | ||
| )} | ||
| </Box> | ||
| ); | ||
| }; | ||
|
|
||
| export default TabsIconBar; | ||
63 changes: 63 additions & 0 deletions
63
app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.types.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| // Third party dependencies. | ||
| import React from 'react'; | ||
| import { Animated } from 'react-native'; | ||
|
|
||
| // External dependencies. | ||
| import { Box } from '@metamask/design-system-react-native'; | ||
|
|
||
| // TODO: @MetaMask/design-system-engineers | ||
|
Check warning on line 8 in app/component-library/components-temp/Tabs/TabsIconBar/TabsIconBar.types.ts
|
||
| // Use the concrete Box component props here instead of BoxProps. | ||
| // https://github.com/MetaMask/metamask-design-system/issues/1115 | ||
| type BoxComponentProps = React.ComponentProps<typeof Box>; | ||
|
|
||
| // Internal dependencies. | ||
| import { IconName } from '../../../components/Icons/Icon/Icon.types'; | ||
|
|
||
| /** | ||
| * Individual tab item data interface for the icon tab bar. | ||
| * Icon is required — use the base TabsBar for text-only tabs. | ||
| */ | ||
| export interface TabsIconItem { | ||
| key: string; | ||
| label: string; | ||
| content: React.ReactNode; | ||
| iconName: IconName; | ||
| isDisabled?: boolean; | ||
| testID?: string; | ||
| } | ||
|
|
||
| /** | ||
| * TabsIconBar component props | ||
| */ | ||
| export interface TabsIconBarProps extends BoxComponentProps { | ||
| /** | ||
| * Array of tab items — each must include an iconName | ||
| */ | ||
| tabs: TabsIconItem[]; | ||
| /** | ||
| * Current active tab index | ||
| */ | ||
| activeIndex: number; | ||
| /** | ||
| * Callback when a tab is selected | ||
| */ | ||
| onTabPress: (index: number) => void; | ||
| /** | ||
| * Test ID for the component | ||
| */ | ||
| testID?: string; | ||
| /** | ||
| * Tailwind CSS classes to apply to the main container | ||
| */ | ||
| twClassName?: string; | ||
| /** | ||
| * When true, each tab stretches equally to fill the full container width. | ||
| * Disables horizontal scrolling and gap spacing. Defaults to false. | ||
| */ | ||
| fillWidth?: boolean; | ||
| /** | ||
| * Optional Animated.Value (0=visible, 1=hidden) that collapses the tab row height to zero. | ||
| * Requires useNativeDriver: false on the driving animation. | ||
| */ | ||
| collapseAnim?: Animated.Value; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.