Skip to content

Commit

Permalink
Merge pull request #22 from securityscorecard/ajkl2533@implement-full…
Browse files Browse the repository at this point in the history
…screen-modal

feat(FullscreenModal): add component
  • Loading branch information
ajkl2533 authored Dec 18, 2020
2 parents 9ca542d + a671f8c commit 6045a1f
Show file tree
Hide file tree
Showing 36 changed files with 812 additions and 4 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = {
'@storybook/addon-backgrounds',
'@storybook/addon-docs',
'@storybook/addon-controls',
'storycap'
],
typescript: {
check: false,
Expand Down
7 changes: 6 additions & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { withScreenshot } from 'storycap'

import { DSProvider, createIconLibrary } from '../src/theme';
import colors from '../src/theme/colors';
Expand Down Expand Up @@ -37,6 +38,10 @@ export const parameters = {
controls: { expanded: true, hideNoControlsWarning: true },
docs: { source: { type: 'dynamic' } },
actions: { argTypesRegex: '^on.*' },
// storycap settings
screenshot: {
fullPage: true,
},
};

createIconLibrary();
Expand All @@ -47,4 +52,4 @@ const wrapper = (storyFn) => (
</>
);

export const decorators = [wrapper]
export const decorators = [ withScreenshot, wrapper ];
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"@types/react": "^16.9.38",
"@types/styled-components": "^5.1.0",
"csstype": "^3.0.0-beta.4",
"lodash.debounce": "^4.0.8",
"polished": "^3.6.5",
"prop-types": "^15.7.2",
"ramda": "^0.27.0",
Expand Down
85 changes: 85 additions & 0 deletions src/components/FullscreenModal/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import React, { useRef } from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';

import { getColor, pxToRem } from '../../../utils/helpers';
import { FlexContainer } from '../../FlexContainer';
import { ScrollToTopButton } from '../ScrollToTopButton';
import { useStickyFooter } from '../hooks/useStickyFooter';
import { Col, Container, Row } from '../../layout';
import { FooterProps } from './Footer.types';

const BaseStickyFooter = styled.footer`
position: fixed;
bottom: 0;
left: 0;
width: 100%;
padding: ${pxToRem(10, 0)};
background-color: ${getColor('graphite5H')};
border-top: 1px solid ${getColor('graphiteHB')};
`;
const BaseFooter = styled.footer`
border-top: 1px solid ${getColor('graphiteHB')};
padding-top: ${pxToRem(24)};
margin-top: ${pxToRem(40)};
`;

const Footer: React.FC<FooterProps> = ({
children,
width,
offset,
modalRef,
scrollToTopButtonLabel,
}) => {
const modalFooterRef = useRef(null);
const { isFixed, shouldShowScrollToTopButton } = useStickyFooter(
modalRef,
modalFooterRef,
);

const scrollToTop = () => {
modalRef.current.scrollTo(0, 0);
};

return (
<>
{isFixed && (
<BaseStickyFooter as="div">
<Container>
<Row>
<Col cols={width} offset={offset}>
{children}
</Col>
</Row>
</Container>
</BaseStickyFooter>
)}
<BaseFooter ref={modalFooterRef}>
{children}
{shouldShowScrollToTopButton && (
<FlexContainer
alignItems="center"
justifyContent="center"
margin={{ vertical: 1.2 }}
>
<ScrollToTopButton
label={scrollToTopButtonLabel}
onClick={scrollToTop}
/>
</FlexContainer>
)}
</BaseFooter>
</>
);
};

Footer.propTypes = {
width: PropTypes.number.isRequired,
offset: PropTypes.number.isRequired,
modalRef: PropTypes.exact({
current: PropTypes.instanceOf(HTMLElement),
}).isRequired,
scrollToTopButtonLabel: PropTypes.string,
};

export default Footer;
6 changes: 6 additions & 0 deletions src/components/FullscreenModal/Footer/Footer.types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export interface FooterProps {
width: number;
offset: number;
modalRef: React.MutableRefObject<HTMLElement>;
scrollToTopButtonLabel: string;
}
12 changes: 12 additions & 0 deletions src/components/FullscreenModal/FullscreenModal.enums.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export const FullscreenModalSizes = {
lg: 'lg',
md: 'md',
sm: 'sm',
} as const;

export const FullscreenModalLayouts = {
single6: 'single-6',
single8: 'single-8',
sidebar46: 'sidebar-4-6',
sidebar48: 'sidebar-4-8',
} as const;
173 changes: 173 additions & 0 deletions src/components/FullscreenModal/FullscreenModal.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
import React from 'react';
import { Meta, Story } from '@storybook/react/types-6-0';
import { action } from '@storybook/addon-actions';

import { FlexContainer } from '../FlexContainer';
import { Button } from '../Button';
import { ButtonVariants } from '../Button/Button.enums';
import { Link, Paragraph } from '../typography';
import FullscreenModal from './FullscreenModal';
import { FullscreenModalLayouts } from './FullscreenModal.enums';

export default {
title: 'components/FullscreenModal',
component: FullscreenModal,
parameters: {
docs: {
inlineStories: false,
iframeHeight: 500,
source: { type: 'code' },
},
screenshot: {
viewport: {
width: 1280,
height: 720,
},
},
},
} as Meta;

const header = 'Invite vendor to SecurityScorecard';
const Content = () => (
<Paragraph>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam volutpat velit
vel urna molestie, vitae sodales sem hendrerit. Nunc risus nibh, rhoncus ut
massa id, eleifend lacinia orci. Morbi porta, urna ut tincidunt efficitur,
lorem nulla facilisis orci, sit amet rutrum augue elit ut elit. Interdum et
malesuada fames ac ante ipsum primis in faucibus. Suspendisse consectetur
lectus finibus diam posuere, elementum vehicula sapien placerat. In sed
ornare ex, quis lacinia lorem. Nunc rhoncus lorem a laoreet posuere. Nam
cursus lorem vestibulum semper pulvinar. Nunc tempus ornare urna, sit amet
varius nisl fringilla et. Fusce volutpat urna et aliquet dictum. In nec
cursus elit. Vivamus congue ac elit placerat suscipit. Nulla facilisi.
Praesent fringilla, quam sit amet blandit tempor, risus leo bibendum leo, ut
aliquet metus leo non neque. Etiam in ante arcu.
</Paragraph>
);
const LongContent = () => (
<>
<Content />
<Content />
<Content />
<Content />
<Content />
<Content />
</>
);
const Footer = () => (
<FlexContainer justifyContent="space-between">
<Button variant={ButtonVariants.outline}>Email me preview</Button>
<FlexContainer>
<Button margin={{ right: 0.5 }} variant={ButtonVariants.outline}>
Cancel
</Button>
<Button variant={ButtonVariants.solid}>Submit</Button>
</FlexContainer>
</FlexContainer>
);
const Sidebar = () => (
<nav>
<ul>
<li>
<Link href="#">Sidebar link 1</Link>
</li>
<li>
<Link href="#">Sidebar link 2</Link>
</li>
<li>
<Link href="#">Sidebar link 3</Link>
</li>
<li>
<Link href="#">Sidebar link 4</Link>
</li>
</ul>
</nav>
);

export const SingleColumn6: Story = () => (
<FullscreenModal
content={Content()}
footer={Footer()}
header={header}
layout={FullscreenModalLayouts.single6}
onClose={action('close modal')}
/>
);
SingleColumn6.storyName = 'Single Column (layout: single-6)';
SingleColumn6.argTypes = {
header: {
control: { disable: true },
description: 'Content of the header wrapper',
table: { type: { summary: 'React.node' } },
},
content: {
control: { disable: true },
description: 'Content of the content wrapper',
table: { type: { summary: 'React.node' } },
},
footer: {
control: { disable: true },
description: 'Content of the footer wrapper',
table: { type: { summary: 'React.node' } },
},
sidebar: {
control: { disable: true },
description: 'Content of the sidebar wrapper',
table: { type: { summary: 'React.node' } },
},
scrollToTopButtonLabel: {
control: { disable: true },
description: 'Label of the scroll to top button',
table: { defaultValue: { summary: '"Scroll to top"' } },
},
onClose: {
control: { disable: true },
description: 'Modal window close handler',
},
};

export const SingleColumn8: Story = () => (
<FullscreenModal
content={Content()}
footer={Footer()}
header={header}
layout={FullscreenModalLayouts.single8}
onClose={action('close modal')}
/>
);

SingleColumn8.storyName = 'Single Column (layout: single-8)';

export const Sidebar4Column6: Story = () => (
<FullscreenModal
content={Content()}
footer={Footer()}
header={header}
layout={FullscreenModalLayouts.sidebar46}
sidebar={Sidebar()}
onClose={action('close modal')}
/>
);
Sidebar4Column6.storyName = 'Two Columns with sidebar (layout: sidebar-4-6)';

export const Sidebar4Column8: Story = () => (
<FullscreenModal
content={Content()}
footer={Footer()}
header={header}
layout={FullscreenModalLayouts.sidebar48}
sidebar={Sidebar()}
onClose={action('close modal')}
/>
);
Sidebar4Column8.storyName = 'Two Columns with sidebar (layout: sidebar-4-8)';

export const WithLongContent: Story = () => (
<FullscreenModal
content={LongContent()}
footer={Footer()}
header={header}
layout={FullscreenModalLayouts.single6}
onClose={action('close modal')}
/>
);
Loading

0 comments on commit 6045a1f

Please sign in to comment.