Skip to content

Commit 28d5490

Browse files
fixed export modal, also added pointer cursor for export modal exit
1 parent ca5867e commit 28d5490

File tree

3 files changed

+44
-26
lines changed

3 files changed

+44
-26
lines changed

src/components/SimpleModal.jsx

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,39 +46,52 @@ const SimpleModal = (props) => {
4646
onClose={closeModal}
4747
open={open}
4848
>
49-
<div style={{
50-
top: '50%',
51-
left: '50%',
52-
transform: 'translate(-50%, -50%)',
53-
}} className={classes.paper}>
49+
<div
50+
style={{
51+
top: '50%',
52+
left: '50%',
53+
transform: 'translate(-50%, -50%)',
54+
}}
55+
className={classes.paper}
56+
>
5457
<Icon
5558
onClick={closeModal}
56-
className='closeIcon'
59+
className="closeIcon"
5760
style={{
5861
position: 'absolute',
5962
top: '2%',
6063
right: '1%',
6164
fontSize: '17px',
6265
fontWeight: 'bold',
6366
}}
64-
>close</Icon>
67+
>
68+
close
69+
</Icon>
6570
<Typography variant="title" id="modal-title">
6671
{message}
6772
</Typography>
73+
<div>{children}</div>
6874
<div>
69-
{children}
70-
</div>
71-
<div>
72-
{
73-
secBtnLabel ? <Button variant='extendedFab' color="secondary" className={classes.button} onClick={secBtnAction}>
75+
{secBtnLabel ? (
76+
<Button
77+
variant="extendedFab"
78+
color="secondary"
79+
className={classes.button}
80+
onClick={secBtnAction}
81+
>
7482
{secBtnLabel}
75-
</Button> : null
76-
}
77-
{
78-
primBtnLabel ? <Button variant='extendedFab' color="primary" className={classes.button} onClick={primBtnAction}>
83+
</Button>
84+
) : null}
85+
{primBtnLabel ? (
86+
<Button
87+
variant="extendedFab"
88+
color="primary"
89+
className={classes.button}
90+
onClick={primBtnAction}
91+
>
7992
{primBtnLabel}
80-
</Button> : null
81-
}
93+
</Button>
94+
) : null}
8295
</div>
8396
</div>
8497
</Modal>

src/containers/MainContainer.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
} from '../actions/components';
2020
import KonvaStage from '../components/KonvaStage.jsx';
2121
import MainContainerHeader from '../components/MainContainerHeader.jsx';
22-
// import createModal from '../utils/createModal.util';
22+
import createModal from '../utils/createModal.util';
2323

2424
const IPC = require('electron').ipcRenderer;
2525

@@ -158,6 +158,7 @@ class MainContainer extends Component {
158158
};
159159

160160
showGenerateAppModal = () => {
161+
console.log('clicked on export button');
161162
const { closeModal, chooseGenOptions } = this;
162163
const { genOptions } = this.state;
163164
const children = (
@@ -174,13 +175,13 @@ class MainContainer extends Component {
174175
))}
175176
</List>
176177
);
177-
// this.setState({
178-
// modal: createModal({
179-
// closeModal,
180-
// children,
181-
// message: 'Choose export preference:',
182-
// }),
183-
// });
178+
this.setState({
179+
modal: createModal({
180+
closeModal,
181+
children,
182+
message: 'Choose export preference:',
183+
}),
184+
});
184185
};
185186

186187
render() {

src/public/styles/style.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,3 +269,7 @@ div.rst__rowContents {
269269
.rst__rowLabel {
270270
padding-right: 5px;
271271
}
272+
273+
.closeIcon:hover {
274+
cursor: pointer;
275+
}

0 commit comments

Comments
 (0)