removed componentWillReceiveProps

Author: iKBAHT

.gitignore

@@ -5,3 +5,4 @@ styles.min.css
 styles.min.css.map
 coverage
 npm-debug.log
+package-lock.json

.npmignore

@@ -13,3 +13,4 @@ webpack.config.*.js
 babel.preprocess.sass.js
 codecov.yml
 .travis.yml
+package-lock.json

package.json

@@ -53,8 +53,8 @@
     "prop-types": "^15.5.7"
   },
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0 || ^16.0.0",
-    "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0"
+    "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
+    "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "devDependencies": {
     "@kadira/storybook": "^1.36.0",
@@ -90,21 +90,21 @@
     "html-webpack-plugin": "^2.16.1",
     "isparta-loader": "^2.0.0",
     "node-libs-browser": "^0.5.2",
-    "node-sass": "^3.7.0",
+    "node-sass": "^4.11.0",
     "postcss-loader": "^0.9.1",
     "qs": "^6.2.0",
     "raw-loader": "^0.5.1",
-    "react": "^15.4.2",
+    "react": "^16.0.0",
     "react-addons-pure-render-mixin": "^15.0.2",
     "react-addons-shallow-compare": "^15.1.0",
     "react-addons-test-utils": "^15.1.0",
-    "react-dom": "^15.4.2",
+    "react-dom": "^16.0.0",
     "react-infinite": "^0.9.2",
     "react-tiny-virtual-list": "^2.0.1",
     "react-virtualized": "^9.2.2",
     "redux": "^3.5.2",
     "rimraf": "^2.5.2",
-    "sass-loader": "^3.2.0",
+    "sass-loader": "^7.1.0",
     "stack-source-map": "^1.0.4",
     "style-loader": "^0.13.1",
     "webpack": "^1.9.11",

src/SortableContainer/index.js

@@ -162,7 +162,11 @@ export default function sortableContainer(WrappedComponent, config = {withRef: f
         !this.state.sorting
       ) {
         const {useDragHandle} = this.props;
-        const {index, collection} = node.sortableInfo;
+        const {index, collection, disabled} = node.sortableInfo;
+
+        if (disabled) {
+          return;
+        }
 
         if (
           useDragHandle && !closest(e.target, el => el.sortableHandle != null)

src/SortableElement/index.js

@@ -25,50 +25,48 @@ export default function sortableElement(WrappedComponent, config = {withRef: fal
     };
 
     componentDidMount() {
-      const {collection, disabled, index} = this.props;
-
-      if (!disabled) {
-        this.setDraggable(collection, index);
-      }
+      this.register();
     }
 
-    componentWillReceiveProps(nextProps) {
-      if (this.props.index !== nextProps.index && this.node) {
-        this.node.sortableInfo.index = nextProps.index;
-      }
-      if (this.props.disabled !== nextProps.disabled) {
-        const {collection, disabled, index} = nextProps;
-        if (disabled) {
-          this.removeDraggable(collection);
-        } else {
-          this.setDraggable(collection, index);
+    componentDidUpdate(prevProps) {
+      if (this.node) {
+        if (prevProps.index !== this.props.index) {
+          this.node.sortableInfo.index = this.props.index;
+        }
+
+        if (prevProps.disabled !== this.props.disabled) {
+          this.node.sortableInfo.disabled = this.props.disabled;
         }
-      } else if (this.props.collection !== nextProps.collection) {
-        this.removeDraggable(this.props.collection);
-        this.setDraggable(nextProps.collection, nextProps.index);
+      }
+
+      if (prevProps.collection !== this.props.collection) {
+        this.unregister(prevProps.collection);
+        this.register();
       }
     }
 
     componentWillUnmount() {
-      const {collection, disabled} = this.props;
-
-      if (!disabled) this.removeDraggable(collection);
+      this.unregister();
     }
 
-    setDraggable(collection, index) {
-      const node = (this.node = findDOMNode(this));
+    register() {
+      const {collection, disabled, index} = this.props;
+      const node = findDOMNode(this);
 
       node.sortableInfo = {
         index,
         collection,
+        disabled,
         manager: this.context.manager,
       };
 
+      this.node = node;
       this.ref = {node};
+
       this.context.manager.add(collection, this.ref);
-    }
+    }	    
 
-    removeDraggable(collection) {
+    unregister(collection = this.props.collection) {
       this.context.manager.remove(collection, this.ref);
     }