Merge pull request #1391 from creative-commoners/pulls/2/replacement-…

…find-dom-node MNT Replace deprcated function findDOMNode
silverstripe · Aug 29, 2023 · 16022fc · 16022fc
2 parents 959966b + f1db6de
commit 16022fc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/client/dist/js/TinyMCE_sslink-file.js b/client/dist/js/TinyMCE_sslink-file.js
diff --git a/client/dist/js/TinyMCE_ssmedia.js b/client/dist/js/TinyMCE_ssmedia.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/components/AssetDropzone/AssetDropzone.js b/client/src/components/AssetDropzone/AssetDropzone.js
@@ -1,6 +1,5 @@
 /* global FileReader, Image, document, FormData */
 import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
 import i18n from 'i18n';
 import DropzoneLib from 'dropzone';
 import $ from 'jquery';
@@ -33,7 +32,7 @@ class AssetDropzone extends Component {
 
   componentDidMount() {
     this.dropzone = new DropzoneLib(
-      ReactDOM.findDOMNode(this),
+      this.dropzoneRef,
       Object.assign({},
         this.getDefaultOptions(),
         this.props.options
@@ -92,7 +91,7 @@ class AssetDropzone extends Component {
     }
 
     if (uploadSelector) {
-      const found = $(ReactDOM.findDOMNode(this)).find(uploadSelector);
+      const found = $(this.dropzoneRef).find(uploadSelector);
       if (found && found.length) {
         clickable = found.toArray();
       }
@@ -268,7 +267,7 @@ class AssetDropzone extends Component {
    * @param {Event} event
    */
   handleDragLeave(event) {
-    const componentNode = ReactDOM.findDOMNode(this);
+    const componentNode = this.dropzoneRef;
 
     if (!this.props.canUpload) {
       return;
@@ -552,7 +551,7 @@ class AssetDropzone extends Component {
     }
 
     return (
-      <div className={className.join(' ')}>
+      <div className={className.join(' ')} ref={node => { this.dropzoneRef = node; }}>
         {this.props.uploadButton &&
         <button {...buttonProps}>
           {i18n._t('AssetAdmin.DROPZONE_UPLOAD')}

diff --git a/client/src/containers/Gallery/Gallery.js b/client/src/containers/Gallery/Gallery.js
@@ -2,7 +2,6 @@
 import $ from 'jquery';
 import i18n from 'i18n';
 import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import { bindActionCreators, compose } from 'redux';
 import AssetDropzone from 'components/AssetDropzone/AssetDropzone';
@@ -109,7 +108,7 @@ class Gallery extends Component {
    * @returns {jQuery}
    */
   getSortElement() {
-    return $(ReactDOM.findDOMNode(this)).find('.gallery__sort .dropdown');
+    return $(this.gallery).find('.gallery__sort .dropdown');
   }
 
   /**