Skip to content

fix(avatar): title type in Avatar #4529

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 3 commits into from
Jan 13, 2025
Merged

fix(avatar): title type in Avatar #4529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
752682b
fix(avatar): title type in Avatar
wingkwong Jan 10, 2025
a17f27b
fix(alert): apply isEmpty check on title
wingkwong Jan 10, 2025
2930ad2
fix(alert): alert interface props type
wingkwong Jan 10, 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/quick-peas-care.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/alert": patch
---

fix title type in Avatar (#4525)
2 changes: 1 addition & 1 deletion apps/docs/content/docs/components/alert.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Alert has the following slots:
data={[
{
attribute: "title",
type: "string",
type: "ReactNode",
description: "The alert title",
default: "-"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/components/alert/src/alert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const Alert = forwardRef<"div", AlertProps>((props, ref) => {
{customIcon || <IconComponent {...getAlertIconProps()} />}
</div>
<div {...getMainWrapperProps()}>
{title && <div {...getTitleProps()}>{title}</div>}
{!isEmpty(title) && <div {...getTitleProps()}>{title}</div>}
{!isEmpty(description) && <div {...getDescriptionProps()}>{description}</div>}
{children}
</div>
Expand Down
4 changes: 2 additions & 2 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 @@ -9,15 +9,15 @@ import {alert} from "@nextui-org/theme";
import {useControlledState} from "@react-stately/utils";
import {dataAttr, isEmpty, objectToDeps} from "@nextui-org/shared-utils";

interface Props extends HTMLNextUIProps<"div"> {
interface Props extends Omit<HTMLNextUIProps<"div">, "title"> {
/**
* Ref to the DOM node.
*/
ref?: ReactRef<HTMLDivElement | null>;
/**
* title of the alert message
*/
title?: string;
title?: ReactNode;
/**
* description of the alert message
*/
Expand Down