Skip to content

Added support for RN >= 0.49 #15

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

Open
bkvirendra wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Added support for RN >= 0.49 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f9a4a6
updated to use `prop-types` package
bkvirendra Dec 14, 2017
1c783fa
added `create-react-class` as dependency
bkvirendra Dec 14, 2017
c4619e2
added `createReactClass`
bkvirendra Dec 14, 2017
ecf0837
updated the `setTimeout` to use `TimerMixin`
bkvirendra Feb 26, 2018
864430f
added `react-timer-mixin` dependency
bkvirendra Feb 26, 2018
a8a757f
version bump `2.0.1`
bkvirendra Feb 26, 2018
8ab82bf
updated `react-tween-state` dependency to 0.1.5
bkvirendra Feb 26, 2018
ffb0aa9
version bump to 2.0.2
bkvirendra Feb 26, 2018
eacc396
Added support for animated bars on Android
shahzaibmuneeb Mar 13, 2018
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
24 changes: 15 additions & 9 deletions lib/SegmentedView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
var React = require('react');

var {
PropTypes
} = React;
var PropTypes = require('prop-types');

var createReactClass = require('create-react-class');

var TimerMixin = require('react-timer-mixin');

var {
StyleSheet,
Text,
Image,
View,
TouchableHighlight,
Dimensions
Dimensions,
Platform
} = require('react-native');

var screen = Dimensions.get('window');
Expand Down Expand Up @@ -45,9 +48,9 @@ var styles = StyleSheet.create({
});


var SegmentedView = React.createClass({
var SegmentedView = createReactClass({

mixins: [tweenState.Mixin],
mixins: [tweenState.Mixin, TimerMixin],

propTypes: {
duration: PropTypes.number,
Expand Down Expand Up @@ -91,14 +94,17 @@ var SegmentedView = React.createClass({
},

componentDidMount() {
setTimeout(() => this.moveTo(this.props.index), 0);
this.setTimeout(() => this.moveTo(this.props.index), 0);
},

componentWillReceiveProps(nextProps) {
this.moveTo(nextProps.index);
},

measureHandler(ox, oy, width) {
if(Platform.OS === 'android'){
ox = this.props.index * width
}

this.tweenState('barLeft', {
easing: tweenState.easingTypes.easeInOutQuad,
Expand All @@ -113,7 +119,7 @@ var SegmentedView = React.createClass({
onEnd: this.props.onTransitionEnd
});

setTimeout(this.props.onTransitionStart, 0);
this.setTimeout(this.props.onTransitionStart, 0);
},

moveTo(index) {
Expand All @@ -130,7 +136,7 @@ var SegmentedView = React.createClass({

renderTitle(title, i) {
return (
<View key={i} ref={i} style={{ flex: this.props.stretch ? 1 : 0 }}>
<View key={i} ref={i} style={{ flex: this.props.stretch ? 1 : 0 }} collapsable={false}>
<TouchableHighlight underlayColor={this.props.underlayColor} onPress={() => this.props.onPress(i)}>
{this.props.renderTitle ? this.props.renderTitle(title, i) : this._renderTitle(title, i)}
</TouchableHighlight>
Expand Down
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-segmented-view",
"version": "2.0.0",
"version": "2.0.2",
"description": "Segmented View for React Native (with animation)",
"main": "index.js",
"scripts": {
Expand All @@ -24,7 +24,9 @@
},
"homepage": "https://github.com/lelandrichardson/react-native-segmented-view",
"dependencies": {
"react-tween-state": "0.0.5"
"react-tween-state": "0.1.5",
"create-react-class": "15.6.2",
"react-timer-mixin": "0.13.3"
},
"peerDependencies": {
"react-native": ">=0.34.1"
Expand Down