From 6a051450c2fc0ac06eeee120e6621bc687cbea2e Mon Sep 17 00:00:00 2001 From: Anna Schoderer Date: Tue, 24 Jan 2023 16:42:46 +0100 Subject: [PATCH 1/2] fix: prevent double click events in angular --- .../src/components/button/button.lite.tsx | 3 - .../src/components/card/card.lite.tsx | 3 - packages/components/src/shared/model.ts | 1 - .../src/app/app.component.html | 2 +- .../src/app/app.component.ts | 4 + showcases/react-showcase/src/app.tsx | 176 +++++++++--------- showcases/vue-showcase/src/App.vue | 8 +- 7 files changed, 103 insertions(+), 94 deletions(-) diff --git a/packages/components/src/components/button/button.lite.tsx b/packages/components/src/components/button/button.lite.tsx index 1775eb9a6e8..a68dbae2ad3 100644 --- a/packages/components/src/components/button/button.lite.tsx +++ b/packages/components/src/components/button/button.lite.tsx @@ -36,9 +36,6 @@ export default function DBButton(props: DBButtonProps) { if (props.onClick) { props.onClick(event); } - if (props.click) { - props.click(event); - } } }); diff --git a/packages/components/src/components/card/card.lite.tsx b/packages/components/src/components/card/card.lite.tsx index d8de6ee3dd0..a5cec960a2d 100644 --- a/packages/components/src/components/card/card.lite.tsx +++ b/packages/components/src/components/card/card.lite.tsx @@ -32,9 +32,6 @@ export default function DBCard(props: DBCardProps) { if (props.onClick) { props.onClick(event); } - if (props.click) { - props.click(event); - } } }); diff --git a/packages/components/src/shared/model.ts b/packages/components/src/shared/model.ts index 4afaf88e8c3..703910dd3f6 100644 --- a/packages/components/src/shared/model.ts +++ b/packages/components/src/shared/model.ts @@ -16,7 +16,6 @@ export type GlobalTextProps = { }; export type ClickEventProps = { - click?: (event: any) => void; onClick?: (event: any) => void; }; diff --git a/showcases/angular-current-showcase/src/app/app.component.html b/showcases/angular-current-showcase/src/app/app.component.html index dd6eac4a306..ce85fd76faa 100644 --- a/showcases/angular-current-showcase/src/app/app.component.html +++ b/showcases/angular-current-showcase/src/app/app.component.html @@ -3,7 +3,7 @@

Angular

Test - +
diff --git a/showcases/angular-current-showcase/src/app/app.component.ts b/showcases/angular-current-showcase/src/app/app.component.ts index 9b7f49eb7b1..39c6f5b7b45 100644 --- a/showcases/angular-current-showcase/src/app/app.component.ts +++ b/showcases/angular-current-showcase/src/app/app.component.ts @@ -16,4 +16,8 @@ export class AppComponent { }, { name: 'tab-bar-2', label: '2-Tab2', content: 'Content 2-2' } ]; + + onClick() { + console.log("click button"); + } } diff --git a/showcases/react-showcase/src/app.tsx b/showcases/react-showcase/src/app.tsx index 2b51307fa22..5b5d8e3f8b9 100644 --- a/showcases/react-showcase/src/app.tsx +++ b/showcases/react-showcase/src/app.tsx @@ -6,98 +6,104 @@ import { DBInput } from '../../../output/react/src'; -const App = () => ( -
-

React

- +const App = () => { + + const onClick = (event: any) => { + console.log("test"); + } + + return ( +
+

React

+ +
+ + Test + + + +
+
+
- - Test - - - -
- - -
-
- +
+ - - -
+ + +
-
- - -
+
+ + +
-
- - +
+ + - -
-
-
-); + +
+
+ + );}; export default App; diff --git a/showcases/vue-showcase/src/App.vue b/showcases/vue-showcase/src/App.vue index cd3aa756f6b..164b215a686 100644 --- a/showcases/vue-showcase/src/App.vue +++ b/showcases/vue-showcase/src/App.vue @@ -5,6 +5,12 @@ import { DBCard, DBInput } from "../../../output/vue/vue3/src"; + +function onClick() { + console.log("Button clicked"); +} + +