react-router-dom 5.3.1 → 5.3.2

package/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) React Training
+Copyright (c) React Training 2015-2019
+Copyright (c) Remix Software 2020-2022
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -34,4 +34,4 @@ If you find a bug, please file an issue on [our issue tracker on GitHub](https:/
 
 ## Credits
 
-React Router is built and maintained by [React Training](https://reacttraining.com).
+React Router is built and maintained by [Remix Software](https://remix.run).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "description": "DOM bindings for React Router",
   "homepage": "https://reactrouter.com/",
   "repository": {
@@ -9,7 +9,7 @@
     "directory": "packages/react-router-dom"
   },
   "license": "MIT",
-  "author": "React Training <hello@reacttraining.com>",
+  "author": "Remix Software <hello@remix.run>",
   "files": [
     "LICENSE",
     "README.md",
@@ -51,7 +51,7 @@
     "history": "^4.9.0",
     "loose-envify": "^1.3.1",
     "prop-types": "^15.6.2",
-    "react-router": "5.3.1",
+    "react-router": "5.3.2",
     "tiny-invariant": "^1.0.2",
     "tiny-warning": "^1.0.0"
   },

package/umd/react-router-dom.js

@@ -2930,13 +2930,7 @@
 
       if (!props.staticContext) {
         _this.unlisten = props.history.listen(function (location) {
-          if (_this._isMounted) {
-            _this.setState({
-              location: location
-            });
-          } else {
-            _this._pendingLocation = location;
-          }
+          _this._pendingLocation = location;
         });
       }
 
@@ -2946,8 +2940,26 @@
     var _proto = Router.prototype;
 
     _proto.componentDidMount = function componentDidMount() {
+      var _this2 = this;
+
       this._isMounted = true;
 
+      if (this.unlisten) {
+        // Any pre-mount location changes have been captured at
+        // this point, so unregister the listener.
+        this.unlisten();
+      }
+
+      if (!this.props.staticContext) {
+        this.unlisten = this.props.history.listen(function (location) {
+          if (_this2._isMounted) {
+            _this2.setState({
+              location: location
+            });
+          }
+        });
+      }
+
       if (this._pendingLocation) {
         this.setState({
           location: this._pendingLocation