Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
Fix infinite loop
Browse files Browse the repository at this point in the history
Popper.js' componentDidUpdate fails the props change test, which calls updatePopperInstance, which eventually causes componentDidUpdate to get called again.
By using a deepEquals comparison on modifiers we correctly determine that the props did not update, and break the loop.
  • Loading branch information
mfedderly committed Nov 23, 2019
1 parent b451e96 commit f99ffee
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 13 deletions.
24 changes: 12 additions & 12 deletions .size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"dist/index.umd.js": {
"bundled": 67296,
"minified": 23836,
"gzipped": 7176
"bundled": 88323,
"minified": 32847,
"gzipped": 9575
},
"dist/index.umd.min.js": {
"bundled": 31932,
"minified": 12958,
"gzipped": 4186
"bundled": 52955,
"minified": 21926,
"gzipped": 6619
},
"dist/index.esm.js": {
"bundled": 12751,
"minified": 7575,
"gzipped": 2077,
"bundled": 12824,
"minified": 7630,
"gzipped": 2103,
"treeshaked": {
"rollup": {
"code": 3790,
"import_statements": 137
"code": 3829,
"import_statements": 163
},
"webpack": {
"code": 4900
"code": 4978
}
}
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"dependencies": {
"@babel/runtime": "^7.1.2",
"create-react-context": "^0.3.0",
"deep-equal": "^1.1.1",
"popper.js": "^1.14.4",
"prop-types": "^15.6.1",
"typed-styles": "^0.0.7",
Expand Down
3 changes: 2 additions & 1 deletion src/Popper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// @flow
import deepEqual from "deep-equal";
import * as React from 'react';
import PopperJS, {
type Placement,
Expand Down Expand Up @@ -165,7 +166,7 @@ export class InnerPopper extends React.Component<PopperProps, PopperState> {
this.props.placement !== prevProps.placement ||
this.props.referenceElement !== prevProps.referenceElement ||
this.props.positionFixed !== prevProps.positionFixed ||
this.props.modifiers !== prevProps.modifiers
!deepEqual(this.props.modifiers, prevProps.modifiers, {strict: true})
) {

// develop only check that modifiers isn't being updated needlessly
Expand Down
24 changes: 24 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2661,6 +2661,18 @@ decode-uri-component@^0.2.0:
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=

deep-equal@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=
dependencies:
is-arguments "^1.0.4"
is-date-object "^1.0.1"
is-regex "^1.0.4"
object-is "^1.0.1"
object-keys "^1.1.1"
regexp.prototype.flags "^1.2.0"

deep-extend@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
Expand Down Expand Up @@ -4314,6 +4326,11 @@ is-accessor-descriptor@^1.0.0:
dependencies:
kind-of "^6.0.0"

is-arguments@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
integrity sha1-P6+WbHy6D/Q3+zH2JQCC/PBEjPM=

is-arrayish@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
Expand Down Expand Up @@ -7545,6 +7562,13 @@ regexp-tree@^0.1.0:
colors "^1.1.2"
yargs "^10.0.3"

regexp.prototype.flags@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
integrity sha1-azByTjBqJ4M+6xcbZqyIkLo35Bw=
dependencies:
define-properties "^1.1.2"

regexpp@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
Expand Down

0 comments on commit f99ffee

Please sign in to comment.