feat(label): capture all events on signpost

vmware-clarity · Sep 8, 2023 · 4d5c056 · 4d5c056
1 parent f9c41c0
commit 4d5c056
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/projects/angular/clarity.api.md b/projects/angular/clarity.api.md
@@ -2504,7 +2504,11 @@ export class ClrLabel implements OnInit, OnDestroy {
     ngOnInit(): void;
     onClick(event: any): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<ClrLabel, "label", never, { "forAttr": "for"; }, {}, never, never, false, never>;
+    preventOnSignpostTarget(event: any): void;
+    // (undocumented)
+    signpost: ElementRef;
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<ClrLabel, "label", never, { "forAttr": "for"; }, {}, ["signpost"], never, false, never>;
     // (undocumented)
     static ɵfac: i0.ɵɵFactoryDeclaration<ClrLabel, [{ optional: true; }, { optional: true; }, { optional: true; }, null, null]>;
 }

diff --git a/projects/angular/src/forms/common/label.ts b/projects/angular/src/forms/common/label.ts
@@ -5,6 +5,7 @@
  */
 
 import {
+  ContentChild,
   Directive,
   ElementRef,
   HostBinding,
@@ -17,6 +18,7 @@ import {
 } from '@angular/core';
 import { Subscription } from 'rxjs';
 
+import { ClrSignpost } from '../../popover';
 import { ControlIdService } from './providers/control-id.service';
 import { LayoutService } from './providers/layout.service';
 import { NgControlService } from './providers/ng-control.service';
@@ -25,6 +27,8 @@ import { NgControlService } from './providers/ng-control.service';
   selector: 'label',
 })
 export class ClrLabel implements OnInit, OnDestroy {
+  @ContentChild(ClrSignpost, { read: ElementRef }) signpost: ElementRef;
+
   @Input('for') @HostBinding('attr.for') forAttr: string;
 
   private enableGrid = true;
@@ -49,9 +53,7 @@ export class ClrLabel implements OnInit, OnDestroy {
    */
   @HostListener('click', ['$event'])
   onClick(event) {
-    if (event.target.hasAttribute('clrSignpostTrigger')) {
-      event.preventDefault();
-    }
+    this.preventOnSignpostTarget(event);
   }
 
   ngOnInit() {
@@ -82,4 +84,10 @@ export class ClrLabel implements OnInit, OnDestroy {
   disableGrid() {
     this.enableGrid = false;
   }
+
+  preventOnSignpostTarget(event) {
+    if (this.signpost && this.signpost.nativeElement && this.signpost.nativeElement.contains(event.target)) {
+      event.preventDefault();
+    }
+  }
 }