@social-mail/social-mail-client 1.8.431 → 1.8.433

package/node_modules/@web-atoms/web-controls/src/mobile-app/MobileApp.tsx

@@ -12,7 +12,7 @@ import { BindableProperty } from "@web-atoms/core/dist/core/BindableProperty";
 import { AtomDisposableList } from "@web-atoms/core/dist/core/AtomDisposableList";
 import Bind from "@web-atoms/core/dist/core/Bind";
 import { CancelToken, IDisposable } from "@web-atoms/core/dist/core/types";
-import { ChildEnumerator } from "@web-atoms/core/dist/web/core/AtomUI";
+import { AncestorEnumerator, ChildEnumerator } from "@web-atoms/core/dist/web/core/AtomUI";
 import { displayRouteSymbol, routeSymbol } from "@web-atoms/core/dist/core/Command";
 import Route from "@web-atoms/core/dist/core/Route";
 
@@ -36,12 +36,13 @@ export class Drawer extends AtomControl {
         this.element.dataset.drawerPage = "drawer-page";
         this.bindEvent(this.element, "click", (e: Event) => {
             const target = e.target as HTMLInputElement;
-            if (/input/i.test(target.tagName) && !/button|submit/i.test(target.type)) {
+            if (e.defaultPrevented) {
                 return;
             }
-            if(e.defaultPrevented) {
-                this.closeDrawer();
+            if (/input/i.test(target.tagName) && !/button|submit/i.test(target.type)) {
+                return;
             }
+            this.closeDrawer();
         });
         this.runAfterInit(() => this.app.runAsync(() => this.init?.()));
     }
@@ -591,6 +592,10 @@ export default class MobileApp extends AtomControl {
                     if (de.defaultPrevented) {
                         return;
                     }
+                    const target = de.target as HTMLElement;
+                    if(AncestorEnumerator.find(target, (x) => x === drawerPage.element)) {
+                        return;
+                    }
                     de.target.dispatchEvent(new CustomEvent("closeDrawer", { bubbles: true }));
                 };
                 this.element.appendChild(drawerPage.element);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.8.431",
+  "version": "1.8.433",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "@web-atoms/email-dom": "^1.0.33",
     "@web-atoms/entity": "^2.5.2",
     "@web-atoms/module-loader": "^2.1.90",
-    "@web-atoms/web-controls": "^2.5.3",
+    "@web-atoms/web-controls": "^2.5.5",
     "reflect-metadata": "^0.1.13",
     "tinycolor2": "^1.6.0"
   },