Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ari-party committed Aug 28, 2024
1 parent 34c8d4d commit d0305d6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@grand-hawk/ui-components",
"version": "0.2.2",
"version": "0.3.0",
"keywords": [
"roblox-ts",
"react",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Checkbox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface CheckboxProps extends ButtonProps {
}

export function Checkbox(componentProps: PropsWithChildren<CheckboxProps>) {
const props = componentProps;
const props = { ...componentProps };

const value = props.Value;
props.Value = undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Sheet/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface SheetProps extends BoxProps {
export function Sheet(componentProps: PropsWithChildren<SheetProps>) {
const theme = useTheme();

const props = componentProps;
const props = { ...componentProps };

const background = props.Background
? theme.backgroundPrimary
Expand Down
12 changes: 10 additions & 2 deletions src/components/Typography/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,22 @@ import { useTheme } from 'components/ThemeProvider';
import type { PropsWithChildren } from '@rbxts/react';
import type { BoxProps } from 'components/Box';

export interface TypographyProps extends BoxProps<'textlabel'> {}
export interface TypographyProps extends BoxProps<'textlabel'> {
Bold?: boolean;
}

export function Typography(props: PropsWithChildren<TypographyProps>) {
export function Typography(componentProps: PropsWithChildren<TypographyProps>) {
const theme = useTheme();

const props = { ...componentProps };

const bold = componentProps.Bold ?? false;
props.Bold = undefined;

return (
<Box
Component="textlabel"
Font={bold ? theme.fontBold : theme.fontRegular}
TextColor3={theme.textPrimary}
TextSize={12}
TextXAlignment={Enum.TextXAlignment.Left}
Expand Down

0 comments on commit d0305d6

Please sign in to comment.