admin-lte 4.0.0-rc2 → 4.0.0-rc4

package/src/ts/adminlte.ts

@@ -8,7 +8,7 @@ import PushMenu from './push-menu.js'
 import { initAccessibility } from './accessibility.js'
 
 /**
- * AdminLTE v4.0.0-rc1
+ * AdminLTE v4.0.0-rc3
  * Author: Colorlib
  * Website: AdminLTE.io <https://adminlte.io>
  * License: Open source - MIT <https://opensource.org/licenses/MIT>

package/src/ts/push-menu.ts

@@ -150,12 +150,24 @@ onDOMContentLoaded(() => {
   sidebarOverlay.className = CLASS_NAME_SIDEBAR_OVERLAY
   document.querySelector(SELECTOR_APP_WRAPPER)?.append(sidebarOverlay)
 
-  sidebarOverlay.addEventListener('touchstart', event => {
-    event.preventDefault()
-    const target = event.currentTarget as HTMLElement
-    const data = new PushMenu(target, Defaults)
-    data.collapse()
+  let isTouchMoved = false
+
+  sidebarOverlay.addEventListener('touchstart', () => {
+    isTouchMoved = false
   }, { passive: true })
+
+  sidebarOverlay.addEventListener('touchmove', () => {
+    isTouchMoved = true
+  }, { passive: true })
+
+  sidebarOverlay.addEventListener('touchend', event => {
+    if (!isTouchMoved) {
+      event.preventDefault()
+      const target = event.currentTarget as HTMLElement
+      const data = new PushMenu(target, Defaults)
+      data.collapse()
+    }
+  }, { passive: false })
   sidebarOverlay.addEventListener('click', event => {
     event.preventDefault()
     const target = event.currentTarget as HTMLElement

package/src/ts/treeview.ts

@@ -119,17 +119,28 @@ onDOMContentLoaded(() => {
       const target = event.target as HTMLElement
       const targetItem = target.closest(SELECTOR_NAV_ITEM) as HTMLElement | undefined
       const targetLink = target.closest(SELECTOR_NAV_LINK) as HTMLAnchorElement | undefined
+      const lteToggleElement = event.currentTarget as HTMLElement
 
       if (target?.getAttribute('href') === '#' || targetLink?.getAttribute('href') === '#') {
         event.preventDefault()
       }
 
       if (targetItem) {
-        const data = new Treeview(targetItem, Default)
+        // Read data attributes
+        const accordionAttr = lteToggleElement.dataset.accordion
+        const animationSpeedAttr = lteToggleElement.dataset.animationSpeed
+
+        // Build config from data attributes, fallback to Default
+        const config: Config = {
+          accordion: accordionAttr === undefined ? Default.accordion : accordionAttr === 'true',
+          animationSpeed: animationSpeedAttr === undefined ? Default.animationSpeed : Number(animationSpeedAttr)
+        }
+
+        const data = new Treeview(targetItem, config)
         data.toggle()
       }
     })
   })
 })
 
-export default Treeview
+export default Treeview