Skip to content

Commit

Permalink
Merge pull request #1844 from natura-cosmeticos/DSY-5430v2
Browse files Browse the repository at this point in the history
fix(natds-react):  fixed texttransform CB2 e FV2 to none update theme
  • Loading branch information
vagnerbarbosant authored Jan 8, 2025
2 parents 56eeaf8 + 4ed54bd commit 447ae43
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default {
export const Playground: Story<GayaButtonProps> = (args) => <GayaButton {...args} />
Playground.args = {
children: 'button',
onClick: () => console.log('clicked!')
onClick: () => null
}

export const Variants: Story<GayaButtonProps> = (args) => (
Expand Down
6 changes: 0 additions & 6 deletions packages/react/src/components/GayaButton/GayaButton.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,13 @@ type GayaButtonStyleProps = Pick<GayaButtonProps, 'size' | 'showIcon' | 'iconPos
const getPaddingStyles = (theme: Theme) => ({ size, brand, mode }: GayaButtonStyleProps) => {
const brandTheme = buildTheme(brand, mode)
const padding = {
// semi: theme.spacing.micro,
semi: theme.button.paddingX,
// medium: theme.spacing.small,
medium: theme.button.paddingX,
// semiX: theme.spacing.tiny
semiX: theme.button.paddingX
}
const paddingbrand = {
// semi: brandTheme.spacing.micro,
semi: brandTheme.button.paddingX,
// medium: brandTheme.spacing.small,
medium: brandTheme.button.paddingX,
// semiX: brandTheme.spacing.tiny
semiX: brandTheme.button.paddingX
}
if (brand) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/GayaButton/GayaButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const GayaButton = React.forwardRef<HTMLButtonElement, GayaButtonProps>(({
return (
<Ripple brand={brand} disabled={disabled} fullWidth={fullWidth}>
<button
className={`${gayaButton} ${className} Button-gaya`}
className={`${gayaButton} ${className} Gaya-Button`}
data-testid={testID}
disabled={disabled || ariaDisabled}
onClick={onClick}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -166,7 +166,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -258,7 +258,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -351,7 +351,7 @@ Array [
>
<button
aria-disabled="true"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
data-testid="btn-disabled"
disabled=""
type="button"
Expand Down Expand Up @@ -443,7 +443,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -534,7 +534,7 @@ Array [
>
<button
aria-disabled="true"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
disabled=""
type="button"
>
Expand Down Expand Up @@ -625,7 +625,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -716,7 +716,7 @@ Array [
>
<button
aria-disabled="true"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
disabled=""
type="button"
>
Expand Down Expand Up @@ -809,7 +809,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -910,7 +910,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -1017,7 +1017,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down Expand Up @@ -1124,7 +1124,7 @@ Array [
data-testid="ripple"
>
<button
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Button-gaya"
class="gayaButton-0-2-1 gayaButton-d0-0-2-4 Gaya-Button"
type="button"
>
<div
Expand Down

0 comments on commit 447ae43

Please sign in to comment.