Merge branch 'main' into feat/icons-new-structure

juntossomosmais · Jul 17, 2023 · ff1dd75 · ff1dd75
2 parents eceadc2 + 0e7d341
commit ff1dd75
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 19 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  "packages/core": "0.1.0-alpha.17",
+  "packages/core": "0.1.0-alpha.22",
   "packages/tokens": "0.1.0-alpha.21"
 }
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.0-alpha.22](https://github.com/juntossomosmais/atomium/compare/atomium-v0.1.0-alpha.17...atomium-v0.1.0-alpha.22) (2023-07-17)
+
+
+### Bug Fixes
+
+* **button:** remove atom click and avoid native click when disabled ([#186](https://github.com/juntossomosmais/atomium/issues/186)) ([bef58a0](https://github.com/juntossomosmais/atomium/commit/bef58a048d68d282c674f23b8da9caeb61259dbd))
+
 ## [0.1.0-alpha.17](https://github.com/juntossomosmais/atomium/compare/atomium-v0.1.0-alpha.16...atomium-v0.1.0-alpha.17) (2023-06-26)
 
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@juntossomosmais/atomium",
-  "version": "0.1.0-alpha.17",
+  "version": "0.1.0-alpha.22",
   "description": "Core of web components for Atomium",
   "repository": {
     "type": "git",

diff --git a/packages/core/src/components/button/button.scss b/packages/core/src/components/button/button.scss
@@ -7,6 +7,10 @@
   display: block;
 }
 
+:host(.is-disabled) {
+  pointer-events: none;
+}
+
 .atom-button {
   text-transform: inherit;
 

diff --git a/packages/core/src/components/button/button.tsx b/packages/core/src/components/button/button.tsx
@@ -1,5 +1,5 @@
 import { Mode } from '@ionic/core'
-import { Component, Event, EventEmitter, Host, Prop, h } from '@stencil/core'
+import { Component, Host, Prop, h } from '@stencil/core'
 
 @Component({
   tag: 'atom-button',
@@ -21,17 +21,12 @@ export class AtomButton {
   @Prop() target?: string
   @Prop() type: 'submit' | 'reset' | 'button' = 'button'
 
-  @Event() atomClick: EventEmitter
-
-  private handleClick = () => {
-    this.atomClick.emit()
-  }
-
   render() {
     return (
       <Host
         class={{
           [`expand-${this.expand}`]: !!this.expand,
+          [`is-disabled`]: this.disabled,
         }}
       >
         <ion-button
@@ -52,7 +47,6 @@ export class AtomButton {
           rel={this.rel}
           target={this.target}
           download={this.download}
-          onClick={this.handleClick}
         >
           {this.loading && (
             <span class="loading">

diff --git a/packages/core/src/components/button/stories/button.args.ts b/packages/core/src/components/button/stories/button.args.ts
@@ -5,7 +5,7 @@ import { Category } from '@atomium/storybook-utils/enums/table'
 export const ButtonStoryArgs = {
   parameters: {
     actions: {
-      handles: ['atomClick'],
+      handles: ['click'],
     },
     docs: {
       description: {
@@ -123,13 +123,6 @@ export const ButtonStoryArgs = {
         category: Category.PROPERTIES,
       },
     },
-    atomClick: {
-      action: 'atomClick',
-      description: 'Emitted when the button is clicked.',
-      table: {
-        category: 'Events',
-      },
-    },
   },
 }
 

diff --git a/packages/core/src/components/button/stories/button.core.stories.tsx b/packages/core/src/components/button/stories/button.core.stories.tsx
@@ -75,3 +75,11 @@ export const CircleButton: StoryObj = {
     shape: 'circle',
   },
 }
+
+export const Disabled: StoryObj = {
+  render: (args) => createButton(args),
+  args: {
+    ...Primary.args,
+    disabled: true,
+  },
+}
diff --git a/packages/core/src/components/button/stories/button.react.stories.tsx b/packages/core/src/components/button/stories/button.react.stories.tsx
@@ -74,3 +74,11 @@ export const CircleButton: StoryObj = {
     shape: 'circle',
   },
 }
+
+export const Disabled: StoryObj = {
+  render: (args) => createButton(args),
+  args: {
+    ...Primary.args,
+    disabled: true,
+  },
+}
diff --git a/release-please-config.json b/release-please-config.json
@@ -1,6 +1,6 @@
 {
   "prerelease": true,
-  "release-as": "0.1.0-alpha.21",
+  "release-as": "0.1.0-alpha.22",
   "packages": {
     "packages/core": {},
     "packages/tokens": {}