chrv-components 1.12.129 → 1.12.130

package/fesm2022/chrv-components.mjs

@@ -4065,15 +4065,11 @@ class ChrPopoverDirective {
         // };
         this.setupSubject = () => {
             combineLatest([this.isHostHovered$, this.isTargetHovered$])
-                .pipe(map(([hostHovered, targetHovered]) => hostHovered || targetHovered), 
-            // 3. switchMap gère le délai d'attente à la fermeture
-            switchMap((isInside) => {
+                .pipe(map(([hostHovered, targetHovered]) => hostHovered || targetHovered), switchMap((isInside) => {
                 if (isInside) {
-                    // Entrée immédiate : annule toute temporisation précédente
                     return of(true);
                 }
                 else {
-                    // Sortie : temporise de 100ms avant d'émettre false
                     return timer(100).pipe(map(() => false));
                 }
             }), takeUntilDestroyed(this.destroyRef))
@@ -4106,6 +4102,9 @@ class ChrPopoverDirective {
                 //   }
                 // }, 100);
                 // this.isInsidePopover$.next(false);
+                if (this.isPointerInsideElements(event)) {
+                    return;
+                }
                 this.isHostHovered$.next(false);
             });
         };
@@ -4119,6 +4118,9 @@ class ChrPopoverDirective {
             this.renderer.listen(this.targetElement(), 'mouseleave', (event) => {
                 // this.isInsideTarget.set(false);
                 // this.isInsidePopover$.next(false);
+                if (this.isPointerInsideElements(event)) {
+                    return;
+                }
                 this.isTargetHovered$.next(false);
                 // setTimeout(() => {
                 //   if (!this.isInsideHost() && !this.isInsideTargetBoundingBox(event))
@@ -4136,6 +4138,16 @@ class ChrPopoverDirective {
             // this.isInsidePopover$.next(false);
             this.targetElement().hidePopover();
         };
+        this.isInsideRect = (event, rect) => {
+            const x = event.clientX;
+            const y = event.clientY;
+            return (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom);
+        };
+        this.isPointerInsideElements = (event) => {
+            const hostRect = this.hostElement().getBoundingClientRect();
+            const targetRect = this.targetElement().getBoundingClientRect();
+            return (this.isInsideRect(event, hostRect) || this.isInsideRect(event, targetRect));
+        };
     }
     ngOnInit() {
         const maybeTemplate = this.chrPopover();