Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta/alert component style improvements #4073

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/sixty-ties-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/alert": patch
"@nextui-org/theme": patch
---

Alert compoentn styles improved
212 changes: 171 additions & 41 deletions apps/docs/content/components/alert/custom-styles.ts
Original file line number Diff line number Diff line change
@@ -1,60 +1,190 @@
const App = `import {Alert, Button} from "@nextui-org/react";
const AppTs = `import {Alert, Button} from "@nextui-org/react";

const CustomAlert = React.forwardRef<HTMLDivElement, AlertProps>(
(
{title, children, variant = "faded", color = "secondary", className, classNames, ...props},
ref,
) => {
const colorClass = React.useMemo(() => {
switch (color) {
case "default":
return "before:bg-default-300";
case "primary":
return "before:bg-primary";
case "secondary":
return "before:bg-secondary";
case "success":
return "before:bg-success";
case "warning":
return "before:bg-warning";
case "danger":
return "before:bg-danger";
default:
return "before:bg-default-200";
}
}, []);

return (
<Alert
ref={ref}
classNames={{
...classNames,
base: cn(
[
"bg-default-50 dark:bg-background shadow-sm",
"border-1 border-default-200 dark:border-default-100",
"relative before:content-[''] before:absolute before:z-10",
"before:left-0 before:top-[-1px] before:bottom-[-1px] before:w-1",
"rounded-l-none border-l-0",
colorClass,
],
classNames?.base,
className,
),
mainWrapper: cn("pt-1", classNames?.mainWrapper),
iconWrapper: cn("dark:bg-transparent", classNames?.iconWrapper),
}}
color={color}
title={title}
variant={variant}
{...props}
>
{children}
</Alert>
);
},
);

CustomAlert.displayName = "CustomAlert";

export default function App() {
const [isVisible, setIsVisible] = React.useState(true);
const colors = ["default", "primary", "secondary", "success", "warning", "danger"];

return (
<div className="flex items-center justify-center w-full">
{!isVisible && (
<Button
className="bg-background text-default-700 font-medium border-1 shadow-small"
size="sm"
variant="bordered"
onPress={() => setIsVisible(true)}
<div className="flex flex-col w-full gap-y-6">
{colors.map((color) => (
<CustomAlert
key={color}
color={color}
title="The documents you requested are ready to be viewed"
>
Show Alert
</Button>
)}
<div className="flex items-center gap-1 mt-3">
<Button
className="bg-background text-default-700 font-medium border-1 shadow-small"
size="sm"
variant="bordered"
>
View documents
</Button>
<Button
className="text-default-500 font-medium underline underline-offset-4"
size="sm"
variant="light"
>
Maybe later
</Button>
</div>
</CustomAlert>
))}
</div>
);
}`;

const App = `import {Alert, Button} from "@nextui-org/react";

const CustomAlert = React.forwardRef(
(
{title, children, variant = "faded", color = "secondary", className, classNames = {}, ...props},
ref,
) => {
const colorClass = React.useMemo(() => {
switch (color) {
case "default":
return "before:bg-default-300";
case "primary":
return "before:bg-primary";
case "secondary":
return "before:bg-secondary";
case "success":
return "before:bg-success";
case "warning":
return "before:bg-warning";
case "danger":
return "before:bg-danger";
default:
return "before:bg-default-200";
}
}, []);

return (
<Alert
ref={ref}
classNames={{
base: [
"bg-default-50 dark:bg-background",
"relative before:content-[''] before:absolute before:z-10",
"before:left-0 before:top-[-1px] before:bottom-[-1px] before:w-1 before:bg-secondary",
"rounded-l-none border-l-0",
],
mainWrapper: "pt-1",
iconWrapper: "border-1 border-secondary-200 dark:bg-transparent",
alertIcon: "text-secondary",
...classNames,
base: cn(
[
"bg-default-50 dark:bg-background shadow-sm",
"border-1 border-default-200 dark:border-default-100",
"relative before:content-[''] before:absolute before:z-10",
"before:left-0 before:top-[-1px] before:bottom-[-1px] before:w-1",
"rounded-l-none border-l-0",
colorClass,
],
classNames.base,
className,
),
mainWrapper: cn("pt-1", classNames.mainWrapper),
iconWrapper: cn("dark:bg-transparent", classNames.iconWrapper),
}}
isVisible={isVisible}
title="The documents you requested are ready to be viewed"
variant="faded"
onClose={() => setIsVisible(false)}
color={color}
title={title}
variant={variant}
{...props}
>
<div className="flex items-center gap-1 mt-3">
<Button
className="bg-background text-default-700 font-medium border-1 shadow-small"
size="sm"
variant="bordered"
>
View documents
</Button>
<Button
className="text-default-500 font-medium underline underline-offset-4"
size="sm"
variant="light"
>
Maybe later
</Button>
</div>
{children}
</Alert>
);
},
);

CustomAlert.displayName = "CustomAlert";

export default function App() {
const colors = ["default", "primary", "secondary", "success", "warning", "danger"];

return (
<div className="flex flex-col w-full gap-y-6">
{colors.map((color) => (
<CustomAlert
key={color}
color={color}
title="The documents you requested are ready to be viewed"
>
<div className="flex items-center gap-1 mt-3">
<Button
className="bg-background text-default-700 font-medium border-1 shadow-small"
size="sm"
variant="bordered"
>
View documents
</Button>
<Button
className="text-default-500 font-medium underline underline-offset-4"
size="sm"
variant="light"
>
Maybe later
</Button>
</div>
</CustomAlert>
))}
</div>
);
}`;

const react = {
"/App.jsx": App,
"/App.tsx": AppTs,
};

export default {
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/content/components/alert/variants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default function App() {
return (
<div className="flex flex-col gap-4 w-full">
{["solid", "bordered", "flat", "faded"].map((variant) => (
<Alert key={variant} variant={variant} color="danger" title={\`This is a \${variant} variant alert\`}/>
<Alert key={variant} variant={variant} color="secondary" title={\`This is a \${variant} variant alert\`}/>
))}
</div>
);
Expand Down
4 changes: 1 addition & 3 deletions packages/components/alert/src/alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ const iconMap = {

export type AlertColor = keyof typeof iconMap;

export interface AlertProps extends Omit<UseAlertProps, "hasDescription"> {
color: AlertColor;
}
export interface AlertProps extends Omit<UseAlertProps, "hasDescription"> {}

const Alert = forwardRef<"div", AlertProps>((props, ref) => {
const {
Expand Down
Loading