Skip to content

Feat/ TabController.TabBar style #1331

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.

Sign up for GitHub

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 3 commits into from
Jun 6, 2021
Merged

Feat/ TabController.TabBar style #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c66711f
wideIndicator prop
lidord-wix Jun 2, 2021
1f447e9
spreadItems prop
lidord-wix Jun 2, 2021
eeace6f
move spreadItems to defaultProps
lidord-wix Jun 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions demo/src/screens/componentScreens/TabControllerScreen/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ class TabControllerScreen extends Component<{}, State> {
key={key}
// uppercase
// indicatorStyle={{backgroundColor: 'green', height: 3}}
// wideIndicator
// spreadItems={false}
// labelColor={'green'}
// selectedLabelColor={'red'}
// labelStyle={{fontSize: 20}}
Expand Down
8 changes: 8 additions & 0 deletions generatedTypes/components/tabController/TabBar.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ export interface TabControllerBarProps {
* The list of tab bar items
*/
items?: TabControllerItemProps[];
/**
* Whether the tabBar should be spread (default: true)
*/
spreadItems?: boolean;
/**
* Tab Bar height
*/
Expand All @@ -22,6 +26,10 @@ export interface TabControllerBarProps {
* custom style for the selected indicator
*/
indicatorStyle?: StyleProp<ViewStyle>;
/**
* Whether the indicator should be wide (as the item)
*/
wideIndicator?: boolean;
/**
* custom label style
*/
Expand Down
23 changes: 16 additions & 7 deletions src/components/tabController/TabBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const {Code, Value, interpolate: _interpolate, interpolateNode, block, set} = Re
const interpolate = interpolateNode || _interpolate;

const DEFAULT_HEIGHT = 48;
const INDICATOR_INSET = Spacings.s4;
const DEFAULT_BACKGROUND_COLOR = Colors.white;

const DEFAULT_LABEL_STYLE = {
Expand All @@ -40,6 +39,10 @@ export interface TabControllerBarProps {
* The list of tab bar items
*/
items?: TabControllerItemProps[];
/**
* Whether the tabBar should be spread (default: true)
*/
spreadItems?: boolean;
/**
* Tab Bar height
*/
Expand All @@ -60,6 +63,10 @@ export interface TabControllerBarProps {
* custom style for the selected indicator
*/
indicatorStyle?: StyleProp<ViewStyle>;
/**
* Whether the indicator should be wide (as the item)
*/
wideIndicator?: boolean;
/**
* custom label style
*/
Expand Down Expand Up @@ -128,11 +135,13 @@ interface Props extends TabControllerBarProps, BaseComponentInjectedProps, Forwa
const TabBar = (props: Props) => {
const {
items: propsItems,
spreadItems,
height,
enableShadow,
shadowStyle: propsShadowStyle,
// minTabsForScroll,
indicatorStyle,
wideIndicator,
labelStyle,
selectedLabelStyle,
labelColor,
Expand All @@ -149,6 +158,7 @@ const TabBar = (props: Props) => {
children: propsChildren
} = props;

const indicatorInset = wideIndicator ? 0 : Spacings.s4;
const context = useContext(TabBarContext);
// @ts-ignore // TODO: typescript
const {itemStates, items: contextItems, currentPage, targetPage, registerTabItems, selectedIndex} = context;
Expand Down Expand Up @@ -307,7 +317,7 @@ const TabBar = (props: Props) => {

const selectedIndicator =
itemsWidths && itemsWidths.length > 0 ? (
<Reanimated.View style={[styles.selectedIndicator, indicatorStyle, _indicatorTransitionStyle]}/>
<Reanimated.View style={[styles.selectedIndicator, {marginHorizontal: indicatorInset}, indicatorStyle, _indicatorTransitionStyle]}/>
) : undefined;

const renderCodeBlock = _.memoize(() => {
Expand All @@ -321,7 +331,7 @@ const TabBar = (props: Props) => {
nodes.push(set(_indicatorWidth,
interpolate(currentPage, {
inputRange: itemsWidths.map((_v, i) => i),
outputRange: itemsWidths.map(v => v - 2 * INDICATOR_INSET)
outputRange: itemsWidths.map(v => v - 2 * indicatorInset)
})));

nodes.push(Reanimated.onChange(targetPage, Reanimated.call([targetPage], focusIndex as any)));
Expand All @@ -339,7 +349,7 @@ const TabBar = (props: Props) => {
}, [shadowStyle, containerWidth, containerStyle]);

const indicatorContainerStyle = useMemo(() => {
return [styles.tabBar, !_.isUndefined(height) && {height}, {backgroundColor}];
return [styles.tabBar, {flex: spreadItems ? 1 : undefined}, !_.isUndefined(height) && {height}, {backgroundColor}];
}, [height, backgroundColor]);

const scrollViewContainerStyle = useMemo(() => {
Expand Down Expand Up @@ -371,7 +381,8 @@ TabBar.displayName = 'TabController.TabBar';
TabBar.defaultProps = {
labelStyle: DEFAULT_LABEL_STYLE,
selectedLabelStyle: DEFAULT_SELECTED_LABEL_STYLE,
backgroundColor: DEFAULT_BACKGROUND_COLOR
backgroundColor: DEFAULT_BACKGROUND_COLOR,
spreadItems: true

// containerWidth: Constants.screenWidth
};
Expand All @@ -381,7 +392,6 @@ const styles = StyleSheet.create({
zIndex: 100
},
tabBar: {
flex: 1,
height: DEFAULT_HEIGHT,
flexDirection: 'row',
justifyContent: 'space-between'
Expand All @@ -400,7 +410,6 @@ const styles = StyleSheet.create({
left: 0,
width: 70,
height: 2,
marginHorizontal: INDICATOR_INSET,
backgroundColor: Colors.primary
},
containerShadow: {
Expand Down