Merge branch 'next' into f/fix-dropdown-hints

bullhorn · Dec 2, 2022 · f3d29a3 · f3d29a3
2 parents 1f62873 + 5ee7db1
commit f3d29a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/projects/novo-elements/src/elements/button/Button.ts b/projects/novo-elements/src/elements/button/Button.ts
@@ -1,6 +1,6 @@
 // NG2
-import { ChangeDetectionStrategy, Component, ElementRef, HostBinding, Input } from '@angular/core';
-import { BooleanInput } from '../../utils/decorators';
+import { ChangeDetectionStrategy, Component, ElementRef, HostBinding, HostListener, Input } from '@angular/core';
+import { BooleanInput, Helpers, Key } from '../../utils';
 
 @Component({
   selector: 'novo-button,button[theme]',
@@ -111,6 +111,13 @@ export class NovoButtonElement {
 
   constructor(public element: ElementRef) {}
 
+  @HostListener('keydown', ['$event'])
+  handleKeydown(event: KeyboardEvent) {
+    if ((Key.Enter === event.key || Key.Space === event.key) && (this.disabled || this.loading)) {
+      Helpers.swallowEvent(event);
+    }
+  }
+
   /** Focuses the input. */
   focus(options?: FocusOptions): void {
     this.element.nativeElement.focus(options);

diff --git a/projects/novo-examples/src/components/buttons/button-dynamic/button-dynamic-example.ts b/projects/novo-examples/src/components/buttons/button-dynamic/button-dynamic-example.ts
@@ -17,5 +17,6 @@ export class ButtonDynamicExample {
   changeTheme() {
     const i = Math.floor(Math.random() * 4);
     this.theme = ['primary', 'secondary', 'dialogue', 'standard', 'icon'][i];
+    console.log('changed theme to', this.theme);
   }
 }
diff --git a/projects/novo-examples/src/components/buttons/button-loading/button-loading-example.ts b/projects/novo-examples/src/components/buttons/button-loading/button-loading-example.ts
@@ -12,6 +12,7 @@ export class ButtonLoadingExample {
   loading: boolean = false;
   loadingButtonText: string = 'Delete';
   fakeRequest() {
+    console.log('making fake request');
     this.loading = true;
     this.loadingButtonText = this.loading ? 'Removing... ' : 'Delete';
     setTimeout(() => {