Skip to content
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

Jump to bottom

Fix: RGBA calculations && issue 5540 #5544

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Fix: RGBA calculations && issue 5540 #5544

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
3caefc4
fix: add "/" to RGBA calculations
kjk7034 Jan 11, 2024
b941c67
fix(core): error in the expression caused by missing parentheses
kjk7034 Jan 11, 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
2 changes: 1 addition & 1 deletion packages/@mantine/core/src/components/NumberInput/NumberInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ export const NumberInput = factory<NumberInputFactory>((_props, ref) => {
__staticSelector="NumberInput"
decimalScale={allowDecimal ? decimalScale : 0}
onKeyDown={handleKeyDown}
rightSectionPointerEvents={rightSectionPointerEvents ?? disabled ? 'none' : undefined}
rightSectionPointerEvents={rightSectionPointerEvents ?? (disabled ? 'none' : undefined)}
rightSectionWidth={rightSectionWidth ?? `var(--ni-right-section-width-${size || 'sm'})`}
allowLeadingZeros={allowLeadingZeros}
onBlur={(event) => {
Expand Down
3 changes: 3 additions & 0 deletions packages/@mantine/core/src/core/MantineProvider/color-functions/to-rgba/to-rgba.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ describe('@mantine/core/to-rgba', () => {
expect(toRgba('rgb(240, 62, 62, 0.8)')).toStrictEqual({ r: 240, g: 62, b: 62, a: 0.8 });
expect(toRgba('rgb(214, 51, 108, 1)')).toStrictEqual({ r: 214, g: 51, b: 108, a: 1 });
expect(toRgba('rgb(112, 72, 232, .2)')).toStrictEqual({ r: 112, g: 72, b: 232, a: 0.2 });
expect(toRgba('rgb(240, 62, 62 / 0.8)')).toStrictEqual({ r: 240, g: 62, b: 62, a: 0.8 });
expect(toRgba('rgb(214, 51, 108 / 1)')).toStrictEqual({ r: 214, g: 51, b: 108, a: 1 });
expect(toRgba('rgb(112, 72, 232 / .2)')).toStrictEqual({ r: 112, g: 72, b: 232, a: 0.2 });
});

it('returns the correct rgba values when given an hsl string', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/@mantine/core/src/core/MantineProvider/color-functions/to-rgba/to-rgba.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ function hexToRgba(color: string): RGBA {

function rgbStringToRgba(color: string): RGBA {
const [r, g, b, a] = color
.replace(/[^0-9,.]/g, '')
.split(',')
.replace(/[^0-9,./]/g, '')
.split(/[/,]/)
.map(Number);

return { r, g, b, a: a || 1 };
Expand Down