Skip to content

Add border to label #104

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

Merged
merged 2 commits into from
Apr 25, 2025
Merged

Add border to label #104

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
6761da9
Added border to label
NatLeung96 Apr 25, 2025
800af33
Updated snapshots
NatLeung96 Apr 25, 2025
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
4 changes: 2 additions & 2 deletions src/ui/widgets/Label/__snapshots__/label.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports[`<Label /> > it handles transparent prop`] = `
exports[`<Label /> > it handles transparent prop 1`] = `
<DocumentFragment>
<p
class="MuiTypography-root MuiTypography-body1 css-1fe740m-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-4hgpfw-MuiTypography-root"
>
hello
</p>
Expand All @@ -23,7 +23,7 @@ exports[`<Label /> > it handles transparent prop 1`] = `
exports[`<Label /> > it matches the snapshot 1`] = `
<DocumentFragment>
<p
class="MuiTypography-root MuiTypography-body1 css-1fe740m-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-4hgpfw-MuiTypography-root"
>
hello
</p>
Expand Down
4 changes: 3 additions & 1 deletion src/ui/widgets/Label/label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export const LabelComponent = (
? "transparent"
: (props.backgroundColor?.toString() ?? diamondTheme.palette.primary.main);
const font = props.font?.css() ?? diamondTheme.typography;
const border = props.border?.css() ?? "0px solid #000000";

// Since display is "flex", use "flex-start" and "flex-end" to align
// the content.
Expand Down Expand Up @@ -93,7 +94,8 @@ export const LabelComponent = (
color: foregroundColor.toString(),
backgroundColor: backgroundColor,
fontFamily: font,
transform: `rotate(${rotationStep * -90}deg)`.toString()
transform: `rotate(${rotationStep * -90}deg)`.toString(),
border: border
}}
>
{text}
Expand Down
2 changes: 1 addition & 1 deletion src/ui/widgets/Symbol/__snapshots__/symbol.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ exports[`<Symbol /> from .opi file > matches snapshot 1`] = `
style="padding: 5%;"
>
<p
class="MuiTypography-root MuiTypography-body1 css-1fe740m-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-4hgpfw-MuiTypography-root"
>
Fake value
</p>
Expand Down
Loading