Skip to content

Update react-modal from 3.13.1 to 3.14.2 to add bugfix-PR 7e732d7 Wrapping getComputedStyle i… #2895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
interactivellama merged 8 commits into from
Jun 14, 2021
Merged

Update react-modal from 3.13.1 to 3.14.2 to add bugfix-PR 7e732d7 Wrapping getComputedStyle i… #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6523ce5
Update to 3.14.2 to add bugfix-PR 7e732d7 Wrapping getComputedStyle i…
beekermememe Jun 7, 2021
bd6692e
Fixing annotation for react-modal package
beekermememe Jun 7, 2021
388a6fa
reverting annotation change
beekermememe Jun 7, 2021
b4bc88a
Fixing annotation for react-modal package
beekermememe Jun 7, 2021
b22a1b6
reverting annotation change
beekermememe Jun 7, 2021
cdc4ac6
Updating package.lock file for react-modal version bump
beekermememe Jun 7, 2021
a0f00be
This is a test change to see if this addresses the issue on Travis. S…
beekermememe Jun 13, 2021
ba97d72
Merge branch 'master' into update-react-modal
interactivellama Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions components/modal/__tests__/modal.browser-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ describe('SLDSModal: ', function () {
appNode = null;
});

afterEach(() => {
ReactDOM.unmountComponentAtNode(container);
document.body.removeChild(container);
container = null;
afterEach((done) => {
// We run into a race condition if we do not have this wait
// with the changes to react-modal, we end up trying to set state
// on an unmounted component
setTimeout(() => {
ReactDOM.unmountComponentAtNode(container);
document.body.removeChild(container);
container = null;
done();
}, 100);
});

const defaultProps = {
Expand Down
32 changes: 15 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"prop-types": ">=15.7.2",
"react-contenteditable": "^3.3.5",
"react-highlighter": "^0.4.3",
"react-modal": "3.13.1",
"react-modal": "3.14.2",
"react-onclickoutside": "^6.10.0",
"react-required-if": "^1.0.3",
"react-text-truncate": "^0.16.0",
Expand Down