Change interfaces names for TabController related classes

Author: M-i-k-e-l

demo/src/screens/componentScreens/TabControllerScreen/index.tsx

@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 import {ActivityIndicator} from 'react-native';
-import {Assets, TabController, Colors, View, Text, Button, TabBarItemProps} from 'react-native-ui-lib';
+import {Assets, TabController, Colors, View, Text, Button, TabControllerItemProps} from 'react-native-ui-lib';
 import {gestureHandlerRootHOC} from 'react-native-gesture-handler';
 import _ from 'lodash';
 
@@ -16,7 +16,7 @@ interface State {
   fewItems: boolean;
   selectedIndex: number;
   key: string | number;
-  items: TabBarItemProps[];
+  items: TabControllerItemProps[];
 }
 
 class TabControllerScreen extends Component<{}, State> {
@@ -35,13 +35,13 @@ class TabControllerScreen extends Component<{}, State> {
     this.state.items = this.generateTabItems();
   }
 
-  generateTabItems = (fewItems = this.state.fewItems, centerSelected = this.state.centerSelected): TabBarItemProps[] => {
-    let items: TabBarItemProps[] = _.chain(TABS)
+  generateTabItems = (fewItems = this.state.fewItems, centerSelected = this.state.centerSelected): TabControllerItemProps[] => {
+    let items: TabControllerItemProps[] = _.chain(TABS)
       .take(fewItems ? 3 : TABS.length)
-      .map<TabBarItemProps>(tab => ({label: tab, key: tab}))
+      .map<TabControllerItemProps>(tab => ({label: tab, key: tab}))
       .value();
 
-    const addItem: TabBarItemProps = {icon: Assets.icons.demo.add, key: 'add', ignore: true, width: 60, onPress: this.onAddItem};
+    const addItem: TabControllerItemProps = {icon: Assets.icons.demo.add, key: 'add', ignore: true, width: 60, onPress: this.onAddItem};
 
     if (!centerSelected) {
       items = [...items, addItem];

generatedTypes/components/tabController/PageCarousel.d.ts

@@ -1,4 +1,5 @@
 import React, { PureComponent } from 'react';
+import _ from 'lodash';
 import Animated from 'react-native-reanimated';
 /**
  * @description: TabController's Page Carousel
@@ -13,7 +14,7 @@ declare class PageCarousel extends PureComponent {
     componentDidMount(): void;
     onTabChange: ([index]: readonly number[]) => void;
     scrollToPage: (pageIndex: number) => void;
-    renderCodeBlock: () => Animated.Node<number>;
+    renderCodeBlock: (() => JSX.Element) & _.MemoizedFunction;
     render(): JSX.Element;
 }
 export default PageCarousel;

generatedTypes/components/tabController/TabBar.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import { TextProps, StyleProp, ViewStyle } from 'react-native';
-import { TabBarItemProps } from './TabBarItem';
-export interface TabBarProps {
+import { TabControllerItemProps } from './TabBarItem';
+export interface TabControllerBarProps {
     /**
      * The list of tab bar items
      */
-    items?: TabBarItemProps[];
+    items?: TabControllerItemProps[];
     /**
      * Tab Bar height
      */
@@ -76,7 +76,7 @@ export interface TabBarProps {
      */
     testID?: string;
 }
-declare const _default: React.ComponentClass<TabBarProps & {
+declare const _default: React.ComponentClass<TabControllerBarProps & {
     useCustomTheme?: boolean | undefined;
 }, any>;
 export default _default;

generatedTypes/components/tabController/TabBarItem.d.ts

@@ -6,7 +6,7 @@ import Animated from 'react-native-reanimated';
 import { State } from 'react-native-gesture-handler';
 import { BadgeProps } from '../../components/badge';
 import { TouchableOpacityProps } from '../../incubator';
-export interface TabBarItemProps {
+export interface TabControllerItemProps {
     /**
      * label of the tab
      */
@@ -77,7 +77,7 @@ export interface TabBarItemProps {
      */
     testID?: string;
 }
-interface Props extends TabBarItemProps {
+interface Props extends TabControllerItemProps {
     index: number;
     targetPage: any;
     state: State;

generatedTypes/components/tabController/TabPage.d.ts

@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import Reanimated from 'react-native-reanimated';
-export interface TabPageProps {
+import _ from 'lodash';
+export interface TabControllerPageProps {
     /**
      * The index of the the TabPage
      */
@@ -26,7 +27,7 @@ export interface TabPageProps {
  * @description: TabController's TabPage
  * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/componentScreens/TabControllerScreen/index.js
  */
-export default class TabPage extends PureComponent<TabPageProps> {
+export default class TabPage extends PureComponent<TabControllerPageProps> {
     static displayName: string;
     static contextType: React.Context<{}>;
     static defaultProps: {
@@ -65,6 +66,6 @@ export default class TabPage extends PureComponent<TabPageProps> {
         width?: undefined;
     } | undefined)[];
     lazyLoad: () => void;
-    renderCodeBlock: () => Reanimated.Node<number>;
+    renderCodeBlock: (() => JSX.Element) & _.MemoizedFunction;
     render(): JSX.Element;
 }

generatedTypes/components/tabController/index.d.ts

@@ -1,15 +1,15 @@
 import React, { Component } from 'react';
-import Reanimated from 'react-native-reanimated';
+import _ from 'lodash';
 import TabBar from './TabBar';
-import TabBarItem, { TabBarItemProps } from './TabBarItem';
+import TabBarItem, { TabControllerItemProps } from './TabBarItem';
 import TabPage from './TabPage';
 import PageCarousel from './PageCarousel';
-export { TabBarItemProps };
+export { TabControllerItemProps };
 export interface TabControllerProps {
     /**
      * The list of tab bar items
      */
-    items: TabBarItemProps[];
+    items: TabControllerItemProps[];
     /**
      * Initial selected index
      */
@@ -67,7 +67,7 @@ declare class TabController extends Component<TabControllerProps, StateProps> {
     get pageWidth(): number;
     registerTabItems: (tabItemsCount: number, ignoredItems: StateProps['ignoredItems']) => void;
     onPageChange: ([index]: readonly number[]) => void;
-    renderCodeBlock: () => Reanimated.Node<number>;
+    renderCodeBlock: (() => JSX.Element) & _.MemoizedFunction;
     render(): JSX.Element;
 }
 declare const _default: React.ComponentClass<TabControllerProps & {

generatedTypes/index.d.ts

@@ -42,7 +42,7 @@ export {default as Overlay, OverlayTypes} from './components/overlay';
 export {default as RadioButton, RadioButtonPropTypes, RadioButtonProps} from './components/radioButton/RadioButton';
 export {default as RadioGroup, RadioGroupPropTypes, RadioGroupProps} from './components/radioButton/RadioGroup';
 export {default as Switch, SwitchProps} from './components/switch';
-export {default as TabController, TabControllerProps, TabBarItemProps} from './components/tabController';
+export {default as TabController, TabControllerProps, TabControllerItemProps} from './components/tabController';
 export {default as TabBar, TabBarProps} from './components/TabBar';
 export {default as Fader, FaderProps, FaderPosition} from './components/fader';
 export {default as ExpandableSection, ExpandableSectionProps} from './components/expandableSection';

src/components/tabController/TabBar.tsx

@@ -16,7 +16,7 @@ import Reanimated from 'react-native-reanimated';
 import _ from 'lodash';
 
 import TabBarContext from './TabBarContext';
-import TabBarItem, {TabBarItemProps} from './TabBarItem';
+import TabBarItem, {TabControllerItemProps} from './TabBarItem';
 import {asBaseComponent, forwardRef, BaseComponentInjectedProps, ForwardRefInjectedProps} from '../../commons/new';
 import View from '../../components/view';
 import ScrollBarGradient from '../scrollBar/ScrollBarGradient';
@@ -42,11 +42,11 @@ const DEFAULT_SELECTED_LABEL_STYLE = {
   letterSpacing: 0
 };
 
-export interface TabBarProps {
+export interface TabControllerBarProps {
   /**
    * The list of tab bar items
    */
-  items?: TabBarItemProps[];
+  items?: TabControllerItemProps[];
   /**
    * Tab Bar height
    */
@@ -122,9 +122,9 @@ export interface TabBarProps {
   testID?: string;
 }
 
-type ChildProps = React.ReactElement<TabBarItemProps>;
+type ChildProps = React.ReactElement<TabControllerItemProps>;
 
-interface Props extends TabBarProps, BaseComponentInjectedProps, ForwardRefInjectedProps {
+interface Props extends TabControllerBarProps, BaseComponentInjectedProps, ForwardRefInjectedProps {
   children?: ChildProps[] | ChildProps;
 }
 
@@ -431,7 +431,7 @@ class TabBar extends PureComponent<Props, State> {
   renderCodeBlock = _.memoize(() => {
     const {currentPage, targetPage} = this.context;
     const {itemsWidths, itemsOffsets} = this.state;
-    const nodes = [];
+    const nodes: any[] = [];
 
     nodes.push(set(this._indicatorOffset,
       interpolate(currentPage, {
@@ -529,4 +529,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default asBaseComponent<TabBarProps>(forwardRef<Props>(TabBar));
+export default asBaseComponent<TabControllerBarProps>(forwardRef<Props>(TabBar));

src/components/tabController/TabBarItem.tsx

@@ -22,7 +22,7 @@ const {cond, eq, call, block, event, and} = Reanimated;
 const DEFAULT_LABEL_COLOR = Colors.black;
 const DEFAULT_SELECTED_LABEL_COLOR = Colors.blue30;
 
-export interface TabBarItemProps {
+export interface TabControllerItemProps {
   /**
    * label of the tab
    */
@@ -102,7 +102,7 @@ export interface TabBarItemProps {
   testID?: string;
 }
 
-interface Props extends TabBarItemProps {
+interface Props extends TabControllerItemProps {
   index: number;
   targetPage: any; // TODO: typescript?
   state: State;

src/components/tabController/TabPage.tsx

@@ -7,7 +7,7 @@ import {Constants} from '../../helpers';
 
 const {Code, Value, cond, set, and, call, block, eq} = Reanimated;
 
-export interface TabPageProps {
+export interface TabControllerPageProps {
   /**
    * The index of the the TabPage
    */
@@ -34,7 +34,7 @@ export interface TabPageProps {
  * @description: TabController's TabPage
  * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/componentScreens/TabControllerScreen/index.js
  */
-export default class TabPage extends PureComponent<TabPageProps> {
+export default class TabPage extends PureComponent<TabControllerPageProps> {
   static displayName = 'TabController.TabPage';
 
   static contextType = TabBarContext;

src/components/tabController/index.tsx

@@ -8,10 +8,10 @@ import {Constants} from '../../helpers';
 import {asBaseComponent} from '../../commons/new';
 import TabBarContext from './TabBarContext';
 import TabBar from './TabBar';
-import TabBarItem, {TabBarItemProps} from './TabBarItem';
+import TabBarItem, {TabControllerItemProps} from './TabBarItem';
 import TabPage from './TabPage';
 import PageCarousel from './PageCarousel';
-export {TabBarItemProps};
+export {TabControllerItemProps};
 
 const {
   and,
@@ -41,7 +41,7 @@ export interface TabControllerProps {
   /**
    * The list of tab bar items
    */
-  items: TabBarItemProps[];
+  items: TabControllerItemProps[];
   /**
    * Initial selected index
    */
@@ -110,7 +110,7 @@ class TabController extends Component<TabControllerProps, StateProps> {
         .size()
         .value();
       itemStates = _.times(itemsCount, () => new Value(State.UNDETERMINED));
-      ignoredItems = _.filter<TabBarItemProps[]>(props.items, (item: TabBarItemProps) => item.ignore);
+      ignoredItems = _.filter<TabControllerItemProps[]>(props.items, (item: TabControllerItemProps) => item.ignore);
     }
 
     this.state = {

src/index.ts

@@ -36,7 +36,7 @@ export {default as Overlay, OverlayTypes} from './components/overlay';
 export {default as RadioButton, RadioButtonPropTypes, RadioButtonProps} from './components/radioButton/RadioButton';
 export {default as RadioGroup, RadioGroupPropTypes, RadioGroupProps} from './components/radioButton/RadioGroup';
 export {default as Switch, SwitchProps} from './components/switch';
-export {default as TabController, TabControllerProps, TabBarItemProps} from './components/tabController';
+export {default as TabController, TabControllerProps, TabControllerItemProps} from './components/tabController';
 export {default as TabBar, TabBarProps} from './components/TabBar';
 export {default as Fader, FaderProps, FaderPosition} from './components/fader';
 export {default as ExpandableSection, ExpandableSectionProps} from './components/expandableSection';