From bef58a048d68d282c674f23b8da9caeb61259dbd Mon Sep 17 00:00:00 2001 From: Felipe Fialho Date: Mon, 17 Jul 2023 14:28:04 -0300 Subject: [PATCH 1/3] fix(button): remove atom click and avoid native click when disabled (#186) --- packages/core/src/components/button/button.scss | 4 ++++ packages/core/src/components/button/button.tsx | 10 ++-------- .../core/src/components/button/stories/button.args.ts | 9 +-------- .../components/button/stories/button.core.stories.tsx | 8 ++++++++ .../components/button/stories/button.react.stories.tsx | 8 ++++++++ 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/packages/core/src/components/button/button.scss b/packages/core/src/components/button/button.scss index a9ed31533..6a7e5cf58 100644 --- 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 index 403a2b0d9..1e56c9e4e 100644 --- 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 ( {this.loading && ( diff --git a/packages/core/src/components/button/stories/button.args.ts b/packages/core/src/components/button/stories/button.args.ts index 4ff40e138..303ae3095 100644 --- 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 index 333b7af1c..66c4d833f 100644 --- 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 index bd058b4cf..b57d76df0 100644 --- 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, + }, +} From ef7dc9abb75e1f67b3ae6b2ebd0ac3cfd3d6e9fc Mon Sep 17 00:00:00 2001 From: felipefialho Date: Mon, 17 Jul 2023 14:42:17 -0300 Subject: [PATCH 2/3] chore: bump to 0.1.0-alpha.22 --- release-please-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index c552eaf2b..d3cfadd31 100644 --- 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": {} From 0e7d341573c399a46485ba432f431f8ad4785885 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:44:08 -0300 Subject: [PATCH 3/3] chore: release main (#187) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- packages/core/CHANGELOG.md | 7 +++++++ packages/core/package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index da3d73f80..70720fcbb 100644 --- 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 index 6d877eb15..3e9521c73 100644 --- 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 index 3bcdbd78b..d9c0d14e6 100644 --- 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",