From deacf693279c25c4186c9c84d3ba6fd666d6951b Mon Sep 17 00:00:00 2001 From: Michael Baldwin Date: Mon, 1 May 2017 14:05:53 -0400 Subject: [PATCH 1/3] updated PropTypes to prop-types --- package.json | 1 + src/components/addbutton.js | 3 ++- src/components/blocks/atomic.js | 3 ++- src/components/blocks/image.js | 3 ++- src/components/blocks/todo.js | 3 ++- src/components/blocktoolbar.js | 3 ++- src/components/entities/link.js | 3 ++- src/components/inlinetoolbar.js | 3 ++- src/components/sides/break.js | 3 ++- src/components/sides/image.js | 3 ++- src/components/stylebutton.js | 3 ++- src/components/toolbar.js | 25 +++++++++++++------------ src/editor.js | 19 ++++++++++--------- src/example.js | 11 ++++++----- 14 files changed, 50 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 3cf5fdc9..f6a14477 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "dependencies": { "draft-js": "^0.10.0", "immutable": "^3.7.6", + "prop-types": "^15.5.8", "react-addons-css-transition-group": "^15.0.0" }, "peerDependencies": { diff --git a/src/components/addbutton.js b/src/components/addbutton.js index 875d9863..9dfbf86d 100644 --- a/src/components/addbutton.js +++ b/src/components/addbutton.js @@ -1,6 +1,7 @@ +import PropTypes from 'prop-types'; // import './addbutton.scss'; -import React, { PropTypes } from 'react'; +import React from 'react'; import ReactCSSTransitionGroup from 'react-addons-css-transition-group'; import { getSelectedBlockNode } from '../util'; diff --git a/src/components/blocks/atomic.js b/src/components/blocks/atomic.js index 65bc7371..c65f2398 100644 --- a/src/components/blocks/atomic.js +++ b/src/components/blocks/atomic.js @@ -1,6 +1,7 @@ +import PropTypes from 'prop-types'; // import './atomic.scss'; -import React, { PropTypes } from 'react'; +import React from 'react'; const AtomicBlock = (props) => { const content = props.getEditorState().getCurrentContent(); diff --git a/src/components/blocks/image.js b/src/components/blocks/image.js index 2f5ca007..6de2cca7 100644 --- a/src/components/blocks/image.js +++ b/src/components/blocks/image.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { EditorBlock } from 'draft-js'; diff --git a/src/components/blocks/todo.js b/src/components/blocks/todo.js index f1a04c11..974cdf2d 100644 --- a/src/components/blocks/todo.js +++ b/src/components/blocks/todo.js @@ -1,6 +1,7 @@ +import PropTypes from 'prop-types'; // import './todo.scss'; -import React, { PropTypes } from 'react'; +import React from 'react'; import { EditorBlock } from 'draft-js'; import { updateDataOfBlock } from '../../model/'; diff --git a/src/components/blocktoolbar.js b/src/components/blocktoolbar.js index 064b7681..597cc278 100644 --- a/src/components/blocktoolbar.js +++ b/src/components/blocktoolbar.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { RichUtils } from 'draft-js'; import StyleButton from './stylebutton'; diff --git a/src/components/entities/link.js b/src/components/entities/link.js index 3c35e83d..85a9059e 100644 --- a/src/components/entities/link.js +++ b/src/components/entities/link.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { Entity } from '../../util/constants'; diff --git a/src/components/inlinetoolbar.js b/src/components/inlinetoolbar.js index 5f24d6d1..9d0893aa 100644 --- a/src/components/inlinetoolbar.js +++ b/src/components/inlinetoolbar.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import StyleButton from './stylebutton'; diff --git a/src/components/sides/break.js b/src/components/sides/break.js index 32e7bef9..0e8ab2a4 100644 --- a/src/components/sides/break.js +++ b/src/components/sides/break.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { addNewBlock } from '../../model'; import { Block } from '../../util/constants'; diff --git a/src/components/sides/image.js b/src/components/sides/image.js index c5e7a346..fb39a6bc 100644 --- a/src/components/sides/image.js +++ b/src/components/sides/image.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { addNewBlock } from '../../model'; import { Block } from '../../util/constants'; diff --git a/src/components/stylebutton.js b/src/components/stylebutton.js index 4d1e3a84..59a7445c 100644 --- a/src/components/stylebutton.js +++ b/src/components/stylebutton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { HYPERLINK } from '../util/constants.js'; diff --git a/src/components/toolbar.js b/src/components/toolbar.js index 6c7ce926..0fbdaf58 100644 --- a/src/components/toolbar.js +++ b/src/components/toolbar.js @@ -1,6 +1,7 @@ +import PropTypes from 'prop-types'; // import './toolbar.scss'; -import React, { PropTypes } from 'react'; +import React from 'react'; import ReactDOM from 'react-dom'; import BlockToolbar from './blocktoolbar'; @@ -330,15 +331,15 @@ export const INLINE_BUTTONS = [ description: 'Add a link', }, ]; - // { - // label: 'S', - // style: 'STRIKETHROUGH', - // icon: 'strikethrough', - // description: 'Strikethrough', - // }, - // { - // label: 'Code', - // style: 'CODE', - // description: 'Inline Code', - // }, +// { +// label: 'S', +// style: 'STRIKETHROUGH', +// icon: 'strikethrough', +// description: 'Strikethrough', +// }, +// { +// label: 'Code', +// style: 'CODE', +// description: 'Inline Code', +// }, diff --git a/src/editor.js b/src/editor.js index 70bd977e..6653c246 100644 --- a/src/editor.js +++ b/src/editor.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { Editor, EditorState, @@ -43,16 +44,16 @@ class MediumDraftEditor extends React.Component { stringToTypeMap: PropTypes.object, blockRenderMap: PropTypes.object, blockButtons: PropTypes.arrayOf(PropTypes.shape({ - label: React.PropTypes.string.isRequired, - style: React.PropTypes.string.isRequired, - icon: React.PropTypes.string, - description: React.PropTypes.string, + label: PropTypes.string.isRequired, + style: PropTypes.string.isRequired, + icon: PropTypes.string, + description: PropTypes.string, })), inlineButtons: PropTypes.arrayOf(PropTypes.shape({ - label: React.PropTypes.string.isRequired, - style: React.PropTypes.string.isRequired, - icon: React.PropTypes.string, - description: React.PropTypes.string, + label: PropTypes.string.isRequired, + style: PropTypes.string.isRequired, + icon: PropTypes.string, + description: PropTypes.string, })), placeholder: PropTypes.string, continuousBlocks: PropTypes.arrayOf(PropTypes.string), diff --git a/src/example.js b/src/example.js index 8cb0c799..34b555b6 100644 --- a/src/example.js +++ b/src/example.js @@ -1,3 +1,4 @@ +import PropTypes from 'prop-types'; /* eslint-disable */ import React from 'react'; @@ -157,9 +158,9 @@ class SeparatorSideButton extends React.Component { class EmbedSideButton extends React.Component { static propTypes = { - setEditorState: React.PropTypes.func, - getEditorState: React.PropTypes.func, - close: React.PropTypes.func, + setEditorState: PropTypes.func, + getEditorState: PropTypes.func, + close: PropTypes.func, }; constructor(props) { @@ -211,7 +212,7 @@ class EmbedSideButton extends React.Component { class AtomicEmbedComponent extends React.Component { static propTypes = { - data: React.PropTypes.object.isRequired, + data: PropTypes.object.isRequired, } constructor(props) { @@ -520,7 +521,7 @@ class App extends React.Component { ); } -}; +} if (!__PROD__) { window.ga = function() { From 1160482be5764a646ea1c9a1e00fcc521fd2a7a7 Mon Sep 17 00:00:00 2001 From: Michael Baldwin Date: Mon, 1 May 2017 14:18:51 -0400 Subject: [PATCH 2/3] updated enzyme test runner and removed react-addons-test-utils --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index f6a14477..8270ec08 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "babel-preset-react": "^6.5.0", "chai": "^3.5.0", "css-loader": "^0.23.1", - "enzyme": "^2.5.1", + "enzyme": "^2.8.2", "eslint": "^3.3.1", "eslint-config-airbnb": "^10.0.1", "eslint-loader": "^1.5.0", @@ -65,7 +65,6 @@ "mocha": "^2.4.5", "mocha-loader": "^0.7.1", "node-sass": "^3.4.2", - "react-addons-test-utils": "^15.0.0", "react-hot-loader": "^1.3.0", "sass-loader": "^3.2.0", "style-loader": "^0.13.1", From fd6cff6f40757b98d041111bfc2a8144ea4204f3 Mon Sep 17 00:00:00 2001 From: Michael Baldwin Date: Mon, 1 May 2017 14:31:28 -0400 Subject: [PATCH 3/3] updated react-addons-css-transition-group to react-transition-group --- package.json | 2 +- src/components/addbutton.js | 6 +++--- webpack.config.js | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 8270ec08..de96e2de 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "draft-js": "^0.10.0", "immutable": "^3.7.6", "prop-types": "^15.5.8", - "react-addons-css-transition-group": "^15.0.0" + "react-transition-group": "^1.1.2" }, "peerDependencies": { "react": "^15.0.0", diff --git a/src/components/addbutton.js b/src/components/addbutton.js index 9dfbf86d..8923bf56 100644 --- a/src/components/addbutton.js +++ b/src/components/addbutton.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; // import './addbutton.scss'; import React from 'react'; -import ReactCSSTransitionGroup from 'react-addons-css-transition-group'; +import CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup'; import { getSelectedBlockNode } from '../util'; @@ -151,7 +151,7 @@ export default class AddButton extends React.Component { {this.state.isOpen ? ( - ); })} - + ) : null} ); diff --git a/webpack.config.js b/webpack.config.js index 3d007b4e..c1215815 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -188,11 +188,11 @@ if (isProd) { } }, { - 'react-addons-css-transition-group': { - root: ['React','addons','CSSTransitionGroup'], - commonjs2: 'react-addons-css-transition-group', - commonjs: 'react-addons-css-transition-group', - amd: 'react-addons-css-transition-group', + 'react-transition-group/CSSTransitionGroup': { + root: ['React', 'addons', 'CSSTransitionGroup'], + commonjs2: 'react-transition-group/CSSTransitionGroup', + commonjs: 'react-transition-group/CSSTransitionGroup', + amd: 'react-transition-group/CSSTransitionGroup', } }, {