Skip to content

Commit 7a88193

Browse files
committed
remove redundant Flowbite prefix from types
1 parent fdcfb8c commit 7a88193

File tree

193 files changed

+804
-842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+804
-842
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import type { FlowbiteAccordionTitleTheme } from "./AccordionTitle";
1717
import { AccordionTitle } from "./AccordionTitle";
1818
import { accordionTheme } from "./theme";
1919

20-
export interface FlowbiteAccordionTheme {
21-
root: FlowbiteAccordionRootTheme;
20+
export interface AccordionTheme {
21+
root: AccordionRootTheme;
2222
content: FlowbiteAccordionComponentTheme;
2323
title: FlowbiteAccordionTitleTheme;
2424
}
2525

26-
export interface FlowbiteAccordionRootTheme {
26+
export interface AccordionRootTheme {
2727
base: string;
2828
flush: FlowbiteBoolean;
2929
}
@@ -34,8 +34,8 @@ export interface AccordionProps extends ComponentProps<"div"> {
3434
children: ReactElement<AccordionPanelProps> | ReactElement<AccordionPanelProps>[];
3535
flush?: boolean;
3636
collapseAll?: boolean;
37-
theme?: DeepPartial<FlowbiteAccordionTheme>;
38-
resetTheme?: ResetTheme<FlowbiteAccordionTheme>;
37+
theme?: DeepPartial<AccordionTheme>;
38+
resetTheme?: ResetTheme<AccordionTheme>;
3939
}
4040

4141
const AccordionComponent: FC<AccordionProps> = ({

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export { Accordion } from "./Accordion";
2-
export type { AccordionProps, FlowbiteAccordionRootTheme, FlowbiteAccordionTheme } from "./Accordion";
2+
export type { AccordionProps, AccordionRootTheme, AccordionTheme } from "./Accordion";
33
export { AccordionContent } from "./AccordionContent";
44
export type { AccordionContentProps, FlowbiteAccordionComponentTheme } from "./AccordionContent";
55
export { AccordionPanel } from "./AccordionPanel";

packages/ui/src/components/Accordion/theme.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createTheme } from "../../helpers/create-theme";
2-
import type { FlowbiteAccordionTheme } from "./Accordion";
2+
import type { AccordionTheme } from "./Accordion";
33

4-
export const accordionTheme: FlowbiteAccordionTheme = createTheme({
4+
export const accordionTheme: AccordionTheme = createTheme({
55
root: {
66
base: "divide-y divide-gray-200 border-gray-200 dark:divide-gray-700 dark:border-gray-700",
77
flush: {

packages/ui/src/components/Alert/Alert.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import type { DeepPartial, DynamicStringEnumKeysOf, ResetTheme } from "../../typ
99
import type { FlowbiteColors } from "../Flowbite/FlowbiteTheme";
1010
import { alertTheme } from "./theme";
1111

12-
export interface FlowbiteAlertTheme {
12+
export interface AlertTheme {
1313
base: string;
1414
borderAccent: string;
15-
closeButton: FlowbiteAlertCloseButtonTheme;
15+
closeButton: AlertCloseButtonTheme;
1616
color: FlowbiteColors;
1717
icon: string;
1818
rounded: string;
1919
wrapper: string;
2020
}
2121

22-
export interface FlowbiteAlertCloseButtonTheme {
22+
export interface AlertCloseButtonTheme {
2323
base: string;
2424
color: FlowbiteColors;
2525
icon: string;
@@ -31,8 +31,8 @@ export interface AlertProps extends Omit<ComponentProps<"div">, "color"> {
3131
icon?: FC<ComponentProps<"svg">>;
3232
onDismiss?: boolean | (() => void);
3333
rounded?: boolean;
34-
theme?: DeepPartial<FlowbiteAlertTheme>;
35-
resetTheme?: ResetTheme<FlowbiteAlertTheme>;
34+
theme?: DeepPartial<AlertTheme>;
35+
resetTheme?: ResetTheme<AlertTheme>;
3636
withBorderAccent?: boolean;
3737
}
3838

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export { Alert } from "./Alert";
2-
export type { AlertProps, FlowbiteAlertCloseButtonTheme, FlowbiteAlertTheme } from "./Alert";
2+
export type { AlertProps, AlertCloseButtonTheme, AlertTheme } from "./Alert";

packages/ui/src/components/Alert/theme.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createTheme } from "../../helpers/create-theme";
2-
import type { FlowbiteAlertTheme } from "./Alert";
2+
import type { AlertTheme } from "./Alert";
33

4-
export const alertTheme: FlowbiteAlertTheme = createTheme({
4+
export const alertTheme: AlertTheme = createTheme({
55
base: "flex flex-col gap-2 p-4 text-sm",
66
borderAccent: "border-t-4",
77
closeButton: {

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,39 @@ import type { FlowbiteAvatarGroupCounterTheme } from "./AvatarGroupCounter";
1212
import { AvatarGroupCounter } from "./AvatarGroupCounter";
1313
import { avatarTheme } from "./theme";
1414

15-
export interface FlowbiteAvatarTheme {
16-
root: FlowbiteAvatarRootTheme;
15+
export interface AvatarTheme {
16+
root: AvatarRootTheme;
1717
group: FlowbiteAvatarGroupTheme;
1818
groupCounter: FlowbiteAvatarGroupCounterTheme;
1919
}
2020

21-
export interface FlowbiteAvatarRootTheme {
21+
export interface AvatarRootTheme {
2222
base: string;
2323
bordered: string;
2424
color: AvatarColors;
25-
img: FlowbiteAvatarImageTheme;
26-
initials: FlowbiteAvatarInitialsTheme;
25+
img: AvatarImageTheme;
26+
initials: AvatarInitialsTheme;
2727
rounded: string;
2828
size: AvatarSizes;
2929
stacked: string;
30-
status: FlowbiteAvatarStatusTheme;
30+
status: AvatarStatusTheme;
3131
statusPosition: FlowbitePositions;
3232
}
3333

34-
export interface FlowbiteAvatarImageTheme extends FlowbiteBoolean {
34+
export interface AvatarImageTheme extends FlowbiteBoolean {
3535
base: string;
3636
placeholder: string;
3737
}
3838

39-
export interface FlowbiteAvatarStatusTheme {
39+
export interface AvatarStatusTheme {
4040
away: string;
4141
base: string;
4242
busy: string;
4343
offline: string;
4444
online: string;
4545
}
4646

47-
export interface FlowbiteAvatarInitialsTheme {
47+
export interface AvatarInitialsTheme {
4848
base: string;
4949
text: string;
5050
}
@@ -75,8 +75,8 @@ export interface AvatarProps extends Omit<ComponentProps<"div">, "color"> {
7575
status?: "away" | "busy" | "offline" | "online";
7676
statusPosition?: keyof FlowbitePositions;
7777
placeholderInitials?: string;
78-
theme?: DeepPartial<FlowbiteAvatarTheme>;
79-
resetTheme?: ResetTheme<FlowbiteAvatarTheme>;
78+
theme?: DeepPartial<AvatarTheme>;
79+
resetTheme?: ResetTheme<AvatarTheme>;
8080
}
8181

8282
const AvatarComponent: FC<AvatarProps> = ({

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ export type {
44
AvatarImageProps,
55
AvatarProps,
66
AvatarSizes,
7-
FlowbiteAvatarImageTheme,
8-
FlowbiteAvatarInitialsTheme,
9-
FlowbiteAvatarRootTheme,
10-
FlowbiteAvatarStatusTheme,
11-
FlowbiteAvatarTheme,
7+
AvatarImageTheme,
8+
AvatarInitialsTheme,
9+
AvatarRootTheme,
10+
AvatarStatusTheme,
11+
AvatarTheme,
1212
} from "./Avatar";
1313
export { AvatarGroup } from "./AvatarGroup";
1414
export type { AvatarGroupProps, FlowbiteAvatarGroupTheme } from "./AvatarGroup";

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createTheme } from "../../helpers/create-theme";
2-
import type { FlowbiteAvatarTheme } from "./Avatar";
2+
import type { AvatarTheme } from "./Avatar";
33

4-
export const avatarTheme: FlowbiteAvatarTheme = createTheme({
4+
export const avatarTheme: AvatarTheme = createTheme({
55
root: {
66
base: "flex items-center justify-center space-x-4 rounded",
77
bordered: "p-1 ring-2",

packages/ui/src/components/Badge/Badge.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ import type { DeepPartial, DynamicStringEnumKeysOf, ResetTheme } from "../../typ
88
import type { FlowbiteBoolean, FlowbiteColors, FlowbiteSizes } from "../Flowbite/FlowbiteTheme";
99
import { badgeTheme } from "./theme";
1010

11-
export interface FlowbiteBadgeTheme {
12-
root: FlowbiteBadgeRootTheme;
13-
icon: FlowbiteBadgeIconTheme;
11+
export interface BadgeTheme {
12+
root: BadgeRootTheme;
13+
icon: BadgeIconTheme;
1414
}
1515

16-
export interface FlowbiteBadgeRootTheme {
16+
export interface BadgeRootTheme {
1717
base: string;
1818
color: FlowbiteColors;
1919
href: string;
2020
size: BadgeSizes;
2121
}
2222

23-
export interface FlowbiteBadgeIconTheme extends FlowbiteBoolean {
23+
export interface BadgeIconTheme extends FlowbiteBoolean {
2424
size: BadgeSizes;
2525
}
2626

@@ -33,8 +33,8 @@ export interface BadgeProps extends Omit<ComponentProps<"span">, "color"> {
3333
href?: string;
3434
icon?: FC<ComponentProps<"svg">>;
3535
size?: DynamicStringEnumKeysOf<BadgeSizes>;
36-
theme?: DeepPartial<FlowbiteBadgeTheme>;
37-
resetTheme?: ResetTheme<FlowbiteBadgeTheme>;
36+
theme?: DeepPartial<BadgeTheme>;
37+
resetTheme?: ResetTheme<BadgeTheme>;
3838
}
3939

4040
export const Badge: FC<BadgeProps> = ({
+1-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
export { Badge } from "./Badge";
2-
export type {
3-
BadgeProps,
4-
BadgeSizes,
5-
FlowbiteBadgeIconTheme,
6-
FlowbiteBadgeRootTheme,
7-
FlowbiteBadgeTheme,
8-
} from "./Badge";
2+
export type { BadgeProps, BadgeSizes, BadgeIconTheme, BadgeRootTheme, BadgeTheme } from "./Badge";

packages/ui/src/components/Badge/theme.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createTheme } from "../../helpers/create-theme";
2-
import type { FlowbiteBadgeTheme } from "./Badge";
2+
import type { BadgeTheme } from "./Badge";
33

4-
export const badgeTheme: FlowbiteBadgeTheme = createTheme({
4+
export const badgeTheme: BadgeTheme = createTheme({
55
root: {
66
base: "flex h-fit items-center gap-1 font-semibold",
77
color: {

packages/ui/src/components/Blockquote/Blockquote.tsx

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

10-
export interface FlowbiteBlockquoteTheme {
11-
root: FlowbiteBlockquoteRootTheme;
10+
export interface BlockquoteTheme {
11+
root: BlockquoteRootTheme;
1212
}
1313

14-
export interface FlowbiteBlockquoteRootTheme {
14+
export interface BlockquoteRootTheme {
1515
base: string;
1616
}
1717

1818
export interface BlockquoteProps extends ComponentProps<"blockquote"> {
19-
theme?: DeepPartial<FlowbiteBlockquoteTheme>;
20-
resetTheme?: ResetTheme<FlowbiteBlockquoteTheme>;
19+
theme?: DeepPartial<BlockquoteTheme>;
20+
resetTheme?: ResetTheme<BlockquoteTheme>;
2121
}
2222

2323
export const Blockquote: FC<BlockquoteProps> = ({ children, className, theme: customTheme, resetTheme, ...props }) => {
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export { Blockquote } from "./Blockquote";
2-
export type { BlockquoteProps, FlowbiteBlockquoteRootTheme, FlowbiteBlockquoteTheme } from "./Blockquote";
2+
export type { BlockquoteProps, BlockquoteRootTheme, BlockquoteTheme } from "./Blockquote";

packages/ui/src/components/Blockquote/theme.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createTheme } from "../../helpers/create-theme";
2-
import type { FlowbiteBlockquoteTheme } from "./Blockquote";
2+
import type { BlockquoteTheme } from "./Blockquote";
33

4-
export const blockquoteTheme: FlowbiteBlockquoteTheme = createTheme({
4+
export const blockquoteTheme: BlockquoteTheme = createTheme({
55
root: {
66
base: "text-xl font-semibold italic text-gray-900 dark:text-white",
77
},

packages/ui/src/components/Breadcrumb/Breadcrumb.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ 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 { FlowbiteBreadcrumbItemTheme } from "./BreadcrumbItem";
8+
import type { BreadcrumbItemTheme } from "./BreadcrumbItem";
99
import { BreadcrumbItem } from "./BreadcrumbItem";
1010
import { breadcrumbTheme } from "./theme";
1111

12-
export interface FlowbiteBreadcrumbTheme {
13-
root: FlowbiteBreadcrumbRootTheme;
14-
item: FlowbiteBreadcrumbItemTheme;
12+
export interface BreadcrumbTheme {
13+
root: BreadcrumbRootTheme;
14+
item: BreadcrumbItemTheme;
1515
}
1616

17-
export interface FlowbiteBreadcrumbRootTheme {
17+
export interface BreadcrumbRootTheme {
1818
base: string;
1919
list: string;
2020
}
2121

2222
export interface BreadcrumbComponentProps extends ComponentProps<"nav"> {
23-
theme?: DeepPartial<FlowbiteBreadcrumbRootTheme>;
24-
resetTheme?: ResetTheme<FlowbiteBreadcrumbRootTheme>;
23+
theme?: DeepPartial<BreadcrumbRootTheme>;
24+
resetTheme?: ResetTheme<BreadcrumbRootTheme>;
2525
}
2626

2727
const BreadcrumbComponent: FC<BreadcrumbComponentProps> = ({

packages/ui/src/components/Breadcrumb/BreadcrumbItem.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { DeepPartial, ResetTheme } from "../../types";
1010
import type { FlowbiteBoolean } from "../Flowbite/FlowbiteTheme";
1111
import { breadcrumbTheme } from "./theme";
1212

13-
export interface FlowbiteBreadcrumbItemTheme {
13+
export interface BreadcrumbItemTheme {
1414
base: string;
1515
chevron: string;
1616
href: FlowbiteBoolean;
@@ -20,8 +20,8 @@ export interface FlowbiteBreadcrumbItemTheme {
2020
export interface BreadcrumbItemProps extends Omit<ComponentProps<"li">, "ref"> {
2121
href?: string;
2222
icon?: FC<ComponentProps<"svg">>;
23-
theme?: DeepPartial<FlowbiteBreadcrumbItemTheme>;
24-
resetTheme?: ResetTheme<FlowbiteBreadcrumbItemTheme>;
23+
theme?: DeepPartial<BreadcrumbItemTheme>;
24+
resetTheme?: ResetTheme<BreadcrumbItemTheme>;
2525
}
2626

2727
export const BreadcrumbItem = forwardRef<HTMLAnchorElement | HTMLSpanElement, BreadcrumbItemProps>(
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export { Breadcrumb } from "./Breadcrumb";
2-
export type { BreadcrumbComponentProps, FlowbiteBreadcrumbRootTheme, FlowbiteBreadcrumbTheme } from "./Breadcrumb";
2+
export type { BreadcrumbComponentProps, BreadcrumbRootTheme, BreadcrumbTheme } from "./Breadcrumb";
33
export { BreadcrumbItem } from "./BreadcrumbItem";
4-
export type { BreadcrumbItemProps, FlowbiteBreadcrumbItemTheme } from "./BreadcrumbItem";
4+
export type { BreadcrumbItemProps, BreadcrumbItemTheme } from "./BreadcrumbItem";

packages/ui/src/components/Breadcrumb/theme.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createTheme } from "../../helpers/create-theme";
2-
import type { FlowbiteBreadcrumbTheme } from "./Breadcrumb";
2+
import type { BreadcrumbTheme } from "./Breadcrumb";
33

4-
export const breadcrumbTheme: FlowbiteBreadcrumbTheme = createTheme({
4+
export const breadcrumbTheme: BreadcrumbTheme = createTheme({
55
root: {
66
base: "",
77
list: "flex items-center",

packages/ui/src/components/Button/Button.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { ButtonBase, type ButtonBaseProps } from "./ButtonBase";
1919
import type { PositionInButtonGroup } from "./ButtonGroup";
2020
import { buttonGroupTheme, buttonTheme } from "./theme";
2121

22-
export interface FlowbiteButtonTheme {
22+
export interface ButtonTheme {
2323
base: string;
2424
fullSized: string;
2525
color: FlowbiteColors;
@@ -29,21 +29,21 @@ export interface FlowbiteButtonTheme {
2929
spinnerLeftPosition: ButtonSizes;
3030
gradient: ButtonGradientColors;
3131
gradientDuoTone: ButtonGradientDuoToneColors;
32-
inner: FlowbiteButtonInnerTheme;
32+
inner: ButtonInnerTheme;
3333
label: string;
34-
outline: FlowbiteButtonOutlineTheme;
34+
outline: ButtonOutlineTheme;
3535
pill: FlowbiteBoolean;
3636
size: ButtonSizes;
3737
}
3838

39-
export interface FlowbiteButtonInnerTheme {
39+
export interface ButtonInnerTheme {
4040
base: string;
4141
position: PositionInButtonGroup;
4242
outline: string;
4343
isProcessingPadding: ButtonSizes;
4444
}
4545

46-
export interface FlowbiteButtonOutlineTheme extends FlowbiteBoolean {
46+
export interface ButtonOutlineTheme extends FlowbiteBoolean {
4747
color: ButtonOutlineColors;
4848
pill: FlowbiteBoolean;
4949
}
@@ -86,8 +86,8 @@ export type ButtonProps<T extends ElementType = "button"> = PolymorphicComponent
8686
pill?: boolean;
8787
positionInGroup?: keyof PositionInButtonGroup;
8888
size?: DynamicStringEnumKeysOf<ButtonSizes>;
89-
theme?: DeepPartial<FlowbiteButtonTheme>;
90-
resetTheme?: ResetTheme<FlowbiteButtonTheme>;
89+
theme?: DeepPartial<ButtonTheme>;
90+
resetTheme?: ResetTheme<ButtonTheme>;
9191
}
9292
>;
9393

0 commit comments

Comments
 (0)