-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(Alert): Add new Alert and AlertTitle components
- Loading branch information
Showing
10 changed files
with
290 additions
and
1 deletion.
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
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 |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| ```jsx | ||
| import Alert from 'cozy-ui/transpiled/react/Alert' | ||
| import AlertTitle from 'cozy-ui/transpiled/react/AlertTitle' | ||
| import Button from 'cozy-ui/transpiled/react/Buttons' | ||
| import Icon from 'cozy-ui/transpiled/react/Icon' | ||
| import Variants from 'cozy-ui/docs/components/Variants' | ||
| import DeviceLaptopIcon from 'cozy-ui/transpiled/react/Icons/DeviceLaptop' | ||
| import DownloadIcon from 'cozy-ui/transpiled/react/Icons/Download' | ||
|
|
||
| const initialVariants = [{ | ||
| longText: false, | ||
| title: false, | ||
| block: false, | ||
| color: false, | ||
| icon: false, | ||
| square: false, | ||
| actionOne: false, | ||
| actionTwo: false, | ||
| close: false | ||
| }] | ||
|
|
||
| ; | ||
|
|
||
| <Variants initialVariants={initialVariants} screenshotAllVariants> | ||
| {variant => ( | ||
| <Alert | ||
| color={variant.color && "#EFA82D"} | ||
| block={variant.block} | ||
| square={variant.square} | ||
| icon={variant.icon && <Icon icon={DeviceLaptopIcon} color="var(--errorColor)" size={32} />} | ||
| action={(variant.actionOne || variant.actionTwo) ? | ||
| <> | ||
| {variant.actionOne && | ||
| <Button variant="text" size="small" label="Download" startIcon={<Icon icon={DownloadIcon} />} /> | ||
| } | ||
| {variant.actionTwo && | ||
| <Button variant="text" size="small" label="No, thanks!" /> | ||
| } | ||
| </> | ||
| : undefined | ||
| } | ||
| onClose={variant.close ? () => {} : undefined} | ||
| > | ||
| {variant.title && <AlertTitle>This is the title</AlertTitle>} | ||
| {variant.longText | ||
| ? content.ada.short | ||
| : "Get Cozy Drive for Desktop and synchronise your files safely to make them accessible at all times." | ||
| } | ||
| </Alert> | ||
| )} | ||
| </Variants> | ||
| ``` | ||
|
|
||
| ### Colors | ||
|
|
||
| ```jsx | ||
| import Alert from 'cozy-ui/transpiled/react/Alert' | ||
| import AlertTitle from 'cozy-ui/transpiled/react/AlertTitle' | ||
| import Button from 'cozy-ui/transpiled/react/Buttons' | ||
| import Variants from 'cozy-ui/docs/components/Variants' | ||
|
|
||
| const colors = ['primary', 'secondary','success', 'error', 'warning', 'info'] | ||
| const initialVariants = [{ title: true, block: false }] | ||
|
|
||
| const makeButtonColor = color => ['primary', 'secondary'].includes(color) ? undefined : color | ||
|
|
||
| ; | ||
|
|
||
| <Variants initialVariants={initialVariants} screenshotAllVariants> | ||
| {variant => ( | ||
| <> | ||
| {colors.map(color => | ||
| <div className="u-mb-1" key={color}> | ||
| <Alert | ||
| severity={color} | ||
| block={variant.block} | ||
| action={ | ||
| <Button variant="text" size="small" color={makeButtonColor(color)} label="ACTION" /> | ||
| } | ||
| > | ||
| {variant.title && <AlertTitle>{color.toUpperCase()}</AlertTitle>} | ||
| This is a {color} alert | ||
| </Alert> | ||
| </div> | ||
| )} | ||
| </> | ||
| )} | ||
| </Variants> | ||
| ``` |
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 |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| import React, { forwardRef } from 'react' | ||
| import PropTypes from 'prop-types' | ||
| import cx from 'classnames' | ||
| import MuiAlert from '@material-ui/lab/Alert' | ||
| import { makeStyles } from '@material-ui/core/styles' | ||
|
|
||
| import Icon from '../Icon' | ||
| import CheckCircleIcon from '../Icons/CheckCircle' | ||
| import WarningIcon from '../Icons/Warning' | ||
| import WarningCircleIcon from '../Icons/WarningCircle' | ||
| import InfoIcon from '../Icons/Info' | ||
|
|
||
| const DEFAULT_ICON_SIZE = 16 | ||
|
|
||
| const defaultIconMapping = { | ||
| success: <Icon icon={CheckCircleIcon} />, | ||
| warning: <Icon icon={WarningIcon} />, | ||
| error: <Icon icon={WarningCircleIcon} />, | ||
| info: <Icon icon={InfoIcon} /> | ||
| } | ||
|
|
||
| const useStyles = makeStyles({ | ||
| message: { | ||
| maxWidth: ({ block, iconSize }) => | ||
| block && `calc(100% - ${iconSize + 16}px)` | ||
| } | ||
| }) | ||
|
|
||
| const Alert = forwardRef( | ||
| ( | ||
| { | ||
| className, | ||
| icon, | ||
| severity, | ||
| block, | ||
| color, | ||
| square, | ||
| action, | ||
| children, | ||
| ...props | ||
| }, | ||
| ref | ||
| ) => { | ||
| const madeSeverity = ['primary', 'secondary'].includes(severity) | ||
| ? 'success' | ||
| : severity | ||
|
|
||
| const madeIcon = | ||
| icon || | ||
| (['primary', 'secondary'].includes(severity) && ( | ||
| <Icon icon={InfoIcon} /> | ||
| )) || | ||
| undefined | ||
|
|
||
| const iconSize = icon?.props?.size || DEFAULT_ICON_SIZE | ||
| const styles = useStyles({ iconSize, block }) | ||
|
|
||
| return ( | ||
| <MuiAlert | ||
| ref={ref} | ||
| style={{ backgroundColor: color, borderRadius: square && 0 }} | ||
| className={cx( | ||
| className, | ||
| `cozyAlert-${severity}`, | ||
| { block }, | ||
| { action: Boolean(action) } | ||
| )} | ||
| classes={styles} | ||
| severity={madeSeverity} | ||
| iconMapping={defaultIconMapping} | ||
| icon={madeIcon} | ||
| action={action} | ||
| {...props} | ||
| > | ||
| {children} | ||
| </MuiAlert> | ||
| ) | ||
| } | ||
| ) | ||
|
|
||
| Alert.propTypes = { | ||
| className: PropTypes.string, | ||
| icon: PropTypes.element, | ||
| severity: PropTypes.oneOf([ | ||
| 'primary', | ||
| 'secondary', | ||
| 'success', | ||
| 'error', | ||
| 'warning', | ||
| 'info' | ||
| ]), | ||
| block: PropTypes.bool, | ||
| color: PropTypes.string, | ||
| square: PropTypes.bool | ||
| } | ||
|
|
||
| Alert.defaultProps = { | ||
| severity: 'primary', | ||
| block: false, | ||
| square: false | ||
| } | ||
|
|
||
| export default Alert |
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Re-export of @material-ui. See [the official API](https://v4.mui.com/api/alert-title/). |
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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import MuiAlertTitle from '@material-ui/lab/AlertTitle' | ||
|
|
||
| export default MuiAlertTitle |
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 |
|---|---|---|
|
|
@@ -1855,6 +1855,17 @@ | |
| react-is "^16.8.0 || ^17.0.0" | ||
| react-transition-group "^4.4.0" | ||
|
|
||
| "@material-ui/[email protected]": | ||
| version "4.0.0-alpha.61" | ||
| resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz#9bf8eb389c0c26c15e40933cc114d4ad85e3d978" | ||
| integrity sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg== | ||
| dependencies: | ||
| "@babel/runtime" "^7.4.4" | ||
| "@material-ui/utils" "^4.11.3" | ||
| clsx "^1.0.4" | ||
| prop-types "^15.7.2" | ||
| react-is "^16.8.0 || ^17.0.0" | ||
|
|
||
| "@material-ui/styles@^4.11.4": | ||
| version "4.11.4" | ||
| resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d" | ||
|
|
@@ -1901,6 +1912,15 @@ | |
| prop-types "^15.7.2" | ||
| react-is "^16.8.0 || ^17.0.0" | ||
|
|
||
| "@material-ui/utils@^4.11.3": | ||
| version "4.11.3" | ||
| resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942" | ||
| integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg== | ||
| dependencies: | ||
| "@babel/runtime" "^7.4.4" | ||
| prop-types "^15.7.2" | ||
| react-is "^16.8.0 || ^17.0.0" | ||
|
|
||
| "@mrmlnc/readdir-enhanced@^2.2.1": | ||
| version "2.2.1" | ||
| resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" | ||
|
|
||