forked from brianlovin/security-checklist
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into progress-indicator
- Loading branch information
Showing
20 changed files
with
459 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,4 +23,4 @@ unclear-type=warn | |
| unsafe-getters-setters=error | ||
|
|
||
| [version] | ||
| 0.91.0 | ||
| 0.92.1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,74 @@ | ||
| // @flow | ||
| // $FlowIssue | ||
| import React, { useState } from 'react'; | ||
| import { AppsContainer, SectionHeading, ExpandContainer } from './style'; | ||
| import React, { useState, useRef } from 'react'; | ||
| import { AppsContainer, SectionHeading, ExpandContainer, ExpandContent } from './style'; | ||
| import { Button } from '../Button'; | ||
| import type { ChecklistResource } from '../../types'; | ||
| import { AppRow } from './App'; | ||
|
|
||
| type Props = { | ||
| resource: ChecklistResource, | ||
| handleAppsExpand: Function, | ||
| }; | ||
|
|
||
| export const Apps = ({ resource }: Props) => { | ||
| export const Apps = ({ resource, handleAppsExpand }: Props) => { | ||
| const [overflowExpanded, setOverflowExpanded] = useState(false); | ||
| const [contentHeight, setcontentHeight] = useState(2000); | ||
|
|
||
| const expandContentContainer = useRef(null); | ||
|
|
||
| function handleExpand() { | ||
| let expandContentHeight = | ||
| expandContentContainer.current | ||
| ? expandContentContainer.current.scrollHeight | ||
| : contentHeight; | ||
|
|
||
| setcontentHeight(expandContentHeight) | ||
| setOverflowExpanded(!overflowExpanded) | ||
|
|
||
| handleAppsExpand(overflowExpanded ? -expandContentHeight : expandContentHeight); | ||
| } | ||
|
|
||
| if (!resource.apps) return null; | ||
|
|
||
| let appList = resource.apps; | ||
| let overflowAppList; | ||
| if (appList.length > 3) { | ||
| if (appList && appList.length > 3) { | ||
| overflowAppList = appList.slice(3, appList.length); | ||
| appList = appList.slice(0, 3); | ||
| } | ||
|
|
||
| return ( | ||
| <AppsContainer overflowExpanded={overflowExpanded}> | ||
| <SectionHeading>Apps</SectionHeading> | ||
| {appList.map(app => ( | ||
| {appList && appList.map(app => ( | ||
| <AppRow key={app.name} app={app} /> | ||
| ))} | ||
|
|
||
| {overflowAppList && !overflowExpanded && ( | ||
| <ExpandContainer onClick={() => setOverflowExpanded(true)}> | ||
| <Button>Show more choices</Button> | ||
| </ExpandContainer> | ||
| {overflowAppList && ( | ||
| <React.Fragment> | ||
| <ExpandContent | ||
| id={`apps_${resource.id}`} | ||
| role="region" | ||
| tabindex="-1" | ||
| ref={expandContentContainer} | ||
| style={{ '--maxHeight': `${contentHeight}px` }} | ||
| aria-hidden={!overflowExpanded} | ||
| > | ||
| {overflowAppList.map(app => <AppRow key={app.name} app={app} />)} | ||
| </ExpandContent> | ||
|
|
||
| <ExpandContainer | ||
| onClick={handleExpand} | ||
| role="button" | ||
| aria-expanded={overflowExpanded} | ||
| aria-controls={`apps_${resource.id}`} | ||
| > | ||
| <Button type="button">Show {overflowExpanded ? "less" : "more"} choices</Button> | ||
| </ExpandContainer> | ||
| </React.Fragment> | ||
| )} | ||
|
|
||
| {overflowAppList && | ||
| overflowExpanded && | ||
| overflowAppList.map(app => <AppRow key={app.name} app={app} />)} | ||
| </AppsContainer> | ||
| ); | ||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.