Merge pull request #35 from HideyoshiNakazone/devel

Devel - Fixes clicked outside

.github/workflows/docker-publish.yml

@@ -28,9 +28,9 @@ jobs:
 
   docker:
 
-
     needs: [build]
     runs-on: ubuntu-latest
+    
     steps:
 
       - name: Login to DockerHub

server.js

@@ -10,7 +10,7 @@ app.use(cors());
 app.use(express.static(`${__dirname}/dist/${PKG_NAME}`));
 
 app.get('/*', (req, res) => {
-res.sendFile(path.join(`${__dirname}/dist/${PKG_NAME}/index.html`));
+    res.sendFile(path.join(`${__dirname}/dist/${PKG_NAME}/index.html`));
 });
 
 app.listen(process.env.PORT || 5000);

src/app/footer/footer.component.html

@@ -30,7 +30,7 @@
 
     <!-- Copyright -->
     <div class="text-center p-3" style="background-color: #2E2E2E;">
-        © 2020 Copyright:
+        © 2023 Copyright:
         <a class="text-white" href="https://hideyoshi.com.br/">Hideyoshi Solutions</a>
     </div>
     <!-- Copyright -->

src/app/shared/directive/clicked-outside/clicked-outside.directive.ts

@@ -28,16 +28,17 @@ export class ClickedOutsideDirective implements AfterViewInit, OnDestroy {
 
     ngAfterViewInit(): void {
 
-        const mouseDownListener$ = fromEvent(document, 'mousedown');
-        const mouseUpListener$ = fromEvent(document,'mouseup');
+        const clickListener$ = fromEvent(this.document, 'click');
 
-        this.eventListener = mouseUpListener$.pipe(
-            combineLatestWith(mouseDownListener$),
-            filter(([downClick, upClick]) => {
-                return (downClick.target as HTMLElement)
-                .contains(this.element.nativeElement) && (!this.isInside(
-                    upClick.target as HTMLElement
-                    ) || this.includedList(upClick.target as HTMLElement));
+        this.eventListener = clickListener$.pipe(
+            filter((click) => {
+                return (
+                    (
+                        this.isOutside(click.target as HTMLElement) ||
+                        this.isInIncludedList(click.target as HTMLElement)
+                    ) &&
+                    this.notInIgnoredList(click.target as HTMLElement)
+                );
             })
         ). subscribe( () => {
             !this.clickOutsideStopWatching && this.clickOutside.emit();
@@ -49,31 +50,44 @@ export class ClickedOutsideDirective implements AfterViewInit, OnDestroy {
         this.eventListener?.unsubscribe();
     }
 
-    private isInside(elementToCheck: HTMLElement): boolean {
-        return (
-            elementToCheck === this.element.nativeElement 
-                || this.element.nativeElement.contains(elementToCheck) 
-                || (this.ignoreElementList && this.checkIgnoredList(elementToCheck))
-
-        );
+    private isOutside(elementToCheck: HTMLElement): boolean {
+        let status = true;
+        if (this.element.nativeElement === elementToCheck ||
+            this.element.nativeElement.contains(elementToCheck)) {
+            status = false;
         }
 
-    private checkIgnoredList(elementToCheck: HTMLElement): boolean {
-        return this.ignoreElementList.some(
-            (ignoreElement) => {
-                return ignoreElement === elementToCheck ||
-                    ignoreElement.contains(elementToCheck)
-            }
-        )
+        console.log('isOutside', status)
+
+        return status;
     }
 
-    private includedList(elementToCheck: HTMLElement): boolean {
-        return this.includeClickedOutside && this.includeClickedOutside.some(
-            (includedElement) => {
-                return includedElement === elementToCheck ||
-                includedElement.contains(elementToCheck)
+    private notInIgnoredList(elementToCheck: HTMLElement): boolean {
+        if (!this.ignoreElementList || this.ignoreElementList.length === 0) {
+            return false;
         }
-        )
+
+        let validateIsIgnored = (ignoreElement: HTMLDivElement): boolean => {
+            return ignoreElement === elementToCheck
+                || ignoreElement.contains(elementToCheck)
+                || elementToCheck.contains(ignoreElement)
+        }
+
+        return !this.ignoreElementList.some(validateIsIgnored)
+    }
+
+    private isInIncludedList(elementToCheck: HTMLElement): boolean {
+        if (!this.includeClickedOutside || this.includeClickedOutside.length === 0) {
+            return false;
+        }
+
+        let validateIsIncluded = (includedElement: HTMLDivElement): boolean => {
+            return includedElement === elementToCheck
+                || includedElement.contains(elementToCheck)
+                || elementToCheck.contains(includedElement)
+        }
+
+        return !this.includeClickedOutside.some(validateIsIncluded)
     }
 
 }