Skip to content

Commit 85d57da

Browse files
oliviertassinarioliviertassinari
committed
Merge pull request #1919 from cgestes/master
[React v0.14] Fix React.findDOMNode
2 parents 26141b0 + 8124b4e commit 85d57da

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

‎src/table/table.jsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const React = require('react');
2+
const ReactDOM = require('react-dom');
23
const StylePropable = require('../mixins/style-propable');
34
const DefaultRawTheme = require('../styles/raw-themes/light-raw-theme');
45
const ThemeManager = require('../styles/theme-manager');
@@ -169,8 +170,8 @@ const Table = React.createClass({
169170
},
170171

171172
isScrollbarVisible() {
172-
const tableDivHeight = React.findDOMNode(this.refs.tableDiv).clientHeight;
173-
const tableBodyHeight = React.findDOMNode(this.refs.tableBody).clientHeight;
173+
const tableDivHeight = ReactDOM.findDOMNode(this.refs.tableDiv).clientHeight;
174+
const tableBodyHeight = ReactDOM.findDOMNode(this.refs.tableBody).clientHeight;
174175

175176
return tableBodyHeight > tableDivHeight;
176177
},

‎test/date-picker/calendar-spec.js‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import injectTapEventPlugin from 'react-tap-event-plugin';
22
injectTapEventPlugin();
33

44
import React from 'react/addons';
5+
import ReactDOM from 'react-dom';
56
import Calendar from 'date-picker/calendar';
67
import CalendarToolbar from 'date-picker/calendar-toolbar';
78
import IconButton from 'icon-button';
@@ -22,12 +23,12 @@ describe(`Calendar`, () => {
2223
let maxDate = new Date(initialDate.toDateString());
2324

2425
let render = TestUtils.renderIntoDocument(
25-
<ThemedCalendar
26+
<ThemedCalendar
2627
initialDate={initialDate}
2728
maxDate={maxDate}
2829
/>
2930
);
30-
let renderedCalendarToolbar =
31+
let renderedCalendarToolbar =
3132
TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
3233

3334
expect(renderedCalendarToolbar.props.nextMonth).to.be.false;
@@ -43,7 +44,7 @@ describe(`Calendar`, () => {
4344
initialDate={initialDate}
4445
maxDate={maxDate} />
4546
);
46-
let renderedCalendarToolbar =
47+
let renderedCalendarToolbar =
4748
TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
4849

4950
expect(renderedCalendarToolbar.props.nextMonth).to.be.false;
@@ -55,12 +56,12 @@ describe(`Calendar`, () => {
5556
maxDate.setMonth(maxDate.getMonth() + 1);
5657

5758
let render = TestUtils.renderIntoDocument(
58-
<ThemedCalendar
59+
<ThemedCalendar
5960
initialDate={initialDate}
6061
maxDate={maxDate} />
6162
);
6263

63-
let renderedCalendarToolbar =
64+
let renderedCalendarToolbar =
6465
TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
6566

6667
expect(renderedCalendarToolbar.props.nextMonth).to.be.true;
@@ -71,15 +72,15 @@ describe(`Calendar`, () => {
7172
let maxDate = new Date(initialDate.toDateString());
7273

7374
let render = TestUtils.renderIntoDocument(
74-
<ThemedCalendar
75+
<ThemedCalendar
7576
initialDate={initialDate}
7677
maxDate={maxDate} />
7778
);
78-
let prevMonthButton = React.findDOMNode(
79+
let prevMonthButton = ReactDOM.findDOMNode(
7980
TestUtils.scryRenderedComponentsWithType(render, IconButton)[0]);
8081
TestUtils.Simulate.touchTap(prevMonthButton);
8182

82-
let renderedCalendarToolbar =
83+
let renderedCalendarToolbar =
8384
TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
8485

8586
expect(renderedCalendarToolbar.props.nextMonth).to.be.true;
@@ -91,15 +92,15 @@ describe(`Calendar`, () => {
9192
maxDate.setMonth(maxDate.getMonth() + 1);
9293

9394
let render = TestUtils.renderIntoDocument(
94-
<ThemedCalendar
95+
<ThemedCalendar
9596
initialDate={initialDate}
9697
maxDate={maxDate} />
9798
);
98-
let nextMonthButton = React.findDOMNode(
99+
let nextMonthButton = ReactDOM.findDOMNode(
99100
TestUtils.scryRenderedComponentsWithType(render, IconButton)[1]);
100101
TestUtils.Simulate.touchTap(nextMonthButton);
101102

102-
let renderedCalendarToolbar =
103+
let renderedCalendarToolbar =
103104
TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
104105

105106
expect(renderedCalendarToolbar.props.nextMonth).to.be.false;
@@ -112,9 +113,9 @@ describe(`Calendar`, () => {
112113
let minDate = new Date(initialDate.toDateString());
113114

114115
let render = TestUtils.renderIntoDocument(
115-
<ThemedCalendar
116+
<ThemedCalendar
116117
initialDate={initialDate}
117-
minDate={minDate}
118+
minDate={minDate}
118119
/>
119120
);
120121
let calendarToolbar = TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
@@ -128,9 +129,9 @@ describe(`Calendar`, () => {
128129
minDate.setMonth(initialDate.getMonth() + 1);
129130

130131
let render = TestUtils.renderIntoDocument(
131-
<ThemedCalendar
132+
<ThemedCalendar
132133
initialDate={initialDate}
133-
minDate={minDate}
134+
minDate={minDate}
134135
/>
135136
);
136137
let calendarToolbar = TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
@@ -144,9 +145,9 @@ describe(`Calendar`, () => {
144145
minDate.setMonth(initialDate.getMonth() - 1);
145146

146147
let render = TestUtils.renderIntoDocument(
147-
<ThemedCalendar
148+
<ThemedCalendar
148149
initialDate={initialDate}
149-
minDate={minDate}
150+
minDate={minDate}
150151
/>
151152
);
152153
let calendarToolbar = TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
@@ -159,13 +160,13 @@ describe(`Calendar`, () => {
159160
let minDate = new Date(initialDate.toDateString());
160161

161162
let render = TestUtils.renderIntoDocument(
162-
<ThemedCalendar
163+
<ThemedCalendar
163164
initialDate={initialDate}
164-
minDate={minDate}
165+
minDate={minDate}
165166
/>
166167
);
167168

168-
let nextMonthIconButton = React.findDOMNode(TestUtils.scryRenderedComponentsWithType(render, IconButton)[1]);
169+
let nextMonthIconButton = ReactDOM.findDOMNode(TestUtils.scryRenderedComponentsWithType(render, IconButton)[1]);
169170
TestUtils.Simulate.touchTap(nextMonthIconButton);
170171

171172
let calendarToolbar = TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
@@ -178,17 +179,17 @@ describe(`Calendar`, () => {
178179
minDate.setMonth(minDate.getMonth() - 1);
179180

180181
let render = TestUtils.renderIntoDocument(
181-
<ThemedCalendar
182+
<ThemedCalendar
182183
initialDate={initialDate}
183-
minDate={minDate}
184+
minDate={minDate}
184185
/>
185186
);
186187

187-
let prevMonthIconButton = React.findDOMNode(TestUtils.scryRenderedComponentsWithType(render, IconButton)[0]);
188+
let prevMonthIconButton = ReactDOM.findDOMNode(TestUtils.scryRenderedComponentsWithType(render, IconButton)[0]);
188189
TestUtils.Simulate.touchTap(prevMonthIconButton);
189190

190191
let calendarToolbar = TestUtils.findRenderedComponentWithType(render, CalendarToolbar);
191192
expect(calendarToolbar.props.prevMonth).to.be.false;
192193
});
193194
});
194-
});
195+
});

0 commit comments

Comments
 (0)