Skip to content

Fix/variant types/colors sizes #2

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

Open
moehami wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix/variant types/colors sizes #2

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
657a2c0
fix: proper type inference from `FlowbiteColors` derriving into `colo…
Jan 24, 2024
2f68262
fix(components): types for `Alert`
Jan 24, 2024
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
8 changes: 4 additions & 4 deletions src/components/Alert/Alert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '../../helpers/merge-deep';
import { getTheme } from '../../theme-store';
import type { DeepPartial } from '../../types';
import type { FlowbiteColors } from '../Flowbite';
import type { FlowbiteColorMap, FlowbiteColorValue } from '../Flowbite';

export interface FlowbiteAlertTheme {
base: string;
borderAccent: string;
closeButton: FlowbiteAlertCloseButtonTheme;
color: FlowbiteColors;
color: FlowbiteColorMap;
icon: string;
rounded: string;
wrapper: string;
}

export interface FlowbiteAlertCloseButtonTheme {
base: string;
color: FlowbiteColors;
color: FlowbiteColorMap;
icon: string;
}

export interface AlertProps extends Omit<ComponentProps<'div'>, 'color'> {
additionalContent?: ReactNode;
color?: keyof FlowbiteColors;
color?: FlowbiteColorValue;
icon?: FC<ComponentProps<'svg'>>;
onDismiss?: boolean | (() => void);
rounded?: boolean;
Expand Down
9 changes: 7 additions & 2 deletions src/components/Flowbite/FlowbiteTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ export interface FlowbiteStateColors {
}

export interface FlowbiteColors extends FlowbiteStateColors {
[key: string]: string;
blue: string;
cyan: string;
dark: string;
Expand All @@ -117,7 +116,6 @@ export interface FlowbiteColors extends FlowbiteStateColors {
}

export interface FlowbiteGradientColors extends Omit<FlowbiteStateColors, 'warning'> {
[key: string]: string;
cyan: string;
lime: string;
pink: string;
Expand Down Expand Up @@ -166,3 +164,10 @@ export interface FlowbiteSizes {
export interface FlowbiteContentPositions {
center: string;
}

type LooseString = string & NonNullable<unknown>;
export type LooseValue<T> = keyof T | LooseString;
export type LooseMap<T> = Record<keyof T | LooseString, string>;

export type FlowbiteColorMap = LooseMap<FlowbiteColors>;
export type FlowbiteColorValue = LooseValue<FlowbiteColors>;
2 changes: 2 additions & 0 deletions src/components/Flowbite/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ export type { ThemeProps } from './Flowbite';
export type {
CustomFlowbiteTheme,
FlowbiteBoolean,
FlowbiteColorMap,
FlowbiteColorValue,
FlowbiteColors,
FlowbiteContentPositions,
FlowbiteGradientColors,
Expand Down