Skip to content

React 16 compat #129

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

Open
makenosound wants to merge 6 commits into
base: master
Choose a base branch
from
Open

React 16 compat #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e056071
Remove deprecated dependency
makenosound Sep 27, 2017
28356eb
Fix deps
makenosound Sep 27, 2017
7d48182
Fix ref to isfunction
makenosound Sep 27, 2017
fa9a08b
Fix reference to propTypes off react
makenosound Sep 27, 2017
9308e81
Update deps for react16
makenosound Sep 27, 2017
895026f
Build
makenosound Sep 27, 2017
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
2 changes: 1 addition & 1 deletion lib/components/ui/rich-text-editor/block-toolbar-plugin/block-items/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ var BlockItems = function (_React$Component) {
BlockItems.propTypes = {
currentBlockType: _propTypes2.default.string,
itemsGroups: _propTypes2.default.array,
editableBlockTypes: _react2.default.PropTypes.array,
editableBlockTypes: _propTypes2.default.array,
editorState: _propTypes2.default.object.isRequired,
onChange: _propTypes2.default.func.isRequired
};
Expand Down
6 changes: 3 additions & 3 deletions lib/components/ui/sortable/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ var _uid = require('uid');

var _uid2 = _interopRequireDefault(_uid);

var _update = require('react/lib/update');
var _reactAddonsUpdate = require('react-addons-update');

var _update2 = _interopRequireDefault(_update);
var _reactAddonsUpdate2 = _interopRequireDefault(_reactAddonsUpdate);

var _reactDnd = require('react-dnd');

Expand Down Expand Up @@ -91,7 +91,7 @@ var Sortable = function (_React$Component) {
var items = _this.state.items;

var dragItem = items[dragIndex];
_this.setState((0, _update2.default)(_this.state, {
_this.setState((0, _reactAddonsUpdate2.default)(_this.state, {
items: {
$splice: [[dragIndex, 1], [hoverIndex, 0, dragItem]]
}
Expand Down
15 changes: 8 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
},
"homepage": "https://github.com/icelab/formalist-standard-react",
"devDependencies": {
"@f/is-function": "^1.1.1",
"autoprefixer": "^6.3.6",
"babel-cli": "^6.9.0",
"babel-eslint": "^7.2.2",
Expand All @@ -55,6 +54,7 @@
"eslint-plugin-standard": "^2.0.1",
"faucet": "0.0.1",
"ignore-styles": "^1.2.0",
"isfunction": "^0.0.6",
"isomorphic-fetch": "^2.2.1",
"jsdom": "^8.3.1",
"nodemon": "^1.9.2",
Expand Down Expand Up @@ -90,13 +90,14 @@
"postcss-modules-scope": "^1.0.1",
"postcss-modules-values": "^1.1.3",
"prop-types": "^15.5.8",
"react-day-picker": "^3.0.0",
"react-dnd": "^2.1.4",
"react-dnd-html5-backend": "^2.1.2",
"react-dropzone": "^3.5.0",
"react-addons-update": "^15.6.2",
"react-day-picker": "^6.1.0",
"react-dnd": "^2.5.3",
"react-dnd-html5-backend": "^2.5.3",
"react-dropzone": "^4.1.3",
"react-immutable-proptypes": "^2.1.0",
"react-portal": "^3.0.0",
"react-textarea-autosize": "^4.0.2",
"react-portal": "^3.1.0",
"react-textarea-autosize": "^5.1.0",
"shallow-equals": "0.0.0",
"superagent": "^1.8.3",
"trigger-event": "^1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/rich-text-editor/block-toolbar-plugin/block-items/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class BlockItems extends React.Component {
static propTypes = {
currentBlockType: PropTypes.string,
itemsGroups: PropTypes.array,
editableBlockTypes: React.PropTypes.array,
editableBlockTypes: PropTypes.array,
editorState: PropTypes.object.isRequired,
onChange: PropTypes.func.isRequired,
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/sortable/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import uid from 'uid'
import update from 'react/lib/update'
import update from 'react-addons-update'
import { DragDropContext } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
import Item from './item'
Expand Down
2 changes: 1 addition & 1 deletion test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import test from 'tape'
import { mount } from 'enzyme'
import React from 'react'
import isFunction from '@f/is-function'
import isFunction from 'isfunction'

/* fixtures */
import './fixtures/ignore-styles'
Expand Down
91 changes: 38 additions & 53 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
# yarn lockfile v1


"@f/is-function@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@f/is-function/-/is-function-1.1.1.tgz#17d342a53ef7d2ff791371c2f4fa381245ce0231"

abab@^1.0.0:
version "1.0.3"
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
Expand Down Expand Up @@ -1308,58 +1304,48 @@ domutils@1.5.1, domutils@^1.5.1:
dom-serializer "0"
domelementtype "1"

draft-js-ast-exporter@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/draft-js-ast-exporter/-/draft-js-ast-exporter-1.0.0.tgz#6835215864f7aa5c9cc9fd9842f0db6ba15f43dd"
draft-js-ast-exporter@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/draft-js-ast-exporter/-/draft-js-ast-exporter-2.0.0.tgz#c6be9717ef7358084cf172eea5e8ddc47966510c"
dependencies:
draft-js-utils "^0.1.4"
draft-js-utils "^0.1.7"

draft-js-ast-importer@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/draft-js-ast-importer/-/draft-js-ast-importer-1.0.0.tgz#91cc3a4bde17eaf8768e9a82225004d1d26d4667"
draft-js-ast-importer@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/draft-js-ast-importer/-/draft-js-ast-importer-2.0.0.tgz#3815f3b02ea7529bdfdfa7f3acfe40f5bf2c252b"
dependencies:
draft-js-utils "^0.1.4"
draft-js-utils "^0.1.7"
immutable "^3.8.1"

draft-js-autolist-plugin@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/draft-js-autolist-plugin/-/draft-js-autolist-plugin-1.0.0.tgz#db48d869d5407f1bc6b055e7e2da71abf4a3c4e9"
draft-js-autolist-plugin@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/draft-js-autolist-plugin/-/draft-js-autolist-plugin-2.0.0.tgz#2b0bf6d6cf8d4b6cfb0e6154218807e92894569b"

draft-js-block-breakout-plugin@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/draft-js-block-breakout-plugin/-/draft-js-block-breakout-plugin-1.0.2.tgz#5541038a34a19c6493b02ce64ca47c0876a39ca3"
draft-js-block-breakout-plugin@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/draft-js-block-breakout-plugin/-/draft-js-block-breakout-plugin-2.0.1.tgz#a38e3bd68d9538d7af15d4d966844d6e6d2ad850"
dependencies:
immutable "~3.7.4"

draft-js-plugins-editor@^2.0.0-beta5:
version "2.0.0-beta5"
resolved "https://registry.yarnpkg.com/draft-js-plugins-editor/-/draft-js-plugins-editor-2.0.0-beta5.tgz#0e81fddb69e23be1c22f1fbd74e25501b3dca171"
draft-js-plugins-editor@^2.0.0-rc3:
version "2.0.0-rc8"
resolved "https://registry.yarnpkg.com/draft-js-plugins-editor/-/draft-js-plugins-editor-2.0.0-rc8.tgz#810f6069d432b38e07ed09504b492657150225db"
dependencies:
decorate-component-with-props "^1.0.2"
draft-js ">=0.8.1"
find-with-regex "^1.0.2"
immutable ">=3.8.1"
react ">=15.2.1"
react-dom ">=15.2.1"
immutable "^3.7.4"
prop-types "^15.5.8"
union-class-names "^1.0.0"

draft-js-single-line-plugin@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/draft-js-single-line-plugin/-/draft-js-single-line-plugin-1.0.0.tgz#d766ed532605754afab6ffc981b3b92f9345764a"
draft-js-single-line-plugin@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/draft-js-single-line-plugin/-/draft-js-single-line-plugin-2.0.1.tgz#3aea1b100b1562d7ef3d5d02e73190da12953857"
dependencies:
immutable "^3.8.1"

draft-js-utils@^0.1.4:
version "0.1.6"
resolved "https://registry.yarnpkg.com/draft-js-utils/-/draft-js-utils-0.1.6.tgz#71f0e90a843426f0eadc83e8154b3220c4bb7f9e"

draft-js@>=0.8.1:
version "0.9.1"
resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.9.1.tgz#940a51a0ad1fede0411676b6404f4050495f54f9"
dependencies:
fbjs "^0.8.3"
immutable "~3.7.4"
object-assign "^4.1.0"
draft-js-utils@^0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/draft-js-utils/-/draft-js-utils-0.1.7.tgz#e2b6927ca620edf1855a4bfc1cf1d21080a70f16"

duplexer@~0.1.1:
version "0.1.1"
Expand Down Expand Up @@ -1730,7 +1716,7 @@ fb-watchman@^1.8.0:
dependencies:
bser "^1.0.2"

fbjs@^0.8.3, fbjs@^0.8.4, fbjs@^0.8.9:
fbjs@^0.8.9:
version "0.8.12"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
dependencies:
Expand Down Expand Up @@ -2182,7 +2168,7 @@ ignore@^3.1.5:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.0.tgz#8d88f03c3002a0ac52114db25d2c673b0bf1e435"

immutable@>=3.8.1, immutable@^3.7.6, immutable@^3.8.1:
immutable@^3.7.4, immutable@^3.7.6, immutable@^3.8.1:
version "3.8.1"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"

Expand Down Expand Up @@ -2431,6 +2417,10 @@ isexe@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"

isfunction@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/isfunction/-/isfunction-0.0.6.tgz#48f98048441eda8ec3fa3b558607b7b41bea2e0c"

isobject@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
Expand Down Expand Up @@ -3518,6 +3508,13 @@ react-addons-test-utils@15.3.2:
version "15.3.2"
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.3.2.tgz#c09a44f583425a4a9c1b38444d7a6c3e6f0f41f6"

react-addons-update@^15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react-addons-update/-/react-addons-update-15.6.2.tgz#e53753c5b34887974510c882d7fb075851d5e504"
dependencies:
fbjs "^0.8.9"
object-assign "^4.1.0"

react-day-picker@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-3.0.0.tgz#633194ed8e8e3dea04f464cf29e2f612e1eebba4"
Expand All @@ -3537,10 +3534,6 @@ react-dnd@^2.1.4:
invariant "^2.1.0"
lodash "^4.2.0"

react-dom@>=15.2.1:
version "15.3.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.2.tgz#c46b0aa5380d7b838e7a59c4a7beff2ed315531f"

react-dropzone@^3.5.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-3.6.0.tgz#31e9cdfc0db921525dae0b82115cf4dc764c680a"
Expand All @@ -3559,14 +3552,6 @@ react-textarea-autosize@^4.0.2:
version "4.0.5"
resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-4.0.5.tgz#55379f6a6fa575fc87d1b8de2756e57e3b6c995d"

react@>=15.2.1:
version "15.3.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.3.2.tgz#a7bccd2fee8af126b0317e222c28d1d54528d09e"
dependencies:
fbjs "^0.8.4"
loose-envify "^1.1.0"
object-assign "^4.1.0"

read-all-stream@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
Expand Down