From 802ddf79024af23cd029a444bc8dcd13fc17852a Mon Sep 17 00:00:00 2001 From: Marisa DeMeglio Date: Fri, 21 Dec 2018 00:40:05 -0800 Subject: [PATCH] fix: disable file input areas while processing Fixes #24 --- src/renderer/components/Sidebar.js | 16 ++++++++-------- src/renderer/components/Splash.js | 20 +++++++++++++------- src/renderer/styles/Splash.scss | 7 ++++++- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/renderer/components/Sidebar.js b/src/renderer/components/Sidebar.js index b3e4d33..11d5fee 100644 --- a/src/renderer/components/Sidebar.js +++ b/src/renderer/components/Sidebar.js @@ -6,9 +6,9 @@ import { bindActionCreators } from 'redux'; import { createMuiTheme, withStyles, MuiThemeProvider } from '@material-ui/core/styles'; import { CircularProgress, - Divider, - Drawer, - IconButton, + Divider, + Drawer, + IconButton, List, ListItem, ListItemIcon, @@ -43,7 +43,7 @@ const sidebarTheme = createMuiTheme({ }); const styles = theme => ({ - + menuButton: { marginLeft: 12, marginRight: 36, @@ -103,7 +103,7 @@ class Sidebar extends React.Component { open: true, fileHover: false, }; - + showOpenEPUBDialog = () => { process.platform == 'darwin' ? FileDialogHelpers.showEpubFileOrFolderBrowseDialog(this.props.openFile) @@ -115,7 +115,7 @@ class Sidebar extends React.Component { FileDialogHelpers.showExportReportDialog(this.props.exportReport); return false; } - + onDragOver = e => { e.stopPropagation(); e.preventDefault(); @@ -164,6 +164,7 @@ class Sidebar extends React.Component { } - openFile(inputPath)} disabled={!inputPath}> @@ -228,4 +229,3 @@ function mapDispatchToProps(dispatch) { } export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles,{ withTheme: true })(Sidebar)); - diff --git a/src/renderer/components/Splash.js b/src/renderer/components/Splash.js index 05f0001..430c498 100644 --- a/src/renderer/components/Splash.js +++ b/src/renderer/components/Splash.js @@ -69,10 +69,11 @@ class Splash extends React.Component { render() { let {classes, processing} = this.props; - + let disabled = processing ? 'disabled' : ''; return (
{processing && }
+ {!processing &&

Drop an EPUB file or directory here,
or on the   button in the sidebar,
- or {process.platform == 'darwin' - ?click to browse. - :browse for a file or - a folder. -} + or + {process.platform == 'darwin' + ? click to browse. + : browse for + a file or + a folder. + + }

+ } ); } diff --git a/src/renderer/styles/Splash.scss b/src/renderer/styles/Splash.scss index 130871e..7beab4d 100644 --- a/src/renderer/styles/Splash.scss +++ b/src/renderer/styles/Splash.scss @@ -43,4 +43,9 @@ border: 5px dashed rgba(0, 0, 0, 0.1); border-radius: 50px; transition: border-color 0.5s ease; -} \ No newline at end of file +} + +.splash.processing { + background-color: rgba(128, 128, 128, .4) !important; + pointer-events: none; +}