From 9053c1841fff7189bc143e105a4d4b9aa62c9d0e Mon Sep 17 00:00:00 2001 From: Caleb Date: Sun, 1 Oct 2017 18:52:11 -0600 Subject: [PATCH 1/5] Upgrade `react-transition-group`. --- package.json | 2 +- src/components/UI/loader/Loader.css | 4 ++-- src/components/UI/loader/Loader.js | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 00a34972..061d6004 100644 --- a/package.json +++ b/package.json @@ -139,8 +139,8 @@ "react-split-pane": "^0.1.57", "react-toolbox": "^1.2.1", "react-topbar-progress-indicator": "^1.0.0", - "react-transition-group": "1.x", "react-waypoint": "^3.1.3", + "react-transition-group": "^2.2.1", "redux": "^3.3.1", "redux-notifications": "^2.1.1", "redux-optimist": "^0.0.2", diff --git a/src/components/UI/loader/Loader.css b/src/components/UI/loader/Loader.css index 69d3b9ad..ba018374 100644 --- a/src/components/UI/loader/Loader.css +++ b/src/components/UI/loader/Loader.css @@ -106,10 +106,10 @@ opacity: 1; transition: opacity 500ms ease-in; } -.leave { +.exit { opacity: 1; } -.leave.leaveActive { +.exit.exitActive { opacity: 0.01; transition: opacity 300ms ease-in; } diff --git a/src/components/UI/loader/Loader.js b/src/components/UI/loader/Loader.js index 9b4194a2..2100a01e 100644 --- a/src/components/UI/loader/Loader.js +++ b/src/components/UI/loader/Loader.js @@ -1,5 +1,5 @@ import React from 'react'; -import ReactCSSTransitionGroup from 'react-transition-group/CSSTransitionGroup'; +import CSSTransition from 'react-transition-group/CSSTransition'; import styles from './Loader.css'; export default class Loader extends React.Component { @@ -34,13 +34,12 @@ export default class Loader extends React.Component { } else if (Array.isArray(children)) { this.setAnimation(); return (
-
{children[currentItem]}
- +
); } }; From d83a14f8d71a1e1f0cda65f1db666119030deebb Mon Sep 17 00:00:00 2001 From: Caleb Date: Sun, 1 Oct 2017 18:53:56 -0600 Subject: [PATCH 2/5] Re-add `react-addons-css-transition-group` for `react-toolbox`. `react-transition-group` is the replacment, but the current version of `react-toolbox` still requires the old one as a peer-dependency. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 061d6004..96bba98b 100644 --- a/package.json +++ b/package.json @@ -125,6 +125,7 @@ "prop-types": "^15.5.10", "react": "^15.1.0", "react-autosuggest": "^7.0.1", + "react-addons-css-transition-group": "~15.4.0", "react-datetime": "^2.6.0", "react-dom": "^15.1.0", "react-frame-component": "^1.0.3", From 37bcbfba08deb34160bf5436cc24417337f0053b Mon Sep 17 00:00:00 2001 From: Caleb Date: Sun, 1 Oct 2017 18:59:27 -0600 Subject: [PATCH 3/5] Upgrade `react-waypoint`. From the changelog, there should be no changes needed. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96bba98b..81ac6807 100644 --- a/package.json +++ b/package.json @@ -140,8 +140,8 @@ "react-split-pane": "^0.1.57", "react-toolbox": "^1.2.1", "react-topbar-progress-indicator": "^1.0.0", - "react-waypoint": "^3.1.3", "react-transition-group": "^2.2.1", + "react-waypoint": "^7.1.0", "redux": "^3.3.1", "redux-notifications": "^2.1.1", "redux-optimist": "^0.0.2", From 9075a87c9d7dc71e1668e2b56171ec53baa66dba Mon Sep 17 00:00:00 2001 From: Caleb Date: Sun, 1 Oct 2017 21:01:37 -0600 Subject: [PATCH 4/5] Upgrade `react-notifications`. --- package.json | 2 +- src/components/UI/toast/Toast.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 81ac6807..8a22a0e0 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "react-transition-group": "^2.2.1", "react-waypoint": "^7.1.0", "redux": "^3.3.1", - "redux-notifications": "^2.1.1", + "redux-notifications": "^4.0.1", "redux-optimist": "^0.0.2", "redux-thunk": "^1.0.3", "rehype-parse": "^3.1.0", diff --git a/src/components/UI/toast/Toast.js b/src/components/UI/toast/Toast.js index 068ef48d..bb6034ff 100644 --- a/src/components/UI/toast/Toast.js +++ b/src/components/UI/toast/Toast.js @@ -1,6 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { Icon } from '../index'; +import 'redux-notifications/lib/styles.css'; // Import default redux-notifications styles into global scope. import styles from './Toast.css'; const icons = { From 41cc7ab5897435b6e92c87fa7124faf2424142e9 Mon Sep 17 00:00:00 2001 From: Caleb Date: Mon, 2 Oct 2017 10:32:37 -0600 Subject: [PATCH 5/5] Update Yarn lockfile. --- yarn.lock | 72 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index f7986099..8e1f733c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1808,6 +1808,10 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" +consolidated-events@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/consolidated-events/-/consolidated-events-1.1.1.tgz#25395465b35e531395418b7bbecb5ecaf198d179" + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -3060,6 +3064,18 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" +fbjs@^0.8.16, fbjs@^0.8.4: + version "0.8.16" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" + dependencies: + core-js "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.9" + fbjs@^0.8.9: version "0.8.14" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c" @@ -6786,6 +6802,14 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.0.0: + version "15.6.0" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.3.1" + object-assign "^4.1.1" + prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8: version "15.5.10" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" @@ -6897,11 +6921,12 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-addons-css-transition-group@^15.0.2: - version "15.6.0" - resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.6.0.tgz#69887cf6e4874d25cd66e22a699e29f0d648aba0" +react-addons-css-transition-group@~15.4.0: + version "15.4.2" + resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.4.2.tgz#b7828834dfa14229fe07750e331e8a8cb6fb7745" dependencies: - react-transition-group "^1.2.0" + fbjs "^0.8.4" + object-assign "^4.1.0" react-addons-test-utils@^15.4.2: version "15.6.0" @@ -7045,7 +7070,7 @@ react-proxy@^3.0.0-alpha.0: dependencies: lodash "^4.6.1" -react-redux@^4.4.0: +react-redux@^4.0.0, react-redux@^4.4.0: version "4.4.8" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.8.tgz#e7bc1dd100e8b64e96ac8212db113239b9e2e08f" dependencies: @@ -7139,9 +7164,9 @@ react-topbar-progress-indicator@^1.0.0: dependencies: topbar "^0.1.3" -react-transition-group@1.x, react-transition-group@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.0.tgz#b51fc921b0c3835a7ef7c571c79fc82c73e9204f" +react-transition-group@^1.1.3: + version "1.2.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6" dependencies: chain-function "^1.0.0" dom-helpers "^3.2.0" @@ -7149,9 +7174,23 @@ react-transition-group@1.x, react-transition-group@^1.2.0: prop-types "^15.5.6" warning "^3.0.0" -react-waypoint@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/react-waypoint/-/react-waypoint-3.1.3.tgz#1101fb8a27556a199150c7bfd34428606b5fc7e4" +react-transition-group@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10" + dependencies: + chain-function "^1.0.0" + classnames "^2.2.5" + dom-helpers "^3.2.0" + loose-envify "^1.3.1" + prop-types "^15.5.8" + warning "^3.0.0" + +react-waypoint@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/react-waypoint/-/react-waypoint-7.1.0.tgz#874628fd06ed61570ffba213e7dcd4212b101bbb" + dependencies: + consolidated-events "^1.1.0" + prop-types "^15.0.0" react@^15.1.0: version "15.6.1" @@ -7288,11 +7327,14 @@ reduce-function-call@^1.0.1: dependencies: balanced-match "^0.4.2" -redux-notifications@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/redux-notifications/-/redux-notifications-2.1.1.tgz#b317a38ad9fa712b278b502ca3856c522b377904" +redux-notifications@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/redux-notifications/-/redux-notifications-4.0.1.tgz#66c9f11bb1eb375c633beaaf7378005eab303bfb" dependencies: - react-addons-css-transition-group "^15.0.2" + object-assign "^4.1.1" + prop-types "^15.5.10" + react-redux "^4.0.0" + react-transition-group "^1.1.3" redux-optimist@^0.0.2: version "0.0.2"