Skip to content
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.

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

(fix) Get rid of deprecation warnings for getDOMNode #558

Merged
merged 1 commit into from
Apr 24, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docs/src/app/components/code-example/code-block.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ var React = require('react'),
var CodeBlock = React.createClass({

componentDidMount: function() {
hljs.highlightBlock(this.getDOMNode());
hljs.highlightBlock(React.findDOMNode(this));
},

componentDidUpdate: function(prevProps, prevState) {
hljs.highlightBlock(this.getDOMNode());
hljs.highlightBlock(React.findDOMNode(this));
},

render: function() {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/app/components/pages/css-framework/typography.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ var TypographyPage = React.createClass({
},

_onClick: function(e) {
Dom.toggleClass(this.refs.verticalRhythmContainer.getDOMNode(), 'baseline-grid');
Dom.toggleClass(React.findDOMNode(this.refs.verticalRhythmContainer), 'baseline-grid');
}

});
Expand Down
8 changes: 4 additions & 4 deletions src/js/dialog-window.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var DialogWindow = React.createClass({
},

dismiss: function() {
CssEvent.onTransitionEnd(this.getDOMNode(), function() {
CssEvent.onTransitionEnd(React.findDOMNode(this), function() {
this.refs.dialogOverlay.allowScrolling();
}.bind(this));

Expand Down Expand Up @@ -155,8 +155,8 @@ var DialogWindow = React.createClass({

if (this.state.open) {

container = this.getDOMNode(),
dialogWindow = this.refs.dialogWindow.getDOMNode(),
container = React.findDOMNode(this),
dialogWindow = React.findDOMNode(this.refs.dialogWindow),
containerHeight = container.offsetHeight,

//Reset the height in case the window was resized.
Expand All @@ -174,7 +174,7 @@ var DialogWindow = React.createClass({

_focusOnAction: function() {
if (this.props.actionFocus) {
this.refs[this.props.actionFocus].getDOMNode().focus();
React.findDOMNode(this.refs[this.props.actionFocus]).focus();
}
},

Expand Down
4 changes: 2 additions & 2 deletions src/js/drop-down-menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ var DropDownMenu = React.createClass({
},

_setWidth: function() {
var el = this.getDOMNode(),
menuItemsDom = this.refs.menuItems.getDOMNode();
var el = React.findDOMNode(this),
menuItemsDom = React.findDOMNode(this.refs.menuItems);

el.style.width = menuItemsDom.offsetWidth + 'px';
},
Expand Down
10 changes: 5 additions & 5 deletions src/js/enhanced-switch.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var EnhancedSwitch = React.createClass({
},

componentDidMount: function() {
var inputNode = this.refs.checkbox.getDOMNode();
var inputNode = React.findDOMNode(this.refs.checkbox);
this.setState({switched: inputNode.checked});
},

Expand Down Expand Up @@ -196,22 +196,22 @@ var EnhancedSwitch = React.createClass({


isSwitched: function() {
return this.refs.checkbox.getDOMNode().checked;
return React.findDOMNode(this.refs.checkbox).checked;
},

// no callback here because there is no event
setSwitched: function(newSwitchedValue) {
if (!this.props.hasOwnProperty('checked') || this.props.checked === false) {
this.setState({switched: newSwitchedValue});
this.refs.checkbox.getDOMNode().checked = newSwitchedValue;
React.findDOMNode(this.refs.checkbox).checked = newSwitchedValue;
} else if (process.NODE_ENV !== 'production') {
var message = 'Cannot call set method while checked is defined as a property.';
console.error(message);
}
},

getValue: function() {
return this.refs.checkbox.getDOMNode().value;
return React.findDOMNode(this.refs.checkbox).value;
},

isKeyboardFocused: function() {
Expand All @@ -225,7 +225,7 @@ var EnhancedSwitch = React.createClass({
isKeyboardFocused: false
});

var isInputChecked = this.refs.checkbox.getDOMNode().checked;
var isInputChecked = React.findDOMNode(this.refs.checkbox).checked;

if (!this.props.hasOwnProperty('checked')) this.setState({switched: isInputChecked});
if (this.props.onSwitch) this.props.onSwitch(e, isInputChecked);
Expand Down
4 changes: 2 additions & 2 deletions src/js/enhanced-textarea.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ var EnhancedTextarea = React.createClass({
},

getInputNode: function() {
return this.refs.input.getDOMNode();
return React.findDOMNode(this.refs.input);
},

_syncHeightWithShadow: function(newValue, e) {
var shadow = this.refs.shadow.getDOMNode();
var shadow = React.findDOMNode(this.refs.shadow);
var currentHeight = this.state.height;
var newHeight;

Expand Down
2 changes: 1 addition & 1 deletion src/js/icon-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ var IconButton = React.createClass({
},

_positionTooltip: function() {
var tooltip = this.refs.tooltip.getDOMNode();
var tooltip = React.findDOMNode(this.refs.tooltip);
var tooltipWidth = tooltip.offsetWidth;
var buttonWidth = 48;

Expand Down
4 changes: 2 additions & 2 deletions src/js/input.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ var Input = React.createClass({
},

blur: function() {
if(this.isMounted()) this.refs.input.getDOMNode().blur();
if(this.isMounted()) React.findDOMNode(this.refs.input).blur();
},

focus: function() {
if (this.isMounted()) this.refs.input.getDOMNode().focus();
if (this.isMounted()) React.findDOMNode(this.refs.input).focus();
},

_onInputChange: function(e) {
Expand Down
10 changes: 5 additions & 5 deletions src/js/menu/menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ var NestedMenuItem = React.createClass({
},

_positionNestedMenu: function() {
var el = this.getDOMNode(),
nestedMenu = this.refs.nestedMenu.getDOMNode();
var el = React.findDOMNode(this),
nestedMenu = React.findDOMNode(this.refs.nestedMenu);

nestedMenu.style.left = el.offsetWidth + 'px';
},
Expand Down Expand Up @@ -140,7 +140,7 @@ var Menu = React.createClass({
},

componentDidMount: function() {
var el = this.getDOMNode();
var el = React.findDOMNode(this);

//Set the menu width
this._setKeyWidth(el);
Expand Down Expand Up @@ -273,8 +273,8 @@ var Menu = React.createClass({
var el;

if (this.props.hideable) {
el = this.getDOMNode();
var innerContainer = this.refs.paperContainer.getInnerContainer().getDOMNode();
el = React.findDOMNode(this);
var innerContainer = React.findDOMNode(this.refs.paperContainer.getInnerContainer());

if (this.props.visible) {

Expand Down
5 changes: 3 additions & 2 deletions src/js/mixins/click-awayable.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
var React = require('react');
var Events = require('../utils/events');
var Dom = require('../utils/dom');

Expand All @@ -14,7 +15,7 @@ module.exports = {
},

_checkClickAway: function(e) {
var el = this.getDOMNode();
var el = React.findDOMNode(this);

// Check if the target is inside the current component
if (this.isMounted() &&
Expand All @@ -33,4 +34,4 @@ module.exports = {
Events.off(document, 'click', this._checkClickAway);
}

};
};
4 changes: 2 additions & 2 deletions src/js/ripples/focus-ripple.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var FocusRipple = React.createClass({
},

_setRippleSize: function() {
var el = this.getDOMNode();
var el = React.findDOMNode(this);
var height = el.offsetHeight;
var width = el.offsetWidth;
var size = Math.max(height, width);
Expand All @@ -37,4 +37,4 @@ var FocusRipple = React.createClass({

});

module.exports = FocusRipple;
module.exports = FocusRipple;
2 changes: 1 addition & 1 deletion src/js/ripples/touch-ripple.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ var TouchRipple = React.createClass({

_getRippleStyle: function(e) {
var style = {};
var el = this.getDOMNode();
var el = React.findDOMNode(this);
var elHeight = el.offsetHeight;
var elWidth = el.offsetWidth;
var offset = Dom.offset(el);
Expand Down
4 changes: 2 additions & 2 deletions src/js/slider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ var Slider = React.createClass({
// let draggable handle the slider
if (this.state.dragging || this.props.disabled) return;
var value = this.state.value;
var node = this.refs.track.getDOMNode();
var node = React.findDOMNode(this.refs.track);
var boundingClientRect = node.getBoundingClientRect();
var offset = e.clientX - boundingClientRect.left;
this._updateWithChangeEvent(e, offset / node.clientWidth);
Expand All @@ -157,7 +157,7 @@ var Slider = React.createClass({
},

_dragX: function(e, pos) {
var max = this.refs.track.getDOMNode().clientWidth;
var max = React.findDOMNode(this.refs.track).clientWidth;
if (pos < 0) pos = 0; else if (pos > max) pos = max;
this._updateWithChangeEvent(e, pos / max);
},
Expand Down
4 changes: 2 additions & 2 deletions src/js/snackbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var Snackbar = React.createClass({
if (prevState.open != this.state.open) {
if (this.state.open) {
//Only Bind clickaway after transition finishes
CssEvent.onTransitionEnd(this.getDOMNode(), function() {
CssEvent.onTransitionEnd(React.findDOMNode(this), function() {
this._bindClickAway();
}.bind(this));
} else {
Expand Down Expand Up @@ -73,4 +73,4 @@ var Snackbar = React.createClass({

});

module.exports = Snackbar;
module.exports = Snackbar;
2 changes: 1 addition & 1 deletion src/js/tabs/tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var Tabs = React.createClass({
getEvenWidth: function(){
return (
parseInt(window
.getComputedStyle(this.getDOMNode())
.getComputedStyle(React.findDOMNode(this))
.getPropertyValue('width'), 10)
);
},
Expand Down
4 changes: 2 additions & 2 deletions src/js/text-field.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ var TextField = React.createClass({

_getInputNode: function() {
return this.props.multiLine ?
this.refs.input.getInputNode() : this.refs.input.getDOMNode();
this.refs.input.getInputNode() : React.findDOMNode(this.refs.input);
},

_handleInputBlur: function(e) {
Expand All @@ -202,7 +202,7 @@ var TextField = React.createClass({
_handleTextAreaHeightChange: function(e, height) {
var newHeight = height + 24;
if (this.props.floatingLabelText) newHeight += 24;
this.getDOMNode().style.height = newHeight + 'px';
React.findDOMNode(this).style.height = newHeight + 'px';
},

_isControlled: function() {
Expand Down
6 changes: 3 additions & 3 deletions src/js/tooltip.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ var Tooltip = React.createClass({
},

_setRippleSize: function() {
var ripple = this.refs.ripple.getDOMNode();
var tooltipSize = this.getDOMNode().offsetWidth;
var ripple = React.findDOMNode(this.refs.ripple);
var tooltipSize = React.findDOMNode(this).offsetWidth;
var ripplePadding = this.props.touch ? 45 : 20;
var rippleSize = tooltipSize + ripplePadding + 'px';

Expand All @@ -55,4 +55,4 @@ var Tooltip = React.createClass({

});

module.exports = Tooltip;
module.exports = Tooltip;