Skip to content

fix(alert): propagate className #4535

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.

Sign up for GitHub

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

Merged
wingkwong merged 2 commits into from
Jan 13, 2025
Merged

fix(alert): propagate className #4535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b78c9d
fix(alert): propagate className
wingkwong Jan 11, 2025
e1465bd
chore(alert): remove className from alert theme
wingkwong Jan 12, 2025
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
5 changes: 5 additions & 0 deletions .changeset/hot-owls-sniff.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/alert": patch
---

propagate className (#4533)
9 changes: 6 additions & 3 deletions packages/components/alert/src/use-alert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {ReactNode, useCallback, useMemo} from "react";
import {mergeProps} from "@react-aria/utils";
import {alert} from "@nextui-org/theme";
import {useControlledState} from "@react-stately/utils";
import {dataAttr, isEmpty, objectToDeps} from "@nextui-org/shared-utils";
import {clsx, dataAttr, isEmpty, objectToDeps} from "@nextui-org/shared-utils";

interface Props extends HTMLNextUIProps<"div"> {
/**
Expand Down Expand Up @@ -103,6 +103,7 @@ export function useAlert(originalProps: UseAlertProps) {
closeButtonProps = {
size: "sm",
},
className,
classNames,
...otherProps
} = props;
Expand All @@ -123,6 +124,8 @@ export function useAlert(originalProps: UseAlertProps) {
onClose?.();
}, [setIsVisible, onClose]);

const baseStyles = clsx(classNames?.base, className);

const slots = useMemo(
() => alert({hasContent: !isEmpty(description) || !isEmpty(children), ...variantProps}),
[description, objectToDeps(variantProps)],
Expand All @@ -140,9 +143,9 @@ export function useAlert(originalProps: UseAlertProps) {
}),
filterDOMProps(props),
),
className: slots.base({class: classNames?.base}),
className: slots.base({class: baseStyles}),
};
}, [slots, classNames?.base]);
}, [slots, baseStyles]);

const getMainWrapperProps = useCallback<PropGetter>(() => {
return {
Expand Down