Skip to content

Commit 372d2ac

Browse files
committed
changing isAutoScrolled to an Object
1 parent 8c4fa66 commit 372d2ac

File tree

4 files changed

+23
-43
lines changed

4 files changed

+23
-43
lines changed

demo/src/screens/componentScreens/CarouselScreen.tsx

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
import _ from 'lodash';
22
import React, {Component} from 'react';
33
import {StyleSheet, ScrollView} from 'react-native';
4-
import {
5-
Constants,
6-
Spacings,
7-
View,
8-
Text,
9-
Carousel,
10-
Image,
11-
Colors
12-
} from 'react-native-ui-lib';
13-
import {
14-
renderBooleanOption,
15-
renderSliderOption
16-
} from '../ExampleScreenPresenter';
4+
import {Constants, Spacings, View, Text, Carousel, Image, Colors} from 'react-native-ui-lib';
5+
import {renderBooleanOption, renderSliderOption} from '../ExampleScreenPresenter';
176

187
const INITIAL_PAGE = 2;
198
const IMAGES = [
@@ -84,7 +73,6 @@ class CarouselScreen extends Component<Props, State> {
8473

8574
onChangePage = (currentPage: number, _: any) => {
8675
this.setState({currentPage});
87-
8876
};
8977

9078
onPagePress = (index: number) => {
@@ -103,19 +91,14 @@ class CarouselScreen extends Component<Props, State> {
10391
</Text>
10492

10593
<View marginH-20 marginB-20>
106-
{renderBooleanOption.call(this,
107-
'Limit number of pages shown in page control',
108-
'limitShownPages')}
94+
{renderBooleanOption.call(this, 'Limit number of pages shown in page control', 'limitShownPages')}
10995
{renderBooleanOption.call(this, 'autoplay', 'autoplay')}
110-
{renderSliderOption.call(this,
111-
'Number of pages shown',
112-
'numberOfPagesShown',
113-
{
114-
min: 5,
115-
max: 10,
116-
step: 1,
117-
initial: 7
118-
})}
96+
{renderSliderOption.call(this, 'Number of pages shown', 'numberOfPagesShown', {
97+
min: 5,
98+
max: 10,
99+
step: 1,
100+
initial: 7
101+
})}
119102
</View>
120103

121104
<Carousel
@@ -136,10 +119,7 @@ class CarouselScreen extends Component<Props, State> {
136119
loop
137120
>
138121
{_.map([...Array(numberOfPagesShown)], (item, index) => (
139-
<Page
140-
style={{backgroundColor: BACKGROUND_COLORS[index]}}
141-
key={index}
142-
>
122+
<Page style={{backgroundColor: BACKGROUND_COLORS[index]}} key={index}>
143123
<Text margin-15>CARD {index}</Text>
144124
</Page>
145125
))}

generatedTypes/components/carousel/CarouselPresenter.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { PropsWithChildren } from 'react';
2-
import { CarouselProps, CarouselState } from './types';
1+
import {PropsWithChildren} from 'react';
2+
import {CarouselProps, CarouselState} from './types';
33
export declare function getChildrenLength(props: PropsWithChildren<CarouselProps>): number;
44
export declare function calcOffset(props: CarouselProps, state: Omit<CarouselState, 'initialOffset' | 'prevProps'>): {
55
x: number;

generatedTypes/components/carousel/index.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React, { Component, RefObject, ReactNode, Key } from 'react';
2-
import { ScrollView, LayoutChangeEvent, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
3-
import { CarouselProps, CarouselState, PageControlPosition } from './types';
4-
export { CarouselProps, PageControlPosition };
1+
import React, {Component, RefObject, ReactNode, Key} from 'react';
2+
import {ScrollView, LayoutChangeEvent, NativeSyntheticEvent, NativeScrollEvent} from 'react-native';
3+
import {CarouselProps, CarouselState, PageControlPosition} from './types';
4+
export {CarouselProps, PageControlPosition};
55
declare type DefaultProps = Partial<CarouselProps>;
66
/**
77
* @description: Carousel for scrolling pages horizontally
@@ -49,7 +49,7 @@ declare class Carousel extends Component<CarouselProps, CarouselState> {
4949
getSnapToOffsets: () => number[] | undefined;
5050
shouldUsePageWidth(): number | false | undefined;
5151
shouldEnablePagination(): boolean | undefined;
52-
onContainerLayout: ({ nativeEvent: { layout: { width: containerWidth, height: containerHeight } } }: LayoutChangeEvent) => void;
52+
onContainerLayout: ({nativeEvent: {layout: {width: containerWidth, height: containerHeight}}}: LayoutChangeEvent) => void;
5353
shouldAllowAccessibilityLayout(): boolean | undefined;
5454
onContentSizeChange: () => void;
5555
onMomentumScrollEnd: () => void;
@@ -64,7 +64,7 @@ declare class Carousel extends Component<CarouselProps, CarouselState> {
6464
renderCarousel(): JSX.Element;
6565
render(): JSX.Element;
6666
}
67-
export { Carousel };
67+
export {Carousel};
6868
declare const _default: React.ComponentClass<CarouselProps & {
6969
useCustomTheme?: boolean | undefined;
7070
}, any> & Carousel & {

generatedTypes/components/carousel/types.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { ScrollViewProps, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent, PointPropType, Animated } from 'react-native';
2-
import { PageControlProps } from '../pageControl';
1+
import {ScrollViewProps, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent, PointPropType, Animated} from 'react-native';
2+
import {PageControlProps} from '../pageControl';
33
export declare enum PageControlPosition {
4-
OVER = "over",
5-
UNDER = "under"
4+
OVER = 'over',
5+
UNDER = 'under'
66
}
77
export interface CarouselProps extends ScrollViewProps {
88
/**
@@ -37,7 +37,7 @@ export interface CarouselProps extends ScrollViewProps {
3737
/**
3838
* callback for when page has changed
3939
*/
40-
onChangePage?: (newPageIndex: number, oldPageIndex: number, isAutoScrolled: boolean) => void;
40+
onChangePage?: (newPageIndex: number, oldPageIndex: number, info: {isAutoScrolled: boolean}) => void;
4141
/**
4242
* callback for onScroll event of the internal ScrollView
4343
*/

0 commit comments

Comments
 (0)