Skip to content

fix: removing unsupported modal sizes #10625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rusackas merged 4 commits into from
Aug 18, 2020
Merged

fix: removing unsupported modal sizes #10625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a33f644
fix: removing unsupported modal sizes
rusackas Aug 17, 2020
e687969
linting!
rusackas Aug 18, 2020
334d758
NOT specifying bsSize seems to have the same effect as (unsupported) …
rusackas Aug 18, 2020
b00e708
supporting 'large' and 'small' over 'lg' and 'sm'
rusackas Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ class EstimateQueryCostButton extends React.PureComponent {
<i className="fa fa-clock-o" /> {btnText}
</Button>
}
bsSize="medium"
/>
</span>
);
Expand Down
1 change: 0 additions & 1 deletion superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ class ScheduleQueryButton extends React.PureComponent {
<i className="fa fa-calendar" /> {t('Schedule')}
</Button>
}
bsSize="medium"
/>
</span>
);
Expand Down
1 change: 0 additions & 1 deletion superset-frontend/src/components/DeleteModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export default function DeleteModal({
primaryButtonType="danger"
show={open}
title={title}
bsSize="medium"
>
<DescriptionContainer>{description}</DescriptionContainer>
<StyleFormGroup>
Expand Down
5 changes: 2 additions & 3 deletions superset-frontend/src/components/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ interface ModalProps {
primaryButtonType?: 'primary' | 'danger';
show: boolean;
title: React.ReactNode;
bsSize?: 'xs' | 'xsmall' | 'sm' | 'small' | 'medium' | 'lg' | 'large';
bsSize?: 'small' | 'large'; // react-bootstrap also supports 'sm', 'lg' but we're keeping it simple.
}

const StyledModal = styled(BaseModal)`
Expand Down Expand Up @@ -75,10 +75,9 @@ export default function Modal({
primaryButtonType = 'primary',
show,
title,
bsSize = 'lg',
}: ModalProps) {
return (
<StyledModal show={show} onHide={onHide} bsSize={bsSize}>
<StyledModal show={show} onHide={onHide}>
<BaseModal.Header closeButton>
<BaseModal.Title>
<Title>{title}</Title>
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/components/ModalTrigger.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const propTypes = {
onExit: PropTypes.func,
isButton: PropTypes.bool,
isMenuItem: PropTypes.bool,
bsSize: PropTypes.string,
bsSize: PropTypes.oneOf(['large', 'small']), // react-bootstrap also supports 'sm', 'lg' but we're keeping it simple.
className: PropTypes.string,
tooltip: PropTypes.string,
backdrop: PropTypes.oneOf(['static', true, false]),
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/datasource/ChangeDatasourceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
};

return (
<Modal show={show} onHide={onHide} onEnter={onEnterModal} bsSize="lg">
<Modal show={show} onHide={onHide} onEnter={onEnterModal} bsSize="large">
<Modal.Header closeButton>
<Modal.Title>{t('Select a datasource')}</Modal.Title>
</Modal.Header>
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/datasource/DatasourceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
};

return (
<Modal show={show} onHide={onHide} bsSize="lg">
<Modal show={show} onHide={onHide} bsSize="large">
<Modal.Header closeButton>
<Modal.Title>
<div>
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/explore/components/controls/VizTypeControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export default class VizTypeControl extends React.PureComponent {
onHide={this.toggleModal}
onEnter={this.focusSearch}
onExit={this.setSearchRef}
bsSize="lg"
bsSize="large"
>
<Modal.Header closeButton>
<Modal.Title>{t('Select a visualization type')}</Modal.Title>
Expand Down