From 72103b1de07c5e2047ba0cfa3941918ddcaee600 Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Wed, 12 Dec 2018 14:00:12 -0500
Subject: [PATCH] close file menu on uploading sb file; don't close file menu
twice
---
src/components/menu-bar/menu-bar.jsx | 1 -
src/containers/sb-file-uploader.jsx | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
index 4eac08361..f55e06836 100644
--- a/src/components/menu-bar/menu-bar.jsx
+++ b/src/components/menu-bar/menu-bar.jsx
@@ -161,7 +161,6 @@ class MenuBar extends React.Component {
// since we will auto-save first. Else, confirm first.
const readyToReplaceProject = (this.props.canSave && this.props.canCreateNew) ||
confirm(this.props.intl.formatMessage(messages.confirmNav)); // eslint-disable-line no-alert
- this.props.onRequestCloseFile();
if (readyToReplaceProject) {
this.props.onClickNew(this.props.canSave && this.props.canCreateNew);
}
diff --git a/src/containers/sb-file-uploader.jsx b/src/containers/sb-file-uploader.jsx
index f7bacfd73..6bd0bfae4 100644
--- a/src/containers/sb-file-uploader.jsx
+++ b/src/containers/sb-file-uploader.jsx
@@ -12,6 +12,9 @@ import {
openLoadingProject,
closeLoadingProject
} from '../reducers/modals';
+import {
+ closeFileMenu
+} from '../reducers/menus';
/**
* SBFileUploader component passes a file input, load handler and props to its child.
@@ -136,6 +139,7 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
onLoadingFinished: loadingState => {
dispatch(onLoadedProject(loadingState, ownProps.canSave));
dispatch(closeLoadingProject());
+ dispatch(closeFileMenu());
},
onLoadingStarted: () => {
dispatch(openLoadingProject());
--
GitLab