Skip to content

Commit 44ecbc0

Browse files
necolasnecolas
committed
[change] update React and Touchables
Update to [email protected]. The 'EventConstants' module no longer exports a key-mirror, which was preventing the 'ResponderEventPlugin' from working as it did with [email protected]. Close #255
1 parent 4cf4905 commit 44ecbc0

22 files changed

+263
-295
lines changed

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"deep-assign": "^2.0.0",
2929
"fbjs": "^0.8.4",
3030
"inline-style-prefixer": "^2.0.1",
31-
"react-dom": "~15.3.2",
31+
"react-dom": "~15.4.1",
3232
"react-textarea-autosize": "^4.0.4",
3333
"react-timer-mixin": "^0.13.3"
3434
},
@@ -49,15 +49,15 @@
4949
"file-loader": "^0.9.0",
5050
"jest": "^16.0.2",
5151
"node-libs-browser": "^0.5.3",
52-
"react": "~15.3.2",
53-
"react-addons-test-utils": "~15.3.2",
54-
"react-test-renderer": "~15.3.2",
52+
"react": "~15.4.1",
53+
"react-addons-test-utils": "~15.4.1",
54+
"react-test-renderer": "~15.4.1",
5555
"url-loader": "^0.5.7",
5656
"webpack": "^1.13.2",
5757
"webpack-bundle-analyzer": "^1.5.3"
5858
},
5959
"peerDependencies": {
60-
"react": "~15.3.2"
60+
"react": "~15.4.1"
6161
},
6262
"author": "Nicolas Gallagher",
6363
"license": "BSD-3-Clause",

‎src/apis/AppRegistry/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import { Component } from 'react';
1010
import invariant from 'fbjs/lib/invariant';
11-
import { unmountComponentAtNode } from 'react/lib/ReactMount';
11+
import { unmountComponentAtNode } from 'react-dom/lib/ReactMount';
1212
import renderApplication, { getApplication } from './renderApplication';
1313

1414
const emptyObject = {};

‎src/apis/AppRegistry/renderApplication.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import invariant from 'fbjs/lib/invariant';
10-
import { render } from 'react/lib/ReactMount';
10+
import { render } from 'react-dom/lib/ReactMount';
1111
import ReactNativeApp from './ReactNativeApp';
1212
import StyleSheet from '../../apis/StyleSheet';
1313
import React, { Component } from 'react';

‎src/apis/PanResponder/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
"use strict";
88

9-
var TouchHistoryMath = require('react/lib/TouchHistoryMath');
9+
var TouchHistoryMath = require('react-dom/lib/TouchHistoryMath');
1010

1111
var currentCentroidXOfTouchesChangedAfter =
1212
TouchHistoryMath.currentCentroidXOfTouchesChangedAfter;

‎src/apis/StyleSheet/StyleSheetValidation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
import { PropTypes } from 'react'
1111
import ImageStylePropTypes from '../../components/Image/ImageStylePropTypes'
12-
import ReactPropTypeLocations from 'react/lib/ReactPropTypeLocations'
13-
import ReactPropTypesSecret from 'react/lib/ReactPropTypesSecret'
12+
import ReactPropTypeLocations from 'react-dom/lib/ReactPropTypeLocations'
13+
import ReactPropTypesSecret from 'react-dom/lib/ReactPropTypesSecret'
1414
import TextStylePropTypes from '../../components/Text/TextStylePropTypes'
1515
import ViewStylePropTypes from '../../components/View/ViewStylePropTypes'
1616
import warning from 'fbjs/lib/warning'

‎src/apis/UIManager/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import createReactStyleObject from '../StyleSheet/createReactStyleObject';
2-
import CSSPropertyOperations from 'react/lib/CSSPropertyOperations';
2+
import CSSPropertyOperations from 'react-dom/lib/CSSPropertyOperations';
33

44
const _measureLayout = (node, relativeToNativeNode, callback) => {
55
const relativeNode = relativeToNativeNode || node.parentNode;

‎src/components/Switch/__tests__/__snapshots__/index-test.js.snap

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports[`components/Switch disabled when "false" a default checkbox is rendered
6767
"WebkitFlexBasis": "auto",
6868
"WebkitFlexDirection": "column",
6969
"WebkitFlexShrink": 0,
70-
"WebkitTransition": "0.1s",
70+
"WebkitTransitionDuration": "0.1s",
7171
"alignItems": "stretch",
7272
"backgroundColor": "#939393",
7373
"borderBottomLeftRadius": "10px",
@@ -112,7 +112,7 @@ exports[`components/Switch disabled when "false" a default checkbox is rendered
112112
"textAlign": "inherit",
113113
"textDecoration": "none",
114114
"top": "0px",
115-
"transition": "0.1s",
115+
"transitionDuration": "0.1s",
116116
"width": "90%",
117117
}
118118
} />
@@ -130,7 +130,7 @@ exports[`components/Switch disabled when "false" a default checkbox is rendered
130130
"WebkitFlexDirection": "column",
131131
"WebkitFlexShrink": 0,
132132
"WebkitTransform": "translateX(0%)",
133-
"WebkitTransition": "0.1s",
133+
"WebkitTransitionDuration": "0.1s",
134134
"alignItems": "stretch",
135135
"alignSelf": "flex-start",
136136
"backgroundColor": "#FAFAFA",
@@ -176,7 +176,7 @@ exports[`components/Switch disabled when "false" a default checkbox is rendered
176176
"textAlign": "inherit",
177177
"textDecoration": "none",
178178
"transform": "translateX(0%)",
179-
"transition": "0.1s",
179+
"transitionDuration": "0.1s",
180180
"width": "20px",
181181
}
182182
} />
@@ -281,7 +281,7 @@ exports[`components/Switch disabled when "true" a disabled checkbox is rendered
281281
"WebkitFlexBasis": "auto",
282282
"WebkitFlexDirection": "column",
283283
"WebkitFlexShrink": 0,
284-
"WebkitTransition": "0.1s",
284+
"WebkitTransitionDuration": "0.1s",
285285
"alignItems": "stretch",
286286
"backgroundColor": "#D5D5D5",
287287
"borderBottomLeftRadius": "10px",
@@ -326,7 +326,7 @@ exports[`components/Switch disabled when "true" a disabled checkbox is rendered
326326
"textAlign": "inherit",
327327
"textDecoration": "none",
328328
"top": "0px",
329-
"transition": "0.1s",
329+
"transitionDuration": "0.1s",
330330
"width": "90%",
331331
}
332332
} />
@@ -344,7 +344,7 @@ exports[`components/Switch disabled when "true" a disabled checkbox is rendered
344344
"WebkitFlexDirection": "column",
345345
"WebkitFlexShrink": 0,
346346
"WebkitTransform": "translateX(0%)",
347-
"WebkitTransition": "0.1s",
347+
"WebkitTransitionDuration": "0.1s",
348348
"alignItems": "stretch",
349349
"alignSelf": "flex-start",
350350
"backgroundColor": "#BDBDBD",
@@ -390,7 +390,7 @@ exports[`components/Switch disabled when "true" a disabled checkbox is rendered
390390
"textAlign": "inherit",
391391
"textDecoration": "none",
392392
"transform": "translateX(0%)",
393-
"transition": "0.1s",
393+
"transitionDuration": "0.1s",
394394
"width": "20px",
395395
}
396396
} />
@@ -495,7 +495,7 @@ exports[`components/Switch value when "false" an unchecked checkbox is rendered
495495
"WebkitFlexBasis": "auto",
496496
"WebkitFlexDirection": "column",
497497
"WebkitFlexShrink": 0,
498-
"WebkitTransition": "0.1s",
498+
"WebkitTransitionDuration": "0.1s",
499499
"alignItems": "stretch",
500500
"backgroundColor": "#939393",
501501
"borderBottomLeftRadius": "10px",
@@ -540,7 +540,7 @@ exports[`components/Switch value when "false" an unchecked checkbox is rendered
540540
"textAlign": "inherit",
541541
"textDecoration": "none",
542542
"top": "0px",
543-
"transition": "0.1s",
543+
"transitionDuration": "0.1s",
544544
"width": "90%",
545545
}
546546
} />
@@ -558,7 +558,7 @@ exports[`components/Switch value when "false" an unchecked checkbox is rendered
558558
"WebkitFlexDirection": "column",
559559
"WebkitFlexShrink": 0,
560560
"WebkitTransform": "translateX(0%)",
561-
"WebkitTransition": "0.1s",
561+
"WebkitTransitionDuration": "0.1s",
562562
"alignItems": "stretch",
563563
"alignSelf": "flex-start",
564564
"backgroundColor": "#FAFAFA",
@@ -604,7 +604,7 @@ exports[`components/Switch value when "false" an unchecked checkbox is rendered
604604
"textAlign": "inherit",
605605
"textDecoration": "none",
606606
"transform": "translateX(0%)",
607-
"transition": "0.1s",
607+
"transitionDuration": "0.1s",
608608
"width": "20px",
609609
}
610610
} />
@@ -709,7 +709,7 @@ exports[`components/Switch value when "true" a checked checkbox is rendered 1`]
709709
"WebkitFlexBasis": "auto",
710710
"WebkitFlexDirection": "column",
711711
"WebkitFlexShrink": 0,
712-
"WebkitTransition": "0.1s",
712+
"WebkitTransitionDuration": "0.1s",
713713
"alignItems": "stretch",
714714
"backgroundColor": "#A3D3CF",
715715
"borderBottomLeftRadius": "10px",
@@ -754,7 +754,7 @@ exports[`components/Switch value when "true" a checked checkbox is rendered 1`]
754754
"textAlign": "inherit",
755755
"textDecoration": "none",
756756
"top": "0px",
757-
"transition": "0.1s",
757+
"transitionDuration": "0.1s",
758758
"width": "90%",
759759
}
760760
} />
@@ -772,7 +772,7 @@ exports[`components/Switch value when "true" a checked checkbox is rendered 1`]
772772
"WebkitFlexDirection": "column",
773773
"WebkitFlexShrink": 0,
774774
"WebkitTransform": "translateX(100%)",
775-
"WebkitTransition": "0.1s",
775+
"WebkitTransitionDuration": "0.1s",
776776
"alignItems": "stretch",
777777
"alignSelf": "flex-start",
778778
"backgroundColor": "#009688",
@@ -818,7 +818,7 @@ exports[`components/Switch value when "true" a checked checkbox is rendered 1`]
818818
"textAlign": "inherit",
819819
"textDecoration": "none",
820820
"transform": "translateX(100%)",
821-
"transition": "0.1s",
821+
"transitionDuration": "0.1s",
822822
"width": "20px",
823823
}
824824
} />

‎src/components/Switch/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const styles = StyleSheet.create({
152152
...StyleSheet.absoluteFillObject,
153153
height: '70%',
154154
margin: 'auto',
155-
transition: '0.1s',
155+
transitionDuration: '0.1s',
156156
width: '90%'
157157
},
158158
disabledTrack: {
@@ -162,7 +162,7 @@ const styles = StyleSheet.create({
162162
alignSelf: 'flex-start',
163163
borderRadius: '100%',
164164
boxShadow: thumbDefaultBoxShadow,
165-
transition: '0.1s'
165+
transitionDuration: '0.1s'
166166
},
167167
disabledThumb: {
168168
backgroundColor: '#BDBDBD'

‎src/components/Touchable/BoundingDimensions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
'use strict';
88

9-
var PooledClass = require('react/lib/PooledClass');
9+
var PooledClass = require('react-dom/lib/PooledClass');
1010

1111
var twoArgumentPooler = PooledClass.twoArgumentPooler;
1212

‎src/components/Touchable/Position.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
'use strict';
88

9-
var PooledClass = require('react/lib/PooledClass');
9+
var PooledClass = require('react-dom/lib/PooledClass');
1010

1111
var twoArgumentPooler = PooledClass.twoArgumentPooler;
1212

0 commit comments

Comments
 (0)