Merge pull request #71 from jrsquared/remove-deprecated-getdomnode

Remove deprecated .getDOMNode() calls
AllenFang · Oct 22, 2015 · 37b5c7e · 37b5c7e
2 parents 7668ae9 + b251891
commit 37b5c7e
Show file tree

Hide file tree

Showing 10 changed files with 15,751 additions and 16,373 deletions.
diff --git a/demo/js/demo.bundle.js b/demo/js/demo.bundle.js
diff --git a/dist/react-bootstrap-table.min.js b/dist/react-bootstrap-table.min.js
diff --git a/lib/TableEditColumn.js b/lib/TableEditColumn.js
@@ -67,7 +67,7 @@ var TableEditColumn = (function (_React$Component) {
                     var valid = ts.props.editable.validator(value);
                     if (valid !== true) {
                         ts.refs.notifier.notice("error", valid, "Pressed ESC can cancel");
-                        var input = ts.refs.inputRef.getDOMNode();
+                        var input = ts.refs.inputRef;
                         //animate input
                         ts.clearTimeout();
                         ts.setState({ shakeEditor: true });
@@ -101,7 +101,7 @@ var TableEditColumn = (function (_React$Component) {
         },
         componentDidMount: {
             value: function componentDidMount() {
-                var input = this.refs.inputRef.getDOMNode();
+                var input = this.refs.inputRef;
                 // input.value = this.props.children||'';
                 input.focus();
             }

diff --git a/lib/TableHeader.js b/lib/TableHeader.js
@@ -32,7 +32,7 @@ var TableHeader = (function (_React$Component) {
   _createClass(TableHeader, {
     clearSortCaret: {
       value: function clearSortCaret(order, sortField) {
-        var row = this.refs.header.getDOMNode();
+        var row = this.refs.header;
         for (var i = 0; i < row.childElementCount; i++) {
           var column = row.childNodes[i].childNodes[0];
           if (column.getElementsByClassName("order").length > 0) {
@@ -47,7 +47,7 @@ var TableHeader = (function (_React$Component) {
         //default sorting
         if (this.props.sortName) {
           this.clearSortCaret(this.props.sortOrder, this.props.sortName);
-          var row = this.refs.header.getDOMNode();
+          var row = this.refs.header;
           for (var i = 0; i < row.childElementCount; i++) {
             var column = row.childNodes[i].childNodes[0];
             if (column.getAttribute("data-field") === this.props.sortName) {

diff --git a/lib/TableHeaderColumn.js b/lib/TableHeaderColumn.js
@@ -32,15 +32,15 @@ var TableHeaderColumn = (function (_React$Component) {
       value: function handleColumnClick(e) {
         if (!this.props.dataSort) {
           return;
-        }var dom = this.refs.innerDiv.getDOMNode();
+        }var dom = this.refs.innerDiv;
         this.order = this.order == Const.SORT_DESC ? Const.SORT_ASC : Const.SORT_DESC;
         this.props.clearSortCaret(this.order, this.props.dataField);
         dom.appendChild(Util.renderSortCaret(this.order));
       }
     },
     componentDidMount: {
       value: function componentDidMount() {
-        this.refs.innerDiv.getDOMNode().setAttribute("data-field", this.props.dataField);
+        this.refs.innerDiv.setAttribute("data-field", this.props.dataField);
       }
     },
     render: {

diff --git a/lib/toolbar/ToolBar.js b/lib/toolbar/ToolBar.js
@@ -72,7 +72,7 @@ var ToolBar = (function (_React$Component) {
             //when you want same auto generate value and not allow edit, example ID field
             tempValue = typeof column.autoValue == "function" ? column.autoValue() : "autovalue-" + new Date().getTime();
           } else {
-            var dom = this.refs[column.field + i].getDOMNode();
+            var dom = this.refs[column.field + i];
             tempValue = dom.value;
 
             if (column.editable && column.editable.type == "checkbox") {
@@ -134,7 +134,7 @@ var ToolBar = (function (_React$Component) {
             shakeEditor: false
           });
           //reset form
-          this.refs.form.getDOMNode().reset();
+          this.refs.form.reset();
         }
       }
     },
@@ -145,7 +145,7 @@ var ToolBar = (function (_React$Component) {
     },
     handleCloseBtn: {
       value: function handleCloseBtn(e) {
-        this.refs.warning.getDOMNode().style.display = "none";
+        this.refs.warning.style.display = "none";
       }
     },
     handleKeyUp: {

diff --git a/src/TableEditColumn.js b/src/TableEditColumn.js
@@ -46,7 +46,7 @@ class TableEditColumn extends React.Component{
           var valid=ts.props.editable.validator(value);
           if(valid!==true){
               ts.refs.notifier.notice('error',valid,"Pressed ESC can cancel");
-              var input = ts.refs.inputRef.getDOMNode();
+              var input = ts.refs.inputRef;
               //animate input
               ts.clearTimeout();
               ts.setState({shakeEditor:true});
@@ -65,7 +65,7 @@ class TableEditColumn extends React.Component{
       }
   }
   componentDidMount(){
-      var input = this.refs.inputRef.getDOMNode();
+      var input = this.refs.inputRef;
       // input.value = this.props.children||'';
       input.focus();
   }

diff --git a/src/TableHeader.js b/src/TableHeader.js
@@ -11,7 +11,7 @@ class TableHeader extends React.Component{
   }
 
   clearSortCaret(order, sortField){
-    var row = this.refs.header.getDOMNode();
+    var row = this.refs.header;
     for(var i=0;i<row.childElementCount;i++){
       var column = row.childNodes[i].childNodes[0];
       if(column.getElementsByClassName("order").length > 0){
@@ -25,7 +25,7 @@ class TableHeader extends React.Component{
     //default sorting
     if(this.props.sortName){
       this.clearSortCaret(this.props.sortOrder, this.props.sortName);
-      var row = this.refs.header.getDOMNode();
+      var row = this.refs.header;
       for(var i=0;i<row.childElementCount;i++){
         var column = row.childNodes[i].childNodes[0];
         if(column.getAttribute('data-field') === this.props.sortName){

diff --git a/src/TableHeaderColumn.js b/src/TableHeaderColumn.js
@@ -9,14 +9,14 @@ class TableHeaderColumn extends React.Component{
 
   handleColumnClick(e){
     if(!this.props.dataSort)return;
-    var dom = this.refs.innerDiv.getDOMNode();
+    var dom = this.refs.innerDiv;
     this.order = this.order == Const.SORT_DESC?Const.SORT_ASC:Const.SORT_DESC;
     this.props.clearSortCaret(this.order, this.props.dataField);
     dom.appendChild(Util.renderSortCaret(this.order));
   }
 
   componentDidMount(){
-    this.refs.innerDiv.getDOMNode().setAttribute("data-field", this.props.dataField);
+    this.refs.innerDiv.setAttribute("data-field", this.props.dataField);
   }
 
   render(){

diff --git a/src/toolbar/ToolBar.js b/src/toolbar/ToolBar.js
@@ -31,7 +31,7 @@ class ToolBar extends React.Component{
       if(column.autoValue){//when you want same auto generate value and not allow edit, example ID field
         tempValue=typeof column.autoValue=='function'?column.autoValue():('autovalue-'+new Date().getTime());
       }else{
-        let dom = this.refs[column.field+i].getDOMNode();
+        let dom = this.refs[column.field+i];
         tempValue = dom.value;
 
         if(column.editable && column.editable.type == 'checkbox'){
@@ -86,7 +86,7 @@ class ToolBar extends React.Component{
         shakeEditor:false
       });
       //reset form
-      this.refs.form.getDOMNode().reset();
+      this.refs.form.reset();
 
     }
   }
@@ -96,7 +96,7 @@ class ToolBar extends React.Component{
   }
 
   handleCloseBtn(e){
-    this.refs.warning.getDOMNode().style.display = "none";
+    this.refs.warning.style.display = "none";
   }
 
   handleKeyUp(e){