From 795a273c9cde2a47c8a53e81a1b1efeb3ad81ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Sat, 15 Jan 2022 19:18:38 +0200 Subject: [PATCH 1/2] Wrap input with action in form --- .../input-with-action/input-with-action.component.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/inputs/input-with-action/input-with-action.component.html b/src/lib/inputs/input-with-action/input-with-action.component.html index 8591c2b..713bb9c 100644 --- a/src/lib/inputs/input-with-action/input-with-action.component.html +++ b/src/lib/inputs/input-with-action/input-with-action.component.html @@ -1,8 +1,9 @@ -
+
-
+ From ff9dad3ce73c2485a64e3418f24334f4c44f7c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Sat, 15 Jan 2022 19:42:12 +0200 Subject: [PATCH 2/2] Input with action fixes --- .../inputs/input-with-action/input-with-action.component.html | 3 +-- .../inputs/input-with-action/input-with-action.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/inputs/input-with-action/input-with-action.component.html b/src/lib/inputs/input-with-action/input-with-action.component.html index 713bb9c..2859049 100644 --- a/src/lib/inputs/input-with-action/input-with-action.component.html +++ b/src/lib/inputs/input-with-action/input-with-action.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/lib/inputs/input-with-action/input-with-action.component.ts b/src/lib/inputs/input-with-action/input-with-action.component.ts index 7bd26f3..3ebf3be 100644 --- a/src/lib/inputs/input-with-action/input-with-action.component.ts +++ b/src/lib/inputs/input-with-action/input-with-action.component.ts @@ -27,7 +27,7 @@ export class InputWithActionComponent { } get isSearch(): boolean { - return this.action.observers.length === 0; + return !this.icon; } reset(): void { @@ -37,7 +37,7 @@ export class InputWithActionComponent { } executeAction($event: MouseEvent): void { - $event.stopPropagation(); + $event?.stopPropagation(); if (this.hasContent) { this.action.emit(this.value);