ngx-payvent-shared 0.0.5 → 0.0.7

package/fesm2022/ngx-payvent-shared.mjs

@@ -691,8 +691,8 @@ class SidebarService {
     openSidebar(component, data = null, options = {}) {
         let defaultPosition = 'bottom';
         if (window.innerWidth < 576) {
-            document.getElementsByTagName("html")[0].style['overscroll-behavior'] = 'none';
-            document.getElementsByTagName("body")[0].style['overscroll-behavior'] = 'none';
+            document.getElementsByTagName("html")[0].style['overflow'] = 'hidden';
+            document.getElementsByTagName("body")[0].style['overflow'] = 'hidden';
             defaultPosition = 'bottom';
         }
         options.position = options.position || defaultPosition;
@@ -761,12 +761,12 @@ class SidebarService {
                 return s;
             closee.visible = false;
             if (s.findIndex(a => a.visible) < 0) {
-                document.getElementsByTagName("html")[0].style['overscroll-behavior'] = 'initial';
-                document.getElementsByTagName("body")[0].style['overscroll-behavior'] = 'initial';
+                document.getElementsByTagName("html")[0].style['overflow'] = 'initial';
+                document.getElementsByTagName("body")[0].style['overflow'] = 'initial';
             }
             return s;
         });
-        timer(300).subscribe(er => {
+        timer(200).subscribe(er => {
             this.sidebars.update(s => {
                 return s.filter(a => a.visible);
                 ;
@@ -2411,10 +2411,16 @@ class SidebarComponent {
         this.sidebarService.closeSidebar(id);
     }
     onPan(evt, id) {
-        console.log(evt);
         switch (evt.type) {
             case 'touchstart':
-                let targetId = evt.target.id;
+                let target = evt.target;
+                // while(target){
+                //   if(target.scrollTop>0 && this.#deltaScroll < 0)
+                //     return;
+                //   if(target.scrollTop + target.clientHeight > target.scrollHeight && this.#deltaScroll > 0)
+                //     return;
+                //   target = target.parentElement;
+                // }
                 this.panElement = document.querySelector(`#sidebar-${id}`);
                 this.panElement.style.transition = 'none';
                 this.initialHeight = this.panElement.offsetHeight;
@@ -2425,6 +2431,18 @@ class SidebarComponent {
                 if (!this.panElement)
                     return;
                 this.#deltaScroll = this.#initialY - evt.touches[0].clientY;
+                let target2 = evt.target;
+                while (target2) {
+                    if (target2.scrollTop > 0 && this.#deltaScroll < 0) {
+                        this.#initialY = evt.touches[0].clientY;
+                        return;
+                    }
+                    if (target2.scrollTop > 0 && target2.scrollTop + target2.clientHeight < target2.scrollHeight && this.#deltaScroll > 0) {
+                        this.#initialY = evt.touches[0].clientY;
+                        return;
+                    }
+                    target2 = target2.parentElement;
+                }
                 if (this.#deltaScroll < 0 && this.contentComponent.nativeElement.scrollTop > 0) {
                     this.panElement = null;
                     return;