Skip to content

Commit c431d1f

Browse files
author
Tautvilas
committed
chore: migrate to RN 44
1 parent 4238e97 commit c431d1f

File tree

7 files changed

+1600
-2875
lines changed

7 files changed

+1600
-2875
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
node_modules
33
npm-debug.log
44
.idea
5+
yarn.lock

example/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@
77
"test": "jest"
88
},
99
"dependencies": {
10-
"react": "~15.3.1",
11-
"react-native": "0.42.0",
12-
"react-native-navigation": "next",
10+
"react": "16.0.0-alpha.6",
11+
"react-native": "0.44.0",
12+
"react-native-navigation": "latest",
1313
"wix-react-native-calendar": "*"
1414
},
1515
"devDependencies": {
16-
"babel-jest": "17.0.0",
17-
"babel-preset-react-native": "1.9.0",
18-
"jest": "17.0.0",
19-
"jest-react-native": "17.0.0",
20-
"react-test-renderer": "~15.3.1"
16+
"babel-jest": "20.0.0",
17+
"babel-preset-react-native": "1.9.1",
18+
"jest": "20.0.0",
19+
"react-test-renderer": "16.0.0-alpha.6"
2120
},
2221
"jest": {
23-
"preset": "jest-react-native"
22+
"preset": "react-native"
2423
}
2524
}

example/yarn.lock

Lines changed: 1580 additions & 2758 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@
2121
"dependencies": {
2222
"xdate": "^0.8.0"
2323
},
24-
"peerDependencies": {},
24+
"peerDependencies": {
25+
"react": "16.0.0-alpha.6",
26+
"react-native": "0.44.0"
27+
},
2528
"devDependencies": {
29+
"react": "16.0.0-alpha.6",
30+
"react-native": "0.44.0",
2631
"jasmine": "^2.5.2",
2732
"wnpm-ci": "^6.1.0"
2833
}

src/calendar/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ renderDay(day, id) {
146146
}
147147

148148
render() {
149-
//console.log('render calendar ' + this.props.current.toString('yyyy-MM'));
149+
//console.log('render calendar ');
150150
const days = dateutils.page(this.state.currentMonth);
151151
const weeks = [];
152152
while (days.length) {

src/calendar/unit-day/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, {Component} from 'react';
2-
import _ from 'lodash';
2+
//import _ from 'lodash';
33
import {
44
TouchableWithoutFeedback,
55
Text,
@@ -21,10 +21,13 @@ class Day extends Component {
2121
shouldComponentUpdate(nextProps, nextState) {
2222
const newMarkingStyle = this.getDrawingStyle(nextProps.marked);
2323

24+
/*
2425
if (!_.isEqual(this.markingStyle, newMarkingStyle)) {
2526
this.markingStyle = newMarkingStyle;
2627
return true;
2728
}
29+
*/
30+
return true;
2831

2932
return ['state', 'children'].reduce((prev, next) => {
3033
if (prev || nextProps[next] !== this.props[next]) {

yarn.lock

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)