Skip to content

Commit

Permalink
Merge pull request #50 from thep0y/main
Browse files Browse the repository at this point in the history
retry 0.1.13
  • Loading branch information
thep0y authored Dec 24, 2024
2 parents 21dc0ed + 67aeadb commit 0e52e41
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
3 changes: 0 additions & 3 deletions packages/components/button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,7 @@ const Button = (props: ButtonProps) => {
others: {
[`${merged.class}`]: merged.class,
[`${baseClassName}-disabled`]: disabled(),
[`${baseClassName}-danger`]: merged.danger,
[`${baseClassName}-${merged.shape}`]: merged.shape,
[`${baseClassName}-${merged.danger ? "primary" : merged.appearance}`]:
merged.danger ?? merged.appearance,
[`${baseClassName}-${merged.size}`]: merged.size,
[`${baseClassName}-icon-only`]: iconOnly(),
},
Expand Down
5 changes: 1 addition & 4 deletions packages/interface.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import type { JSX } from "solid-js";
import type { FluentMouseEvent } from "./types";

export type HTMLInputElementProps = JSX.HTMLElementTags["input"];
export type HTMLDivElementProps = JSX.HTMLElementTags["div"];

export type FluentMouseEvent<T extends HTMLElement> = MouseEvent & {
currentTarget: T;
};

export type SizeType = "small" | "medium" | "large";
export type Direction = "left" | "center" | "right" | "top" | "bottom";
export type Placement =
Expand Down
9 changes: 9 additions & 0 deletions packages/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export type FluentKeyboardEvent<T extends HTMLElement> = KeyboardEvent & {
target: Element;
currentTarget: T;
};

export type FluentMouseEvent<T extends HTMLElement> = MouseEvent & {
target: Element;
currentTarget: T;
};

0 comments on commit 0e52e41

Please sign in to comment.