From 0eaa26545d6dead7cd52a264b38407c81e890060 Mon Sep 17 00:00:00 2001 From: Brion Date: Wed, 23 Oct 2024 18:51:20 +0530 Subject: [PATCH 1/3] fix(react): fix margin issues in `TextField` --- .../src/components/TextField/TextField.tsx | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/packages/react/src/components/TextField/TextField.tsx b/packages/react/src/components/TextField/TextField.tsx index 8a47a429..f7c53899 100644 --- a/packages/react/src/components/TextField/TextField.tsx +++ b/packages/react/src/components/TextField/TextField.tsx @@ -175,7 +175,17 @@ const PasswordFieldWithCriteria: ForwardRefExoticComponent = for */ const TextField: OverridableComponent> = forwardRef( ( - {className, id, label, type, InputLabelProps, variant, size = 'small', ...rest}: TextFieldProps, + { + className, + id, + label, + type, + InputLabelProps, + variant, + size = 'small', + margin = 'dense', + ...rest + }: TextFieldProps, ref: Ref, ): ReactElement => { const classes: string = clsx('oxygen-text-field', className); @@ -186,7 +196,15 @@ const TextField: OverridableComponent> = forw {label} {type === TextFieldInputTypes.INPUT_PASSWORD ? ( - + ) : ( > = forw className="OxygenTextField-root" type={type} size={size} + margin={margin} {...rest} /> )} From 0511dd97e93a5f7a0e41b9a119afc815ad0b4c15 Mon Sep 17 00:00:00 2001 From: Brion Date: Wed, 23 Oct 2024 23:44:15 +0530 Subject: [PATCH 2/3] chore(react): update snapshots --- .../__tests__/__snapshots__/Autocomplete.test.tsx.snap | 2 +- .../SignIn/__tests__/__snapshots__/SignIn.test.tsx.snap | 4 ++-- .../TextField/__test__/__snapshots__/TextField.test.tsx.snap | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react/src/components/Autocomplete/__tests__/__snapshots__/Autocomplete.test.tsx.snap b/packages/react/src/components/Autocomplete/__tests__/__snapshots__/Autocomplete.test.tsx.snap index d11b8d49..8ad48544 100644 --- a/packages/react/src/components/Autocomplete/__tests__/__snapshots__/Autocomplete.test.tsx.snap +++ b/packages/react/src/components/Autocomplete/__tests__/__snapshots__/Autocomplete.test.tsx.snap @@ -18,7 +18,7 @@ exports[`Alert should match the snapshot 1`] = ` Movie
Date: Wed, 6 Nov 2024 05:22:11 +0530 Subject: [PATCH 3/3] fix(primitives): update invalid default dark primary color --- .../src/design-tokens/oxygen/dark.tokens.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/primitives/src/design-tokens/oxygen/dark.tokens.json b/packages/primitives/src/design-tokens/oxygen/dark.tokens.json index 98f1d835..edefdbe8 100644 --- a/packages/primitives/src/design-tokens/oxygen/dark.tokens.json +++ b/packages/primitives/src/design-tokens/oxygen/dark.tokens.json @@ -3,23 +3,23 @@ "colors": { "primary": { "lighter": { - "value": "#14b8a5", + "value": "#ff9666", "type": "color" }, "light": { - "value": "#19e6ce", + "value": "#ff7433", "type": "color" }, "default": { - "value": "#47ebd8", + "value": "#ff5100", "type": "color" }, "dark": { - "value": "#75f0e1", + "value": "#cc4100", "type": "color" }, "darker": { - "value": "#a3f5eb", + "value": "#993000", "type": "color" } }, @@ -63,7 +63,7 @@ "type": "color" }, "primary": { - "value": "#75f0e1", + "value": "#cc4100", "type": "color" } }, @@ -89,7 +89,7 @@ "type": "color" }, "primary": { - "value": "#47ebd8", + "value": "#ff5100", "type": "color" }, "gray": { @@ -228,7 +228,7 @@ "background": { "primary": { "default": { - "value": "#47ebd8", + "value": "#ff5100", "type": "color" } }, @@ -327,4 +327,4 @@ "value": "https://raw.githubusercontent.com/brionmario/oxygen/main/examples/multi-brand-identity/public/assets/brands/oxygen/images/oxygen-logo-inverted.svg", "type": "asset" } -} \ No newline at end of file +}