chrv-components 1.12.132 → 1.12.134

package/fesm2022/chrv-components.mjs

@@ -4071,31 +4071,17 @@ class ChrPopoverDirective {
             });
         };
         this.setupSubject = () => {
-            combineLatest([
-                this.isHostHovered$,
-                this.isTargetHovered$,
-                this.lastKnowMousePosition,
-            ])
-                .pipe(map(([hostHovered, targetHovered, mouse]) => hostHovered.hover ||
+            combineLatest([this.isHostHovered$, this.isTargetHovered$])
+                .pipe(map(([hostHovered, targetHovered]) => hostHovered.hover ||
                 targetHovered.hover ||
-                this.isPointerInsideElements(mouse.x, mouse.y)), switchMap((isInside) => {
-                if (isInside) {
-                    return of(true);
-                }
-                else {
-                    return timer(100).pipe(map(() => false));
-                }
-            }), takeUntilDestroyed(this.destroyRef))
+                this.isInsideHost(hostHovered.position?.x, hostHovered.position.y) ||
+                this.isInsideTarget(targetHovered.position?.x, targetHovered.position.y)), switchMap((isInside) => timer(100).pipe(map(() => isInside))), takeUntilDestroyed(this.destroyRef))
                 .subscribe((isInside) => {
-                if (isInside) {
-                    if (!this.isOpen()) {
-                        this.showPopover();
-                    }
+                if (isInside && !this.isOpen()) {
+                    this.showPopover();
                 }
                 else {
-                    if (this.isOpen()) {
-                        this.hidePopover();
-                    }
+                    this.hidePopover();
                 }
             });
         };
@@ -4171,6 +4157,14 @@ class ChrPopoverDirective {
         this.isInsideRect = (x, y, rect) => {
             return (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom);
         };
+        this.isInsideHost = (x, y) => {
+            const rect = this.hostElement().getBoundingClientRect();
+            return this.isInsideRect(x, y, rect);
+        };
+        this.isInsideTarget = (x, y) => {
+            const rect = this.targetElement().getBoundingClientRect();
+            return this.isInsideRect(x, y, rect);
+        };
         this.isPointerInsideElements = (x, y) => {
             // private isPointerInsideElements = (event: MouseEvent): boolean => {
             const hostRect = this.hostElement().getBoundingClientRect();