Skip to content

Commit 9921b65

Browse files
committed
remove redundant Flowbite prefix from types #2
1 parent 7a88193 commit 9921b65

32 files changed

+95
-95
lines changed

packages/ui/src/components/Accordion/Accordion.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import { twMerge } from "../../helpers/tailwind-merge";
99
import { useThemeProvider } from "../../theme/provider";
1010
import type { DeepPartial, ResetTheme } from "../../types";
1111
import type { FlowbiteBoolean } from "../Flowbite/FlowbiteTheme";
12-
import type { FlowbiteAccordionComponentTheme } from "./AccordionContent";
12+
import type { AccordionComponentTheme } from "./AccordionContent";
1313
import { AccordionContent } from "./AccordionContent";
1414
import type { AccordionPanelProps } from "./AccordionPanel";
1515
import { AccordionPanel } from "./AccordionPanel";
16-
import type { FlowbiteAccordionTitleTheme } from "./AccordionTitle";
16+
import type { AccordionTitleTheme } from "./AccordionTitle";
1717
import { AccordionTitle } from "./AccordionTitle";
1818
import { accordionTheme } from "./theme";
1919

2020
export interface AccordionTheme {
2121
root: AccordionRootTheme;
22-
content: FlowbiteAccordionComponentTheme;
23-
title: FlowbiteAccordionTitleTheme;
22+
content: AccordionComponentTheme;
23+
title: AccordionTitleTheme;
2424
}
2525

2626
export interface AccordionRootTheme {

packages/ui/src/components/Accordion/AccordionContent.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import type { DeepPartial, ResetTheme } from "../../types";
88
import { useAccordionContext } from "./AccordionPanelContext";
99
import { accordionTheme } from "./theme";
1010

11-
export interface FlowbiteAccordionComponentTheme {
11+
export interface AccordionComponentTheme {
1212
base: string;
1313
}
1414

1515
export interface AccordionContentProps extends ComponentProps<"div"> {
16-
theme?: DeepPartial<FlowbiteAccordionComponentTheme>;
17-
resetTheme?: ResetTheme<FlowbiteAccordionComponentTheme>;
16+
theme?: DeepPartial<AccordionComponentTheme>;
17+
resetTheme?: ResetTheme<AccordionComponentTheme>;
1818
}
1919

2020
export const AccordionContent: FC<AccordionContentProps> = ({

packages/ui/src/components/Accordion/AccordionTitle.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type { FlowbiteBoolean, FlowbiteHeadingLevel } from "../Flowbite/Flowbite
99
import { useAccordionContext } from "./AccordionPanelContext";
1010
import { accordionTheme } from "./theme";
1111

12-
export interface FlowbiteAccordionTitleTheme {
12+
export interface AccordionTitleTheme {
1313
arrow: {
1414
base: string;
1515
open: FlowbiteBoolean;
@@ -23,8 +23,8 @@ export interface FlowbiteAccordionTitleTheme {
2323
export interface AccordionTitleProps extends ComponentProps<"button"> {
2424
arrowIcon?: FC<ComponentProps<"svg">>;
2525
as?: FlowbiteHeadingLevel;
26-
theme?: DeepPartial<FlowbiteAccordionTitleTheme>;
27-
resetTheme?: ResetTheme<FlowbiteAccordionTitleTheme>;
26+
theme?: DeepPartial<AccordionTitleTheme>;
27+
resetTheme?: ResetTheme<AccordionTitleTheme>;
2828
}
2929

3030
export const AccordionTitle: FC<AccordionTitleProps> = ({
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export { Accordion } from "./Accordion";
22
export type { AccordionProps, AccordionRootTheme, AccordionTheme } from "./Accordion";
33
export { AccordionContent } from "./AccordionContent";
4-
export type { AccordionContentProps, FlowbiteAccordionComponentTheme } from "./AccordionContent";
4+
export type { AccordionContentProps, AccordionComponentTheme } from "./AccordionContent";
55
export { AccordionPanel } from "./AccordionPanel";
66
export type { AccordionPanelProps } from "./AccordionPanel";
77
export { AccordionTitle } from "./AccordionTitle";
8-
export type { AccordionTitleProps, FlowbiteAccordionTitleTheme } from "./AccordionTitle";
8+
export type { AccordionTitleProps, AccordionTitleTheme } from "./AccordionTitle";

packages/ui/src/components/Avatar/Avatar.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import { twMerge } from "../../helpers/tailwind-merge";
66
import { useThemeProvider } from "../../theme/provider";
77
import type { DeepPartial, DynamicStringEnumKeysOf, ResetTheme } from "../../types";
88
import type { FlowbiteBoolean, FlowbiteColors, FlowbitePositions, FlowbiteSizes } from "../Flowbite/FlowbiteTheme";
9-
import type { FlowbiteAvatarGroupTheme } from "./AvatarGroup";
9+
import type { AvatarGroupTheme } from "./AvatarGroup";
1010
import { AvatarGroup } from "./AvatarGroup";
11-
import type { FlowbiteAvatarGroupCounterTheme } from "./AvatarGroupCounter";
11+
import type { AvatarGroupCounterTheme } from "./AvatarGroupCounter";
1212
import { AvatarGroupCounter } from "./AvatarGroupCounter";
1313
import { avatarTheme } from "./theme";
1414

1515
export interface AvatarTheme {
1616
root: AvatarRootTheme;
17-
group: FlowbiteAvatarGroupTheme;
18-
groupCounter: FlowbiteAvatarGroupCounterTheme;
17+
group: AvatarGroupTheme;
18+
groupCounter: AvatarGroupCounterTheme;
1919
}
2020

2121
export interface AvatarRootTheme {

packages/ui/src/components/Avatar/AvatarGroup.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { useThemeProvider } from "../../theme/provider";
77
import type { DeepPartial, ResetTheme } from "../../types";
88
import { avatarTheme } from "./theme";
99

10-
export interface FlowbiteAvatarGroupTheme {
10+
export interface AvatarGroupTheme {
1111
base: string;
1212
}
1313

1414
export interface AvatarGroupProps extends ComponentProps<"div"> {
15-
theme?: DeepPartial<FlowbiteAvatarGroupTheme>;
16-
resetTheme?: ResetTheme<FlowbiteAvatarGroupTheme>;
15+
theme?: DeepPartial<AvatarGroupTheme>;
16+
resetTheme?: ResetTheme<AvatarGroupTheme>;
1717
}
1818

1919
export const AvatarGroup: React.FC<AvatarGroupProps> = ({

packages/ui/src/components/Avatar/AvatarGroupCounter.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import { useThemeProvider } from "../../theme/provider";
77
import type { DeepPartial, ResetTheme } from "../../types";
88
import { avatarTheme } from "./theme";
99

10-
export interface FlowbiteAvatarGroupCounterTheme {
10+
export interface AvatarGroupCounterTheme {
1111
base: string;
1212
}
1313

1414
export interface AvatarGroupCounterProps extends ComponentProps<"a"> {
1515
total?: number;
16-
theme?: DeepPartial<FlowbiteAvatarGroupCounterTheme>;
17-
resetTheme?: ResetTheme<FlowbiteAvatarGroupCounterTheme>;
16+
theme?: DeepPartial<AvatarGroupCounterTheme>;
17+
resetTheme?: ResetTheme<AvatarGroupCounterTheme>;
1818
}
1919

2020
export const AvatarGroupCounter: FC<AvatarGroupCounterProps> = ({

packages/ui/src/components/Avatar/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ export type {
1111
AvatarTheme,
1212
} from "./Avatar";
1313
export { AvatarGroup } from "./AvatarGroup";
14-
export type { AvatarGroupProps, FlowbiteAvatarGroupTheme } from "./AvatarGroup";
14+
export type { AvatarGroupProps, AvatarGroupTheme } from "./AvatarGroup";
1515
export { AvatarGroupCounter } from "./AvatarGroupCounter";
16-
export type { AvatarGroupCounterProps, FlowbiteAvatarGroupCounterTheme } from "./AvatarGroupCounter";
16+
export type { AvatarGroupCounterProps, AvatarGroupCounterTheme } from "./AvatarGroupCounter";

packages/ui/src/components/Drawer/Drawer.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import { useThemeProvider } from "../../theme/provider";
88
import type { DeepPartial, ResetTheme } from "../../types";
99
import type { FlowbiteBoolean } from "../Flowbite/FlowbiteTheme";
1010
import { DrawerContext } from "./DrawerContext";
11-
import { DrawerHeader, type FlowbiteDrawerHeaderTheme } from "./DrawerHeader";
12-
import { DrawerItems, type FlowbiteDrawerItemsTheme } from "./DrawerItems";
11+
import { DrawerHeader, type DrawerHeaderTheme } from "./DrawerHeader";
12+
import { DrawerItems, type DrawerItemsTheme } from "./DrawerItems";
1313
import { drawerTheme } from "./theme";
1414

1515
export interface DrawerTheme {
1616
root: DrawerRootTheme;
17-
header: FlowbiteDrawerHeaderTheme;
18-
items: FlowbiteDrawerItemsTheme;
17+
header: DrawerHeaderTheme;
18+
items: DrawerItemsTheme;
1919
}
2020

2121
export interface DrawerRootTheme {

packages/ui/src/components/Drawer/DrawerHeader.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { FlowbiteBoolean } from "../Flowbite/FlowbiteTheme";
1111
import { useDrawerContext } from "./DrawerContext";
1212
import { drawerTheme } from "./theme";
1313

14-
export interface FlowbiteDrawerHeaderTheme {
14+
export interface DrawerHeaderTheme {
1515
inner: {
1616
titleIcon: string;
1717
titleText: string;
@@ -23,8 +23,8 @@ export interface FlowbiteDrawerHeaderTheme {
2323

2424
export interface DrawerHeaderProps extends ComponentProps<"div">, Record<string, unknown> {
2525
closeIcon?: FC<ComponentProps<"svg">>;
26-
theme?: DeepPartial<FlowbiteDrawerHeaderTheme>;
27-
resetTheme?: ResetTheme<FlowbiteDrawerHeaderTheme>;
26+
theme?: DeepPartial<DrawerHeaderTheme>;
27+
resetTheme?: ResetTheme<DrawerHeaderTheme>;
2828
title?: string;
2929
titleIcon?: FC<ComponentProps<"svg">>;
3030
}

packages/ui/src/components/Drawer/DrawerItems.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import type { DeepPartial, ResetTheme } from "../../types";
99
import { useDrawerContext } from "./DrawerContext";
1010
import { drawerTheme } from "./theme";
1111

12-
export interface FlowbiteDrawerItemsTheme {
12+
export interface DrawerItemsTheme {
1313
base: string;
1414
}
1515

1616
export interface DrawerItemsProps extends ComponentProps<"div"> {
17-
theme?: DeepPartial<FlowbiteDrawerItemsTheme>;
18-
resetTheme?: ResetTheme<FlowbiteDrawerItemsTheme>;
17+
theme?: DeepPartial<DrawerItemsTheme>;
18+
resetTheme?: ResetTheme<DrawerItemsTheme>;
1919
}
2020

2121
export const DrawerItems: FC<DrawerItemsProps> = ({

packages/ui/src/components/Drawer/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export { Drawer } from "./Drawer";
22
export type { DrawerProps, DrawerRootTheme, DrawerTheme } from "./Drawer";
33

44
export { DrawerHeader } from "./DrawerHeader";
5-
export type { DrawerHeaderProps, FlowbiteDrawerHeaderTheme } from "./DrawerHeader";
5+
export type { DrawerHeaderProps, DrawerHeaderTheme } from "./DrawerHeader";
66

77
export { DrawerItems } from "./DrawerItems";
8-
export type { DrawerItemsProps, FlowbiteDrawerItemsTheme } from "./DrawerItems";
8+
export type { DrawerItemsProps, DrawerItemsTheme } from "./DrawerItems";

packages/ui/src/components/Footer/FooterLink.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import { useThemeProvider } from "../../theme/provider";
77
import type { DeepPartial, ResetTheme } from "../../types";
88
import { footerTheme } from "./theme";
99

10-
export interface FlowbiteFooterLinkTheme {
10+
export interface FooterLinkTheme {
1111
base: string;
1212
href: string;
1313
}
1414

1515
export interface FooterLinkProps extends ComponentProps<"a"> {
1616
as?: ElementType;
1717
href: string;
18-
theme?: DeepPartial<FlowbiteFooterLinkTheme>;
19-
resetTheme?: ResetTheme<FlowbiteFooterLinkTheme>;
18+
theme?: DeepPartial<FooterLinkTheme>;
19+
resetTheme?: ResetTheme<FooterLinkTheme>;
2020
}
2121

2222
export const FooterLink: FC<FooterLinkProps> = ({

packages/ui/src/components/Footer/FooterLinkGroup.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import { resolveTheme } from "../../helpers/resolve-theme";
55
import { twMerge } from "../../helpers/tailwind-merge";
66
import { useThemeProvider } from "../../theme/provider";
77
import type { DeepPartial, ResetTheme } from "../../types";
8-
import type { FlowbiteFooterLinkTheme } from "./FooterLink";
8+
import type { FooterLinkTheme } from "./FooterLink";
99
import { footerTheme } from "./theme";
1010

1111
export interface FooterLinkGroupTheme {
1212
base: string;
13-
link: FlowbiteFooterLinkTheme;
13+
link: FooterLinkTheme;
1414
col: string;
1515
}
1616

packages/ui/src/components/Footer/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export type { FooterDividerTheme, FooterDividerProps } from "./FooterDivider";
99
export { FooterIcon } from "./FooterIcon";
1010
export type { FooterIconTheme, FooterIconProps } from "./FooterIcon";
1111
export { FooterLink } from "./FooterLink";
12-
export type { FlowbiteFooterLinkTheme, FooterLinkProps } from "./FooterLink";
12+
export type { FooterLinkTheme, FooterLinkProps } from "./FooterLink";
1313
export { FooterLinkGroup } from "./FooterLinkGroup";
1414
export type { FooterLinkGroupTheme, FooterLinkGroupProps } from "./FooterLinkGroup";
1515
export { FooterTitle } from "./FooterTitle";

packages/ui/src/components/Sidebar/SidebarCTA.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import { sidebarTheme } from "./theme";
1212

1313
export interface SidebarCTATheme {
1414
base: string;
15-
color: FlowbiteSidebarCTAColors;
15+
color: SidebarCTAColors;
1616
}
1717

1818
export interface SidebarCTAProps extends Omit<ComponentProps<"div">, "color"> {
19-
color?: DynamicStringEnumKeysOf<FlowbiteSidebarCTAColors>;
19+
color?: DynamicStringEnumKeysOf<SidebarCTAColors>;
2020
theme?: DeepPartial<SidebarCTATheme>;
2121
resetTheme?: ResetTheme<SidebarCTATheme>;
2222
}
2323

24-
export interface FlowbiteSidebarCTAColors
24+
export interface SidebarCTAColors
2525
extends Pick<
2626
FlowbiteColors,
2727
"blue" | "dark" | "failure" | "gray" | "green" | "light" | "purple" | "red" | "success" | "warning" | "yellow"

packages/ui/src/components/Sidebar/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export { Sidebar } from "./Sidebar";
22
export type { SidebarTheme, SidebarProps } from "./Sidebar";
33
export { SidebarCTA } from "./SidebarCTA";
4-
export type { FlowbiteSidebarCTAColors, SidebarCTATheme, SidebarCTAProps } from "./SidebarCTA";
4+
export type { SidebarCTAColors, SidebarCTATheme, SidebarCTAProps } from "./SidebarCTA";
55
export { SidebarCollapse } from "./SidebarCollapse";
66
export type { SidebarCollapseTheme, SidebarCollapseProps } from "./SidebarCollapse";
77
export { SidebarItem } from "./SidebarItem";

packages/ui/src/components/Table/TableBody.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { twMerge } from "../../helpers/tailwind-merge";
77
import { useThemeProvider } from "../../theme/provider";
88
import type { DeepPartial, ResetTheme } from "../../types";
99
import { TableBodyContext } from "./TableBodyContext";
10-
import type { FlowbiteTableCellTheme } from "./TableCell";
10+
import type { TableCellTheme } from "./TableCell";
1111
import { useTableContext } from "./TableContext";
1212
import { tableTheme } from "./theme";
1313

1414
export interface TableBodyTheme {
1515
base: string;
16-
cell: FlowbiteTableCellTheme;
16+
cell: TableCellTheme;
1717
}
1818

1919
export interface TableBodyProps extends ComponentPropsWithRef<"tbody"> {

packages/ui/src/components/Table/TableCell.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import { useTableBodyContext } from "./TableBodyContext";
1010
import { useTableContext } from "./TableContext";
1111
import { tableTheme } from "./theme";
1212

13-
export interface FlowbiteTableCellTheme {
13+
export interface TableCellTheme {
1414
base: string;
1515
}
1616

1717
export interface TableCellProps extends ComponentPropsWithRef<"td"> {
18-
theme?: DeepPartial<FlowbiteTableCellTheme>;
19-
resetTheme?: ResetTheme<FlowbiteTableCellTheme>;
18+
theme?: DeepPartial<TableCellTheme>;
19+
resetTheme?: ResetTheme<TableCellTheme>;
2020
}
2121

2222
export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(

packages/ui/src/components/Table/TableHead.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { twMerge } from "../../helpers/tailwind-merge";
77
import { useThemeProvider } from "../../theme/provider";
88
import type { DeepPartial, ResetTheme } from "../../types";
99
import { useTableContext } from "./TableContext";
10-
import type { FlowbiteTableHeadCellTheme } from "./TableHeadCell";
10+
import type { TableHeadCellTheme } from "./TableHeadCell";
1111
import { TableHeadContext } from "./TableHeadContext";
1212
import { tableTheme } from "./theme";
1313

1414
export interface TableHeadTheme {
1515
base: string;
16-
cell: FlowbiteTableHeadCellTheme;
16+
cell: TableHeadCellTheme;
1717
}
1818

1919
export interface TableHeadProps extends ComponentPropsWithRef<"thead"> {

packages/ui/src/components/Table/TableHeadCell.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import { useTableContext } from "./TableContext";
1010
import { useTableHeadContext } from "./TableHeadContext";
1111
import { tableTheme } from "./theme";
1212

13-
export interface FlowbiteTableHeadCellTheme {
13+
export interface TableHeadCellTheme {
1414
base: string;
1515
}
1616

1717
export interface TableHeadCellProps extends ComponentPropsWithRef<"th"> {
18-
theme?: DeepPartial<FlowbiteTableHeadCellTheme>;
19-
resetTheme?: ResetTheme<FlowbiteTableHeadCellTheme>;
18+
theme?: DeepPartial<TableHeadCellTheme>;
19+
resetTheme?: ResetTheme<TableHeadCellTheme>;
2020
}
2121

2222
export const TableHeadCell = forwardRef<HTMLTableCellElement, TableHeadCellProps>(

packages/ui/src/components/Table/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ export type { TableRootTheme, TableTheme, TableProps } from "./Table";
33
export { TableBody } from "./TableBody";
44
export type { TableBodyTheme, TableBodyProps } from "./TableBody";
55
export { TableCell } from "./TableCell";
6-
export type { FlowbiteTableCellTheme, TableCellProps } from "./TableCell";
6+
export type { TableCellTheme, TableCellProps } from "./TableCell";
77
export { TableHead } from "./TableHead";
88
export type { TableHeadTheme, TableHeadProps } from "./TableHead";
99
export { TableHeadCell } from "./TableHeadCell";
10-
export type { FlowbiteTableHeadCellTheme, TableHeadCellProps } from "./TableHeadCell";
10+
export type { TableHeadCellTheme, TableHeadCellProps } from "./TableHeadCell";
1111
export { TableRow } from "./TableRow";
1212
export type { TableRowTheme, TableRowProps } from "./TableRow";

packages/ui/src/components/Timeline/TimelineBody.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import { useTimelineContentContext } from "./TimelineContentContext";
1111
import { useTimelineContext } from "./TimelineContext";
1212
import { useTimelineItemContext } from "./TimelineItemContext";
1313

14-
export interface FlowbiteTimelineBodyTheme {
14+
export interface TimelineBodyTheme {
1515
base: string;
1616
}
1717

1818
export interface TimelineBodyProps extends ComponentProps<"p"> {
19-
theme?: DeepPartial<FlowbiteTimelineBodyTheme>;
20-
resetTheme?: ResetTheme<FlowbiteTimelineBodyTheme>;
19+
theme?: DeepPartial<TimelineBodyTheme>;
20+
resetTheme?: ResetTheme<TimelineBodyTheme>;
2121
}
2222

2323
export const TimelineBody: FC<TimelineBodyProps> = ({

0 commit comments

Comments
 (0)