Skip to content

Commit a2f2874

Browse files
authored
fix: tabs on expand modal occupy the modal space (#3790)
1 parent 02c32c4 commit a2f2874

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

src/app/views/query-response/QueryResponse.tsx

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
Button,
33
Dialog,
4+
DialogActions,
45
DialogBody,
56
DialogContent,
67
DialogSurface,
@@ -10,7 +11,7 @@ import {
1011
Tooltip,
1112
useRestoreFocusTarget
1213
} from '@fluentui/react-components';
13-
import { DismissRegular, ExpandUpLeftRegular } from '@fluentui/react-icons';
14+
import { ExpandUpLeftRegular } from '@fluentui/react-icons';
1415
import { useState } from 'react';
1516
import { GetPivotItems } from './pivot-items/pivot-item';
1617
import { translateMessage } from '../../utils/translate-messages';
@@ -26,9 +27,12 @@ const useStyles = makeStyles({
2627
},
2728
dialog: {
2829
display: 'flex',
29-
justifyContent: 'center',
30-
maxWidth: '70%',
31-
minHeight: '70%'
30+
flexDirection: 'column',
31+
width: '90%',
32+
maxWidth: '90%',
33+
overflow: 'hidden',
34+
height: '90%',
35+
maxHeight: '100%'
3236
},
3337
dialogBtn: {
3438
position: 'absolute',
@@ -39,6 +43,13 @@ const useStyles = makeStyles({
3943
dismissBtn: {
4044
height: 'min-content',
4145
marginTop: tokens.spacingVerticalL
46+
},
47+
dialogContent: {
48+
padding: '16px',
49+
overflow: 'auto',
50+
whiteSpace: 'pre-wrap',
51+
wordBreak: 'break-word',
52+
flexGrow: 1
4253
}
4354
});
4455

@@ -63,21 +74,15 @@ const PivotItemsDialog = () => {
6374
<Dialog open={open} onOpenChange={(_event, data) => setOpen(data.open)}>
6475
<DialogSurface className={styles.dialog}>
6576
<DialogBody>
66-
<DialogContent>
77+
<DialogContent className={styles.dialogContent}>
6778
<GetPivotItems />
6879
</DialogContent>
80+
<DialogActions>
81+
<DialogTrigger disableButtonEnhancement>
82+
<Button appearance='secondary'>{translateMessage('Close')}</Button>
83+
</DialogTrigger>
84+
</DialogActions>
6985
</DialogBody>
70-
<DialogTrigger disableButtonEnhancement>
71-
<Tooltip relationship='label' content={translateMessage('Close')}>
72-
<Button
73-
appearance='transparent'
74-
icon={<DismissRegular />}
75-
aria-label={translateMessage('Close')}
76-
className={styles.dismissBtn}
77-
onClick={() => setOpen(false)}
78-
/>
79-
</Tooltip>
80-
</DialogTrigger>
8186
</DialogSurface>
8287
</Dialog>
8388
</div>

src/app/views/query-response/pivot-items/pivot-item.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ const useStyles = makeStyles({
6161
padding: tokens.spacingHorizontalS,
6262
marginTop: tokens.spacingHorizontalS,
6363
backgroundColor: tokens.colorNeutralBackground1,
64-
minHeight: '0',
64+
height: '100%',
65+
minHeight: '600px',
6566
overflow: 'auto'
6667
}
6768
});

0 commit comments

Comments
 (0)