fix: remove classname and icon button from component (#275)

Co-authored-by: “BogdanDanilescu” <bogdan.danilescu@nearform.com> Co-authored-by: Andrea Pregnolato <andrea.pregnolato@nearform.com>
ogcio · Oct 9, 2024 · 14c070b · 14c070b
1 parent 5f1d3a6
commit 14c070b
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 39 deletions.
diff --git a/packages/html/ds/src/button/button-schema.ts b/packages/html/ds/src/button/button-schema.ts
@@ -45,11 +45,6 @@ export const buttonSchema = zod.object({
   disabled: zod
     .boolean({ description: 'Specify if the button should be disabled' })
     .optional(),
-  className: zod
-    .string({
-      description: 'Add additional classes',
-    })
-    .optional(),
 });
 
 export type ButtonProps = zod.infer<typeof buttonSchema>;
diff --git a/packages/html/ds/src/button/button.html b/packages/html/ds/src/button/button.html
@@ -1,6 +1,5 @@
 {% from 'button/helpers.html' import getVariantAppearanceClass, getSizeClass, isButtonDisabled %}
 {% from 'icon/icon.html' import govieIcon %}
-{% from 'helpers/helpers.html' import addClasses %}
 
 {% macro govieButton(props) %}
   {% set appearance = props.appearance or 'default' %}
@@ -12,7 +11,7 @@
     data-element="button-container"
     data-module="gieds-button"
     data-testid="govieButton-{{ appearance }}-{{ variant }}-{{ size }}-{{ isDisabled }}"
-    class="gi-btn {{ getVariantAppearanceClass(props.disabled, props.variant, props.appearance) | trim }} {{ getSizeClass(props.size) | trim }} {{ isButtonDisabled(props.disabled, props.variant, props.appearance) | trim }} {{ addClasses(props.className) | trim }}"
+    class="gi-btn {{ getVariantAppearanceClass(props.disabled, props.variant, props.appearance) | trim }} {{ getSizeClass(props.size) | trim }} {{ isButtonDisabled(props.disabled, props.variant, props.appearance) | trim }}"
   >
     {{ props.content | safe | trim }}
   </button>

diff --git a/packages/html/ds/src/button/button.stories.ts b/packages/html/ds/src/button/button.stories.ts
@@ -51,12 +51,6 @@ export const Default: Story = {
       description: 'Specify if the button is disabled',
       type: 'boolean',
     },
-    className: {
-      control: 'text',
-      description:
-        'Specify additional classes ( this can be useful when an icon button needs to be rendered )',
-      type: 'string',
-    },
   },
   args: {
     content: 'Button',
@@ -76,13 +70,6 @@ export const WithIconRight: Story = {
   },
 };
 
-export const WithoutLabel: Story = {
-  args: {
-    content: `<span data-testid="govie-icon" role="presentation" class="material-icons gi-block gi-text-[24px]">thumb_up</span>`,
-    className: '!gi-p-3',
-  },
-};
-
 export const Disabled: Story = {
   args: {
     disabled: true,

diff --git a/packages/react/ds/src/button/button.stories.tsx b/packages/react/ds/src/button/button.stories.tsx
@@ -51,11 +51,6 @@ export const Default: Story = {
       type: { name: 'string' },
       description: 'The sizes of the button',
     },
-    label: {
-      control: 'text',
-      type: { name: 'string' },
-      description: 'Label of the Button',
-    },
     disabled: {
       control: 'boolean',
       description: 'Specify if the button is disabled',
@@ -90,17 +85,6 @@ export const WithIconRight: Story = {
   },
 };
 
-export const WithoutLabel: Story = {
-  args: {
-    className: '!gi-p-3',
-    children: (
-      <Fragment>
-        <Icon icon="thumb_up" />
-      </Fragment>
-    ),
-  },
-};
-
 export const Disabled: Story = {
   args: {
     children: 'Button',

diff --git a/packages/react/ds/src/button/button.tsx b/packages/react/ds/src/button/button.tsx
@@ -11,11 +11,10 @@ export const Button = ({
   size,
   disabled,
   children,
-  className,
 }: ButtonProps) => {
   return (
     <button
-      className={`gi-btn ${getVariantAppearanceClass({ disabled, variant, appearance })} ${getSizeClass(size)} ${isButtonDisabled({ disabled, variant, appearance })} ${className}`}
+      className={`gi-btn ${getVariantAppearanceClass({ disabled, variant, appearance })} ${getSizeClass(size)} ${isButtonDisabled({ disabled, variant, appearance })}`}
     >
       {children}
     </button>

diff --git a/packages/react/ds/src/button/types.ts b/packages/react/ds/src/button/types.ts
@@ -23,5 +23,4 @@ export type ButtonProps = {
   size?: ButtonSize;
   label?: string;
   disabled?: boolean;
-  className?: string;
 };