Merge pull request #623 from pomerantsev/find-dom-node

Replace all instances of getDOMNode with findDOMNode
mui · May 10, 2015 · 626c0b0 · 626c0b0
2 parents 9b9f222 + 009503c
commit 626c0b0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/src/drop-down-menu.jsx b/src/drop-down-menu.jsx
@@ -163,7 +163,7 @@ var DropDownMenu = React.createClass({
 
   _setWidth: function() {
     var el = React.findDOMNode(this),
-      menuItemsDom = this.refs.menuItems.getDOMNode();
+      menuItemsDom = React.findDOMNode(this.refs.menuItems);
 
     el.style.width = menuItemsDom.offsetWidth + 'px';
   },
@@ -200,4 +200,4 @@ var DropDownMenu = React.createClass({
 
 });
 
-module.exports = DropDownMenu;
+module.exports = DropDownMenu;
diff --git a/src/enhanced-button.jsx b/src/enhanced-button.jsx
@@ -185,7 +185,7 @@ var EnhancedButton = React.createClass({
   },
 
   _handleFocus: function(e) {
-    this.getDOMNode().style.outline = 'none';
+    React.findDOMNode(this).style.outline = 'none';
     if (!this.props.disabled) {
       //setTimeout is needed because the focus event fires first
       //Wait so that we can capture if this was a keyboard focus
@@ -204,7 +204,7 @@ var EnhancedButton = React.createClass({
   },
 
   _handleMouseOver: function(e) {
-    this.getDOMNode().style.textDecoration = 'none';
+    React.findDOMNode(this).style.textDecoration = 'none';
     if (this.props.onMouseOver) this.props.onMouseOver(e);
   },
 

diff --git a/src/flat-button.jsx b/src/flat-button.jsx
@@ -143,9 +143,9 @@ var FlatButton = React.createClass({
   _handleKeyboardFocus: function(e, keyboardFocused) {
 
     if (keyboardFocused && !this.props.disabled) {
-      this.getDOMNode().style.backgroundColor = ColorManipulator.fade(ColorManipulator.lighten(this.getStyles().root.color, 0.4), 0.15);
+      React.findDOMNode(this).style.backgroundColor = ColorManipulator.fade(ColorManipulator.lighten(this.getStyles().root.color, 0.4), 0.15);
     } else {
-      this.getDOMNode().style.backgroundColor = 'transparent';
+      React.findDOMNode(this).style.backgroundColor = 'transparent';
     }
   }
 

diff --git a/src/left-nav.jsx b/src/left-nav.jsx
@@ -158,8 +158,8 @@ var LeftNav = React.createClass({
 
   _updateMenuHeight: function() {
     if (this.props.header) {
-      var container = this.refs.clickAwayableElement.getDOMNode();
-      var menu = this.refs.menuItems.getDOMNode();
+      var container = React.findDOMNode(this.refs.clickAwayableElement);
+      var menu = React.findDOMNode(this.refs.menuItems);
       var menuHeight = container.clientHeight - menu.offsetTop;
       menu.style.height = menuHeight + 'px';
     }

diff --git a/src/menu/menu.jsx b/src/menu/menu.jsx
@@ -99,7 +99,7 @@ var NestedMenuItem = React.createClass({
 
   _positionNestedMenu: function() {
 // <<<<<<< HEAD:src/menu/menu.jsx
-    var el = this.getDOMNode();
+    var el = React.findDOMNode(this);
     var nestedMenu = React.findDOMNode(this.refs.nestedMenu);
 // =======
 //     var el = React.findDOMNode(this),

diff --git a/src/raised-button.jsx b/src/raised-button.jsx
@@ -209,12 +209,12 @@ var RaisedButton = React.createClass({
     if (keyboardFocused && !this.props.disabled) {
       this.setState({ zDepth: this.state.initialZDepth + 1 });
       var amount = (this.props.primary || this.props.secondary) ? 0.4 : 0.08;
-      this.refs.overlay.getDOMNode().style.backgroundColor = ColorManipulator.fade(this.mergeAndPrefix(this.styles.label, this.props.labelStyle).color, amount);
+      React.findDOMNode(this.refs.overlay).style.backgroundColor = ColorManipulator.fade(this.mergeAndPrefix(this.styles.label, this.props.labelStyle).color, amount);
     } else if (!this.state.hovered) {
       this.setState({ zDepth: this.state.initialZDepth });
-      this.refs.overlay.getDOMNode().style.backgroundColor = 'transparent';
+      React.findDOMNode(this.refs.overlay).style.backgroundColor = 'transparent';
     }
   },
 });
 
-module.exports = RaisedButton;
+module.exports = RaisedButton;
diff --git a/src/time-picker/clock-hours.jsx b/src/time-picker/clock-hours.jsx
@@ -37,7 +37,7 @@ var ClockHours = React.createClass({
   },
 
   componentDidMount: function () {
-    var clockElement = this.refs.mask.getDOMNode();
+    var clockElement = React.findDOMNode(this.refs.mask);
 
       this.center = {
         x: clockElement.offsetWidth / 2,
@@ -175,4 +175,3 @@ var ClockHours = React.createClass({
 });
 
 module.exports = ClockHours;
-
diff --git a/src/time-picker/clock-minutes.jsx b/src/time-picker/clock-minutes.jsx
@@ -39,7 +39,7 @@ var ClockMinutes = React.createClass({
   },
 
   componentDidMount: function () {
-    var clockElement = this.refs.mask.getDOMNode();
+    var clockElement = React.findDOMNode(this.refs.mask);
 
       this.center = {
         x: clockElement.offsetWidth / 2,
@@ -158,4 +158,3 @@ var ClockMinutes = React.createClass({
 });
 
 module.exports = ClockMinutes;
-
diff --git a/src/transition-groups/slide-in-child.jsx b/src/transition-groups/slide-in-child.jsx
@@ -15,7 +15,7 @@ var SlideInChild = React.createClass({
   },
 
   componentWillEnter: function(callback) {
-    var style = this.getDOMNode().style;
+    var style = React.findDOMNode(this).style;
     var x = this.props.direction === 'left' ? '100%' :
       this.props.direction === 'right' ? '-100%' : '0';
     var y = this.props.direction === 'up' ? '100%' :
@@ -28,13 +28,13 @@ var SlideInChild = React.createClass({
   },
 
   componentDidEnter: function() {
-    var style = this.getDOMNode().style;
+    var style = React.findDOMNode(this).style;
     style.opacity = '1';
     AutoPrefix.set(style, 'transform', 'translate3d(0,0,0)');
   },
 
   componentWillLeave: function(callback) {
-    var style = this.getDOMNode().style;
+    var style = React.findDOMNode(this).style;
     var direction = this.props.getLeaveDirection();
     var x = direction === 'left' ? '-100%' :
       direction === 'right' ? '100%' : '0';
@@ -72,4 +72,4 @@ var SlideInChild = React.createClass({
 
 });
 
-module.exports = SlideInChild;
+module.exports = SlideInChild;