Skip to content

Commit

Permalink
fix: #3870 container issue (#3871)
Browse files Browse the repository at this point in the history
  • Loading branch information
willmcvay authored Mar 31, 2021
1 parent fceb39b commit dc25649
Show file tree
Hide file tree
Showing 11 changed files with 1,946 additions and 1,917 deletions.

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions packages/aml-checklist/src/components/pages/checklist-detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,13 @@ export const ChecklistDetail: React.FC<CheckListDetailProps> = ({
// TODO: Will replace callback by dispatch to show modald`
const sections = React.useMemo(() => generateSection(status, showModal), [status])
return (
<ErrorBoundary>
<AMLProgressBar />
<Section hasBackground={false}>{renderSections(sections)}</Section>
<Modal id={id} visible={isModalVisible} afterClose={hideModal} modalContentType={modalContentType} />
</ErrorBoundary>
<Section hasMargin={false} hasPadding={false}>
<ErrorBoundary>
<AMLProgressBar />
<Section>{renderSections(sections)}</Section>
<Modal id={id} visible={isModalVisible} afterClose={hideModal} modalContentType={modalContentType} />
</ErrorBoundary>
</Section>
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`PrivateRouter should match a snapshot 1`] = `
>
<FlexContainerResponsive
flexColumn={true}
isFullHeight={true}
>
<Suspense
fallback={
Expand Down
2 changes: 1 addition & 1 deletion packages/aml-checklist/src/core/private-route-wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const PrivateRouteWrapper: React.FC = ({ children }) => {
<AppNavContainer>
<Menu />
<FlexContainerBasic flexColumn isScrollable>
<FlexContainerResponsive flexColumn>
<FlexContainerResponsive flexColumn isFullHeight>
<Suspense fallback={<Loader body />}>{children}</Suspense>
</FlexContainerResponsive>
</FlexContainerBasic>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[`appointment-time AppointmentTime should match snapshot 1`] = `
type="button"
variant="secondary"
>
WEEK VIEW
WEEK
</Button>
</ButtonGroup>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const AppointmentTime = ({ queryParams, history }: AppointmentTimeProps)
variant={queryParams.time === 'weekView' ? 'primary' : 'secondary'}
onClick={handleChangeTime({ queryParams, history, time: 'weekView' })}
>
WEEK VIEW
WEEK
</Button>
</ButtonGroup>
)
Expand Down
Loading

0 comments on commit dc25649

Please sign in to comment.