rails_modal_manager 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 736e63cc3f81769e168c0945753f8cc1f2f4a8e840fb18a6768f10a76e80f7cc
-  data.tar.gz: 8d4cd784e878b2ff7fd5baca62d25c8b9fbd0aefc53caae82f86710805a2f4b5
+  metadata.gz: 9ddfd329fb8f4ef8eff88d5d5d3284dcf02c9739d153252c0647e118433bb446
+  data.tar.gz: 37ae27aab69556b2d49037873677753002898892fad7ec3aec7671b1d08a25fa
 SHA512:
-  metadata.gz: 235e07f2e6e39617031bf18115bbf775345488aa369331acf2803cd12a0607464b2b4e2507c807957665e85b67731850ee7f84db37b034b00e53cd83773e950f
-  data.tar.gz: b9aca2397fdeb003b14ba3f368f76cb60aed7744486534df7fb81de688730b0c5c58144c297a30bb90df98166229b05cb745ef8ef7e00a88db3972b3d68e8c7c
+  metadata.gz: 2871ebeb6b3dc8ff22beef165fb488b0c4acd8cb674faa8167c6b41d464cbd121ddb2ab17b811e28faf893a10b19f34a918139369eb4ab88f5346931bcb41c94
+  data.tar.gz: 10008b13adf85eea1729b346e228059ada4a849958dc08ea8f04c787f4cd4d930bcf938e5323fdc57ae55d5f9e2795bd5ed98436b5c267d89b7280ce24423db9

data/app/javascript/rails_modal_manager/controllers/rmm_modal_controller.js

@@ -345,6 +345,9 @@ export default class extends Controller {
     const modal = this.element
     const overlay = this.getOverlay()
 
+    // Reset sidebar and submenu to first item before hiding
+    this.resetSidebarAndSubmenu()
+
     modal.classList.remove('rmm-active')
     if (overlay) overlay.classList.remove('rmm-active')
 
@@ -359,6 +362,38 @@ export default class extends Controller {
     }, this.animationDurationValue)
   }
 
+  /**
+   * Reset sidebar and submenu controllers to first item
+   * Called when modal is closed to ensure clean state on next open
+   */
+  resetSidebarAndSubmenu() {
+    const modal = this.element
+
+    // Reset sidebar controller
+    const sidebarElement = modal.querySelector('[data-controller*="rmm-sidebar"]')
+    if (sidebarElement) {
+      const sidebarController = this.application.getControllerForElementAndIdentifier(
+        sidebarElement,
+        'rmm-sidebar'
+      )
+      if (sidebarController && typeof sidebarController.resetToFirst === 'function') {
+        sidebarController.resetToFirst()
+      }
+    }
+
+    // Reset all submenu controllers
+    const submenuElements = modal.querySelectorAll('[data-controller*="rmm-submenu"]')
+    submenuElements.forEach(submenuElement => {
+      const submenuController = this.application.getControllerForElementAndIdentifier(
+        submenuElement,
+        'rmm-submenu'
+      )
+      if (submenuController && typeof submenuController.resetToFirst === 'function') {
+        submenuController.resetToFirst()
+      }
+    })
+  }
+
   // ============================================
   // Styles
   // ============================================

data/app/javascript/rails_modal_manager/controllers/rmm_sidebar_controller.js

@@ -40,14 +40,10 @@ export default class extends Controller {
       this.element.classList.add('rmm-sidebar-collapsed')
     }
 
-    // Find initial active item and restore its state
+    // Find initial active item
     const activeItem = this.element.querySelector('.rmm-sidebar-item.rmm-active')
     if (activeItem) {
       this.currentItemId = activeItem.dataset.itemId
-      // Restore panel and submenu state for the active item
-      // This ensures content is properly displayed when modal is reopened
-      this.switchPanel(activeItem)
-      this.switchSubmenuGroup(activeItem)
     }
 
     // Listen for toggle event from header button
@@ -205,4 +201,28 @@ export default class extends Controller {
     this.collapsedValue = true
     this.element.classList.add('rmm-sidebar-collapsed')
   }
+
+  /**
+   * Reset sidebar to first item
+   * Called by modal controller when modal is closed
+   */
+  resetToFirst() {
+    const firstItem = this.element.querySelector('.rmm-sidebar-item')
+    if (!firstItem) return
+
+    // Remove active from all items
+    this.element.querySelectorAll('.rmm-sidebar-item').forEach(el => {
+      el.classList.remove('rmm-active')
+    })
+
+    // Add active to first item
+    firstItem.classList.add('rmm-active')
+    this.currentItemId = firstItem.dataset.itemId
+
+    // Switch content panel
+    this.switchPanel(firstItem)
+
+    // Switch submenu group
+    this.switchSubmenuGroup(firstItem)
+  }
 }

data/app/javascript/rails_modal_manager/controllers/rmm_submenu_controller.js

@@ -45,17 +45,10 @@ export default class extends Controller {
     this.ajaxCache = new Map()
     this.currentItemId = null
 
-    // Find initial active item and restore its state
+    // Find initial active item
     const activeItem = this.element.querySelector('.rmm-submenu-item.rmm-active')
     if (activeItem) {
       this.currentItemId = activeItem.dataset.itemId
-      // Restore panel state for the active item
-      // This ensures content is properly displayed when modal is reopened
-      if (this.loadModeValue === 'ajax') {
-        this.loadAjaxContent(activeItem)
-      } else {
-        this.switchPanel(activeItem)
-      }
     }
   }
 
@@ -235,4 +228,32 @@ export default class extends Controller {
       }
     }
   }
+
+  /**
+   * Reset submenu to first item
+   * Called by modal controller when modal is closed
+   */
+  resetToFirst() {
+    const firstItem = this.element.querySelector('.rmm-submenu-item')
+    if (!firstItem) return
+
+    // Remove active from all items
+    this.element.querySelectorAll('.rmm-submenu-item').forEach(el => {
+      el.classList.remove('rmm-active')
+    })
+
+    // Add active to first item
+    firstItem.classList.add('rmm-active')
+    this.currentItemId = firstItem.dataset.itemId
+
+    // Switch panel
+    if (this.loadModeValue === 'ajax') {
+      this.loadAjaxContent(firstItem)
+    } else {
+      this.switchPanel(firstItem)
+    }
+
+    // Clear AJAX cache
+    this.ajaxCache.clear()
+  }
 }

data/lib/rails_modal_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsModalManager
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_modal_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - reshacs