From 581b89f700a20bafb8f6af42e3de9a0253092a4f Mon Sep 17 00:00:00 2001 From: Mickael KERJEAN Date: Thu, 7 Mar 2019 18:47:12 +1100 Subject: [PATCH] upgrade (dep): upgrade react to latest version --- client/components/formbuilder.js | 2 +- client/components/ngif.js | 2 +- client/pages/filespage.js | 6 +++--- client/pages/filespage/breadcrumb.js | 9 +-------- client/pages/filespage/filesystem.js | 4 ++-- client/pages/filespage/filezone.js | 2 +- client/pages/filespage/share.js | 2 +- client/pages/filespage/submenu.js | 5 ++--- client/pages/filespage/thing-existing.js | 17 +++++++++-------- client/pages/filespage/thing-new.js | 5 ++--- client/pages/viewerpage/menubar.js | 2 +- package.json | 4 ++-- 12 files changed, 26 insertions(+), 34 deletions(-) diff --git a/client/components/formbuilder.js b/client/components/formbuilder.js index 231dadd9..8a897343 100644 --- a/client/components/formbuilder.js +++ b/client/components/formbuilder.js @@ -248,6 +248,6 @@ const FormElement = (props) => { return props.render($input, props, struct, props.onChange.bind(null, null)); }; -FormElement.PropTypes = { +FormElement.propTypes = { render: PropTypes.func.isRequired }; diff --git a/client/components/ngif.js b/client/components/ngif.js index aac503bb..9a88bf2a 100644 --- a/client/components/ngif.js +++ b/client/components/ngif.js @@ -1,4 +1,4 @@ -import React from 'react' +import React from 'react'; import PropTypes from 'prop-types'; export class NgIf extends React.Component { diff --git a/client/pages/filespage.js b/client/pages/filespage.js index 947de8f8..b80c3bb9 100644 --- a/client/pages/filespage.js +++ b/client/pages/filespage.js @@ -24,7 +24,7 @@ let LAST_PAGE_PARAMS = { @ErrorPage @LoggedInOnly @EventReceiver -@DragDropContext(('ontouchstart' in window)? HTML5Backend : HTML5Backend) +@DragDropContext(HTML5Backend) export class FilesPage extends React.Component { constructor(props){ super(props); @@ -238,13 +238,13 @@ export class FilesPage extends React.Component { initialLoad={false} useWindow={false} loadMore={this.loadMore.bind(this)} threshold={100}> - + this.onView(value)} onSortUpdate={(value) => {this.onSort(value);}} accessRight={this.state.metadata || {}}> + metadata={this.state.metadata || {}} onSort={this.onSort.bind(this)} onView={this.onView.bind(this)} /> diff --git a/client/pages/filespage/breadcrumb.js b/client/pages/filespage/breadcrumb.js index 3919a66f..8e27ceef 100644 --- a/client/pages/filespage/breadcrumb.js +++ b/client/pages/filespage/breadcrumb.js @@ -5,7 +5,7 @@ import { DropTarget } from 'react-dnd'; import { EventEmitter, BreadCrumb, PathElement } from '../../components/'; import { pathBuilder } from '../../helpers/'; -export class BreadCrumbTargettable extends BreadCrumb{ +export class BreadCrumbTargettable extends BreadCrumb { constructor(props){ super(props); } @@ -14,10 +14,6 @@ export class BreadCrumbTargettable extends BreadCrumb{ return super.render(Element); } } -BreadCrumbTargettable.PropTypes = { - path: PropTypes.string.isRequred -} - const fileTarget = { canDrop(props){ @@ -63,6 +59,3 @@ class Element extends PathElement { )); } } -Element.PropTypes = { - path: PropTypes.string.isRequred -} diff --git a/client/pages/filespage/filesystem.js b/client/pages/filespage/filesystem.js index 2fe9b2cc..11a9fe6e 100644 --- a/client/pages/filespage/filesystem.js +++ b/client/pages/filespage/filesystem.js @@ -22,7 +22,7 @@ export class FileSystem extends React.Component { render() { const metadata = this.props.metadata || {}; - + // TODO: https://reactjs.org/docs/higher-order-components.html#dont-use-hocs-inside-the-render-method return this.props.connectDropFile(
@@ -53,7 +53,7 @@ export class FileSystem extends React.Component { } } -FileSystem.PropTypes = { +FileSystem.propTypes = { path: PropTypes.string.isRequired, files: PropTypes.array.isRequired, metadata: PropTypes.object.isRequired diff --git a/client/pages/filespage/filezone.js b/client/pages/filespage/filezone.js index 6b23b988..309107c3 100644 --- a/client/pages/filespage/filezone.js +++ b/client/pages/filespage/filezone.js @@ -28,6 +28,6 @@ export class FileZone extends React.Component{ } } -FileZone.PropTypes = { +FileZone.propTypes = { path: PropTypes.string.isRequired } diff --git a/client/pages/filespage/share.js b/client/pages/filespage/share.js index b7410d9f..617ba455 100644 --- a/client/pages/filespage/share.js +++ b/client/pages/filespage/share.js @@ -283,7 +283,7 @@ const SuperCheckbox = (props) => {
); }; -SuperCheckbox.PropTypes = { +SuperCheckbox.propTypes = { label: PropTypes.string.isRequired, onChange: PropTypes.func.isRequired, inputType: PropTypes.string, diff --git a/client/pages/filespage/submenu.js b/client/pages/filespage/submenu.js index 22a5fd86..6052c50c 100644 --- a/client/pages/filespage/submenu.js +++ b/client/pages/filespage/submenu.js @@ -152,9 +152,8 @@ export class Submenu extends React.Component { }; } -Submenu.PropTypes = { - accessRight: PropTypes.obj, - onCreate: PropTypes.func.isRequired, +Submenu.propTypes = { + accessRight: PropTypes.object, onSortUpdate: PropTypes.func.isRequired, sort: PropTypes.string.isRequired }; diff --git a/client/pages/filespage/thing-existing.js b/client/pages/filespage/thing-existing.js index b98abcda..02c7f3ff 100644 --- a/client/pages/filespage/thing-existing.js +++ b/client/pages/filespage/thing-existing.js @@ -237,14 +237,15 @@ export class ExistingThing extends React.Component { ))); } } -ExistingThing.PropTypes = { - connectDragSource: PropTypes.func.isRequired, - isDragging: PropTypes.bool.isRequired, - fileIsOver: PropTypes.bool.isRequired, - nativeFileIsOver: PropTypes.bool.isRequired, - canDropFile: PropTypes.bool.isRequired, - canDropNativeFile: PropTypes.bool.isRequired -}; +// TODO: https://reactjs.org/docs/higher-order-components.html#dont-use-hocs-inside-the-render-method +// ExistingThing.propTypes = { +// connectDragSource: PropTypes.func.isRequired, +// isDragging: PropTypes.bool.isRequired, +// fileIsOver: PropTypes.bool.isRequired, +// nativeFileIsOver: PropTypes.bool.isRequired, +// canDropFile: PropTypes.bool.isRequired, +// canDropNativeFile: PropTypes.bool.isRequired +// }; export default function ToggleableLink(props) { const { disabled, ...rest } = props; diff --git a/client/pages/filespage/thing-new.js b/client/pages/filespage/thing-new.js index e39b0965..41a3ed0c 100644 --- a/client/pages/filespage/thing-new.js +++ b/client/pages/filespage/thing-new.js @@ -112,9 +112,8 @@ export class NewThing extends React.Component { }; } -NewThing.PropTypes = { - accessRight: PropTypes.obj, - onCreate: PropTypes.func.isRequired, +NewThing.propTypes = { + accessRight: PropTypes.object.isRequired, onSortUpdate: PropTypes.func.isRequired, sort: PropTypes.string.isRequired }; diff --git a/client/pages/viewerpage/menubar.js b/client/pages/viewerpage/menubar.js index 131f4d90..11f9f96a 100644 --- a/client/pages/viewerpage/menubar.js +++ b/client/pages/viewerpage/menubar.js @@ -66,7 +66,7 @@ class DownloadButton extends React.Component { ); } } -DownloadButton.PropTypes = { +DownloadButton.propTypes = { link: PropTypes.string.isRequired, name: PropTypes.string.isRequired }; diff --git a/package.json b/package.json index 963d2e84..de830467 100644 --- a/package.json +++ b/package.json @@ -38,11 +38,11 @@ "node-sass": "^4.10.0", "nodemon": "^1.17.1", "prop-types": "^15.5.10", - "react": "^15.3.2", + "react": "^16.8.0", + "react-dom": "^16.8.0", "react-addons-css-transition-group": "^15.6.2", "react-dnd": "^2.4.0", "react-dnd-html5-backend-filedrop": "^1.0.0", - "react-dom": "^15.3.2", "react-draggable": "^2.2.6", "react-infinite-scroller": "^1.1.4", "react-router": "^4.1.1",