diff --git a/package.json b/package.json index 03be8123..0c1b3d20 100644 --- a/package.json +++ b/package.json @@ -71,11 +71,11 @@ "size-limit": [ { "path": "dist/macaw-ui.cjs.production.min.js", - "limit": "45 KB" + "limit": "50 KB" }, { "path": "dist/macaw-ui.esm.js", - "limit": "25 KB" + "limit": "35 KB" } ], "devDependencies": { diff --git a/src/Alert/Alert.tsx b/src/Alert/Alert.tsx index 2f388420..b3bdc98d 100644 --- a/src/Alert/Alert.tsx +++ b/src/Alert/Alert.tsx @@ -4,7 +4,7 @@ import CloseIcon from "@material-ui/icons/Close"; import clsx from "clsx"; import React from "react"; -import { Error, Info, Success, Warning } from "../icons"; +import { CompleteIcon, InfoIcon, NotAllowedIcon, WarningIcon } from "../icons"; import { AlertBase, AlertBaseProps, AlertVariant } from "./AlertBase"; import useStyles from "./styles"; @@ -15,13 +15,13 @@ export interface AlertProps extends AlertBaseProps { const Icon: React.FC<{ variant: AlertVariant }> = ({ variant }) => { switch (variant) { case "error": - return ; + return ; case "warning": - return ; + return ; case "success": - return ; + return ; default: - return ; + return ; } }; diff --git a/src/Alert/styles.ts b/src/Alert/styles.ts index 7605c2b4..b0e1482f 100644 --- a/src/Alert/styles.ts +++ b/src/Alert/styles.ts @@ -22,7 +22,6 @@ const useStyles = makeStyles( content: { padding: theme.spacing(0, 1), }, - icon: {}, root: {}, titleBar: { marginTop: 6, diff --git a/src/Notification/Notification.tsx b/src/Notification/Notification.tsx index 712d49c6..e98d9dab 100644 --- a/src/Notification/Notification.tsx +++ b/src/Notification/Notification.tsx @@ -6,20 +6,20 @@ import CloseIcon from "@material-ui/icons/Close"; import clsx from "clsx"; import React from "react"; -import { Error, Info, Success, Warning } from "../icons"; +import { CompleteIcon, InfoIcon, NotAllowedIcon, WarningIcon } from "../icons"; import useStyles from "./styles"; import type { NotificationProps, NotificationType } from "./types"; const Icon: React.FC<{ type: NotificationType }> = ({ type }) => { switch (type) { case "error": - return ; + return ; case "warning": - return ; + return ; case "success": - return ; + return ; default: - return ; + return ; } }; diff --git a/src/Notification/styles.ts b/src/Notification/styles.ts index c3dd2038..e59e827e 100644 --- a/src/Notification/styles.ts +++ b/src/Notification/styles.ts @@ -67,7 +67,6 @@ const useStyles = makeStyles( marginTop: 6, marginBottom: theme.spacing(0.5), }, - icon: {}, }), { name: "Notification" } ); diff --git a/src/icons/CheckboxChecked.tsx b/src/icons/CheckboxCheckedIcon.tsx similarity index 84% rename from src/icons/CheckboxChecked.tsx rename to src/icons/CheckboxCheckedIcon.tsx index 2ef557cf..fbedb2af 100644 --- a/src/icons/CheckboxChecked.tsx +++ b/src/icons/CheckboxCheckedIcon.tsx @@ -1,7 +1,7 @@ import { createSvgIcon } from "@material-ui/core/utils"; import React from "react"; -export const CheckboxChecked = createSvgIcon( +export const CheckboxCheckedIcon = createSvgIcon( <> , - "CheckboxChecked" + "CheckboxCheckedIcon" ); diff --git a/src/icons/Checkbox.tsx b/src/icons/CheckboxIcon.tsx similarity index 73% rename from src/icons/Checkbox.tsx rename to src/icons/CheckboxIcon.tsx index 8091515c..07f5384f 100644 --- a/src/icons/Checkbox.tsx +++ b/src/icons/CheckboxIcon.tsx @@ -1,7 +1,7 @@ import { createSvgIcon } from "@material-ui/core/utils"; import React from "react"; -export const Checkbox = createSvgIcon( +export const CheckboxIcon = createSvgIcon( , - "Checkbox" + "CheckboxIcon" ); diff --git a/src/icons/CheckboxIndeterminate.tsx b/src/icons/CheckboxIndeterminateIcon.tsx similarity index 77% rename from src/icons/CheckboxIndeterminate.tsx rename to src/icons/CheckboxIndeterminateIcon.tsx index 17a1bbda..d038b4a8 100644 --- a/src/icons/CheckboxIndeterminate.tsx +++ b/src/icons/CheckboxIndeterminateIcon.tsx @@ -1,7 +1,7 @@ import { createSvgIcon } from "@material-ui/core/utils"; import React from "react"; -export const CheckboxIndeterminate = createSvgIcon( +export const CheckboxIndeterminateIcon = createSvgIcon( <> , - "CheckboxIndeterminate" + "CheckboxIndeterminateIcon" ); diff --git a/src/icons/Success.tsx b/src/icons/CompleteIcon.tsx similarity index 84% rename from src/icons/Success.tsx rename to src/icons/CompleteIcon.tsx index 00c81b83..96d687cd 100644 --- a/src/icons/Success.tsx +++ b/src/icons/CompleteIcon.tsx @@ -1,6 +1,8 @@ import React from "react"; -export const Success: React.FC> = (props) => ( +export const CompleteIcon: React.FC> = ( + props +) => ( > = (props) => ( ); -Success.displayName = "Success"; +CompleteIcon.displayName = "CompleteIcon"; diff --git a/src/icons/Delete.tsx b/src/icons/DeleteIcon.tsx similarity index 93% rename from src/icons/Delete.tsx rename to src/icons/DeleteIcon.tsx index 28dff602..6e0a74ab 100644 --- a/src/icons/Delete.tsx +++ b/src/icons/DeleteIcon.tsx @@ -1,7 +1,7 @@ import { createSvgIcon } from "@material-ui/core/utils"; import React from "react"; -export const Delete = createSvgIcon( +export const DeleteIcon = createSvgIcon( , - "Delete" + "DeleteIcon" ); diff --git a/src/icons/Edit.tsx b/src/icons/EditIcon.tsx similarity index 96% rename from src/icons/Edit.tsx rename to src/icons/EditIcon.tsx index a1108672..21994b2a 100644 --- a/src/icons/Edit.tsx +++ b/src/icons/EditIcon.tsx @@ -1,12 +1,12 @@ import { createSvgIcon } from "@material-ui/core/utils"; import React from "react"; -export const Edit = createSvgIcon( +export const EditIcon = createSvgIcon( , - "Edit" + "EditIcon" ); diff --git a/src/icons/Filtering.tsx b/src/icons/FilteringIcon.tsx similarity index 93% rename from src/icons/Filtering.tsx rename to src/icons/FilteringIcon.tsx index f340ab22..dc74b836 100644 --- a/src/icons/Filtering.tsx +++ b/src/icons/FilteringIcon.tsx @@ -1,12 +1,12 @@ import { createSvgIcon } from "@material-ui/core/utils"; import React from "react"; -export const Filtering = createSvgIcon( +export const FilteringIcon = createSvgIcon( , - "Filtering" + "FilteringIcon" ); diff --git a/src/icons/Info.tsx b/src/icons/InfoIcon.tsx similarity index 86% rename from src/icons/Info.tsx rename to src/icons/InfoIcon.tsx index 87414fd1..bdb2674d 100644 --- a/src/icons/Info.tsx +++ b/src/icons/InfoIcon.tsx @@ -1,6 +1,6 @@ import React from "react"; -export const Info: React.FC> = (props) => ( +export const InfoIcon: React.FC> = (props) => ( > = (props) => ( ); -Info.displayName = "Info"; +InfoIcon.displayName = "InfoIcon"; diff --git a/src/icons/Error.tsx b/src/icons/NotAllowedIcon.tsx similarity index 84% rename from src/icons/Error.tsx rename to src/icons/NotAllowedIcon.tsx index 5864a90d..da4c1aed 100644 --- a/src/icons/Error.tsx +++ b/src/icons/NotAllowedIcon.tsx @@ -1,6 +1,8 @@ import React from "react"; -export const Error: React.FC> = (props) => ( +export const NotAllowedIcon: React.FC> = ( + props +) => ( > = (props) => ( ); -Error.displayName = "Error"; +NotAllowedIcon.displayName = "NotAllowedIcon"; diff --git a/src/icons/NotAllowedInvertedIcon.tsx b/src/icons/NotAllowedInvertedIcon.tsx new file mode 100644 index 00000000..7ce9e17f --- /dev/null +++ b/src/icons/NotAllowedInvertedIcon.tsx @@ -0,0 +1,25 @@ +import React from "react"; + +export const NotAllowedInvertedIcon: React.FC> = ( + props +) => ( + + + + + +); + +NotAllowedInvertedIcon.displayName = "NotAllowedInvertedIcon"; diff --git a/src/icons/Warning.tsx b/src/icons/WarningIcon.tsx similarity index 85% rename from src/icons/Warning.tsx rename to src/icons/WarningIcon.tsx index 30ade836..9666e6dd 100644 --- a/src/icons/Warning.tsx +++ b/src/icons/WarningIcon.tsx @@ -1,6 +1,6 @@ import React from "react"; -export const Warning: React.FC> = (props) => ( +export const WarningIcon: React.FC> = (props) => ( > = (props) => ( ); -Warning.displayName = "Warning"; +WarningIcon.displayName = "WarningIcon"; diff --git a/src/icons/index.ts b/src/icons/index.ts index be153b03..95d687f3 100644 --- a/src/icons/index.ts +++ b/src/icons/index.ts @@ -1,11 +1,12 @@ -export * from "./Checkbox"; -export * from "./CheckboxChecked"; -export * from "./CheckboxIndeterminate"; -export * from "./Error"; -export * from "./Info"; +export * from "./CheckboxIcon"; +export * from "./CheckboxCheckedIcon"; +export * from "./CheckboxIndeterminateIcon"; +export * from "./InfoIcon"; export * from "./Logo"; -export * from "./Success"; -export * from "./Warning"; -export * from "./Edit"; -export * from "./Filtering"; -export * from "./Delete"; +export * from "./WarningIcon"; +export * from "./EditIcon"; +export * from "./FilteringIcon"; +export * from "./DeleteIcon"; +export * from "./CompleteIcon"; +export * from "./NotAllowedIcon"; +export * from "./NotAllowedInvertedIcon"; diff --git a/src/index.tsx b/src/index.tsx index bf3d69ec..87fc5060 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,5 +1,6 @@ export * from "./theme"; export * from "./extensions"; +export * from "./icons"; export * from "./Savebar"; export * from "./Backlink"; export * from "./ConfirmButton";