From ffeebb03bd8b9a325b0f1316b93fc9276010ddf7 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Wed, 1 May 2019 11:01:44 -0400
Subject: [PATCH] Update eslint-plugin-react and fix new lint errors.
This includes a small bug where the target pane wouldn't automatically update if changes to the sprite occured while in fullscreen/player mode.
Closes #4221
---
package.json | 2 +-
src/components/menu-bar/menu-bar.jsx | 2 ++
src/containers/stage.jsx | 1 +
src/lib/app-state-hoc.jsx | 3 ++-
src/lib/project-fetcher-hoc.jsx | 2 ++
src/lib/project-saver-hoc.jsx | 6 ++++++
src/lib/vm-listener-hoc.jsx | 6 ++++--
src/lib/vm-manager-hoc.jsx | 1 +
8 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 6659eff66..1a96a5e1d 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"eslint": "^5.0.1",
"eslint-config-scratch": "^5.0.0",
"eslint-plugin-import": "^2.8.0",
- "eslint-plugin-react": "7.11.1",
+ "eslint-plugin-react": "^7.12.4",
"file-loader": "2.0.0",
"get-float-time-domain-data": "0.1.0",
"get-user-media-promise": "1.1.4",
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
index 22cd2d919..6105a60e5 100644
--- a/src/components/menu-bar/menu-bar.jsx
+++ b/src/components/menu-bar/menu-bar.jsx
@@ -715,6 +715,7 @@ MenuBar.propTypes = {
isShowingProject: PropTypes.bool,
isUpdating: PropTypes.bool,
languageMenuOpen: PropTypes.bool,
+ locale: PropTypes.string.isRequired,
loginMenuOpen: PropTypes.bool,
onClickAccount: PropTypes.func,
onClickEdit: PropTypes.func,
@@ -744,6 +745,7 @@ MenuBar.propTypes = {
sessionExists: PropTypes.bool,
shouldSaveBeforeTransition: PropTypes.func,
showComingSoon: PropTypes.bool,
+ userOwnsProject: PropTypes.bool,
username: PropTypes.string,
vm: PropTypes.instanceOf(VM).isRequired
};
diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx
index e0e3096a1..9ddd0d907 100644
--- a/src/containers/stage.jsx
+++ b/src/containers/stage.jsx
@@ -423,6 +423,7 @@ class Stage extends React.Component {
Stage.propTypes = {
isColorPicking: PropTypes.bool,
isFullScreen: PropTypes.bool.isRequired,
+ isStarted: PropTypes.bool,
micIndicator: PropTypes.bool,
onActivateColorPicker: PropTypes.func,
onDeactivateColorPicker: PropTypes.func,
diff --git a/src/lib/app-state-hoc.jsx b/src/lib/app-state-hoc.jsx
index 7d1fe2ed4..c7c076e33 100644
--- a/src/lib/app-state-hoc.jsx
+++ b/src/lib/app-state-hoc.jsx
@@ -113,7 +113,8 @@ const AppStateHOC = function (WrappedComponent, localesOnly) {
}
AppStateWrapper.propTypes = {
isFullScreen: PropTypes.bool,
- isPlayerOnly: PropTypes.bool
+ isPlayerOnly: PropTypes.bool,
+ showTelemetryModal: PropTypes.bool
};
return AppStateWrapper;
};
diff --git a/src/lib/project-fetcher-hoc.jsx b/src/lib/project-fetcher-hoc.jsx
index 888e378f5..3f4613719 100644
--- a/src/lib/project-fetcher-hoc.jsx
+++ b/src/lib/project-fetcher-hoc.jsx
@@ -115,8 +115,10 @@ const ProjectFetcherHOC = function (WrappedComponent) {
assetHost: PropTypes.string,
canSave: PropTypes.bool,
intl: intlShape.isRequired,
+ isCreatingNew: PropTypes.bool,
isFetchingWithId: PropTypes.bool,
isLoadingProject: PropTypes.bool,
+ isShowingProject: PropTypes.bool,
loadingState: PropTypes.oneOf(LoadingStates),
onActivateTab: PropTypes.func,
onError: PropTypes.func,
diff --git a/src/lib/project-saver-hoc.jsx b/src/lib/project-saver-hoc.jsx
index ee56b4b58..2dbc33747 100644
--- a/src/lib/project-saver-hoc.jsx
+++ b/src/lib/project-saver-hoc.jsx
@@ -343,6 +343,7 @@ const ProjectSaverHOC = function (WrappedComponent) {
}
ProjectSaverComponent.propTypes = {
+ autoSaveIntervalSecs: PropTypes.number.isRequired,
autoSaveTimeoutId: PropTypes.number,
canCreateNew: PropTypes.bool,
canSave: PropTypes.bool,
@@ -358,12 +359,16 @@ const ProjectSaverHOC = function (WrappedComponent) {
isShowingWithoutId: PropTypes.bool,
isUpdating: PropTypes.bool,
loadingState: PropTypes.oneOf(LoadingStates),
+ locale: PropTypes.string.isRequired,
onAutoUpdateProject: PropTypes.func,
onCreateProject: PropTypes.func,
onCreatedProject: PropTypes.func,
onProjectError: PropTypes.func,
onProjectTelemetryEvent: PropTypes.func,
onRemixing: PropTypes.func,
+ onSetProjectSaver: PropTypes.func.isRequired,
+ onSetProjectThumbnailer: PropTypes.func.isRequired,
+ onSetProjectUnchanged: PropTypes.func.isRequired,
onShowAlert: PropTypes.func,
onShowCopySuccessAlert: PropTypes.func,
onShowCreatingCopyAlert: PropTypes.func,
@@ -377,6 +382,7 @@ const ProjectSaverHOC = function (WrappedComponent) {
projectChanged: PropTypes.bool,
reduxProjectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
reduxProjectTitle: PropTypes.string,
+ setAutoSaveTimeoutId: PropTypes.func.isRequired,
vm: PropTypes.instanceOf(VM).isRequired
};
ProjectSaverComponent.defaultProps = {
diff --git a/src/lib/vm-listener-hoc.jsx b/src/lib/vm-listener-hoc.jsx
index bac53a514..746936cb5 100644
--- a/src/lib/vm-listener-hoc.jsx
+++ b/src/lib/vm-listener-hoc.jsx
@@ -60,9 +60,9 @@ const vmListenerHOC = function (WrappedComponent) {
this.props.vm.postIOData('userData', {username: this.props.username});
}
- // Re-request a targets update when the shouldEmitTargetsUpdate state changes to true
+ // Re-request a targets update when the shouldEmitUpdate state changes to true
// i.e. when the editor transitions out of fullscreen/player only modes
- if (this.props.shouldEmitTargetsUpdate && !prevProps.shouldEmitTargetsUpdate) {
+ if (this.props.shouldEmitUpdates && !prevProps.shouldEmitUpdates) {
this.props.vm.emitTargetsUpdate(false /* Emit the event, but do not trigger project change */);
}
}
@@ -148,8 +148,10 @@ const vmListenerHOC = function (WrappedComponent) {
onKeyUp: PropTypes.func,
onMicListeningUpdate: PropTypes.func.isRequired,
onMonitorsUpdate: PropTypes.func.isRequired,
+ onProjectChanged: PropTypes.func.isRequired,
onProjectRunStart: PropTypes.func.isRequired,
onProjectRunStop: PropTypes.func.isRequired,
+ onProjectSaved: PropTypes.func.isRequired,
onRuntimeStarted: PropTypes.func.isRequired,
onShowExtensionAlert: PropTypes.func.isRequired,
onTargetsUpdate: PropTypes.func.isRequired,
diff --git a/src/lib/vm-manager-hoc.jsx b/src/lib/vm-manager-hoc.jsx
index fd7e3ed3c..7947dfd64 100644
--- a/src/lib/vm-manager-hoc.jsx
+++ b/src/lib/vm-manager-hoc.jsx
@@ -107,6 +107,7 @@ const vmManagerHOC = function (WrappedComponent) {
fontsLoaded: PropTypes.bool,
isLoadingWithId: PropTypes.bool,
isPlayerOnly: PropTypes.bool,
+ isStarted: PropTypes.bool,
loadingState: PropTypes.oneOf(LoadingStates),
locale: PropTypes.string,
messages: PropTypes.objectOf(PropTypes.string),
--
GitLab