Skip to content

Commit 220cb83

Browse files
committed
update google docs dialog rendering
1 parent 9486193 commit 220cb83

File tree

1 file changed

+29
-31
lines changed

1 file changed

+29
-31
lines changed

hwproj.front/src/components/Solutions/ExportToGoogle.tsx

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -102,40 +102,38 @@ const ExportToGoogle: FC<ExportToGoogleProps> = (props: ExportToGoogleProps) =>
102102
</Grid>
103103
</DialogContentText>
104104
<DialogActions style={{ padding: 0, marginTop: 12 }}>
105-
<Grid item container spacing={1} alignItems="center" marginRight="auto">
106-
<Grid item xs={true}>
105+
<Grid item xs={true}>
106+
<TextField
107+
fullWidth
108+
size="small"
109+
label="Ссылка на Google Sheets"
110+
value={url}
111+
onChange={event => {
112+
event.persist()
113+
handleGoogleDocUrlChange(event.target.value)
114+
}}
115+
/>
116+
</Grid>
117+
{loadingSheets &&
118+
<Grid item>
119+
<CircularProgress size={28}/>
120+
</Grid>
121+
}
122+
{!loadingSheets && googleSheetTitles && googleSheetTitles.value && googleSheetTitles.value.length > 0 &&
123+
<Grid item>
107124
<TextField
108-
fullWidth
125+
select
109126
size="small"
110-
label="Ссылка на Google Sheets"
111-
value={url}
112-
onChange={event => {
113-
event.persist()
114-
handleGoogleDocUrlChange(event.target.value)
115-
}}
116-
/>
127+
id="demo-simple-select"
128+
label="Лист"
129+
value={selectedSheet}
130+
onChange={v => setState(prevState => ({ ...prevState, selectedSheet: +v.target.value }))}
131+
>
132+
{googleSheetTitles.value.map((title, i) => <MenuItem value={i}>{title}</MenuItem>)}
133+
</TextField>
117134
</Grid>
118-
{loadingSheets &&
119-
<Grid item>
120-
<CircularProgress size={28}/>
121-
</Grid>
122-
}
123-
{!loadingSheets && googleSheetTitles && googleSheetTitles.value && googleSheetTitles.value.length > 0 &&
124-
<Grid item>
125-
<TextField
126-
select
127-
size="small"
128-
id="demo-simple-select"
129-
label="Лист"
130-
value={selectedSheet}
131-
onChange={v => setState(prevState => ({ ...prevState, selectedSheet: +v.target.value }))}
132-
>
133-
{googleSheetTitles.value.map((title, i) => <MenuItem value={i}>{title}</MenuItem>)}
134-
</TextField>
135-
</Grid>
136-
}
137-
</Grid>
138-
{googleSheetTitles && googleSheetTitles.succeeded &&
135+
}
136+
{!loadingSheets && googleSheetTitles && googleSheetTitles.succeeded &&
139137
<Grid item>
140138
<LoadingButton
141139
variant="text"

0 commit comments

Comments
 (0)