rails_modal_manager 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2f67902f2a1a7d3f98a0318b84ebd2adeeec5d1d8067ead263ea394fc76d64a
-  data.tar.gz: 88ab650eaaf8eb145a1fe7844dec22acf2e0e61381e2e1217ee172fea6bee283
+  metadata.gz: 07e612cdd8425a4042524c46b43900aae571126866f8b6816a6f4b3174941cdc
+  data.tar.gz: ac92ca48a207e80b7a00bbcf2346820ec6bfaa9dd94ad2c07840331fdc109ed4
 SHA512:
-  metadata.gz: 120b2415ca136f031f10805151f948e6616754c2e6c07c303fb115f9f87f56f66037688f93fbfd95398a3612d79f84f0c398e006654f434222b5304cfb1fa3d8
-  data.tar.gz: 29edd0abdbc5cf321eb818366a86998e18cdc3dce2b39cf37e5a4ba75866224e8b8750adbc32548167ddefa217302a86a518de6610eeb6dbe659b397791cb063
+  metadata.gz: d1a29aa6ff0dc96b8acd0f503b325eeba85f6961b3cb28be80f62a0f3af2061be43b7c9488a1b1e3d4e5e6bfb9b0929afb96794070af2db202145c882f409762
+  data.tar.gz: feaa856f515612f6080bd5f51c3b1b8ed18b877992df59013143b280644e5af3622fba89537d4ad1b2bddd6aa14ebd4ebb0f92bf1a461f060dbc31f8697f6951

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

@@ -186,11 +186,10 @@ export default class extends Controller {
 
     // Remove from history stack (unless closed by history)
     if (this.enableHistoryStackValue && source !== 'history') {
-      // Remove descendants from history first (in reverse order)
-      [...descendants].reverse().forEach(descId => {
-        historyStackManager.removeHisData('modal', descId)
-      })
-      historyStackManager.removeHisData('modal', modalId)
+      // Collect all modal IDs to remove (descendants + current modal)
+      const allIdsToRemove = [...[...descendants].reverse(), modalId]
+      // Remove all at once with single history.go() call
+      historyStackManager.removeMultipleHisData('modal', allIdsToRemove)
     }
 
     // Close all descendants first (in reverse order - newest first)
@@ -673,16 +672,14 @@ export default class extends Controller {
     // Minimize entire group if has parent
     modalStore.minimizeModalGroup(modalId)
 
-    // Remove from history stack (use removeHisData to sync browser history)
+    // Remove from history stack (use removeMultipleHisData to sync browser history)
     if (this.enableHistoryStackValue) {
       const rootId = modalStore.getRootModal(modalId)
       const descendants = modalStore.getAllDescendants(rootId)
-      const allModalIds = [rootId, ...descendants]
+      const allModalIds = [rootId, ...descendants].reverse()
 
-      // Remove in reverse order (newest first)
-      allModalIds.reverse().forEach(id => {
-        historyStackManager.removeHisData('modal', id)
-      })
+      // Remove all at once with single history.go() call
+      historyStackManager.removeMultipleHisData('modal', allModalIds)
     }
 
     this.dispatch('minimize', { detail: { modalId: modalId } })

data/app/javascript/rails_modal_manager/history_stack_manager.js

@@ -199,6 +199,55 @@ function silentRemoveHisData(type, id) {
   return true;
 }
 
+/**
+ * Remove multiple items from history stack at once
+ * - Remove all specified items from stack
+ * - Remove functions from closeFunctions (memory cleanup)
+ * - Synchronize browser history with single history.go(-count) call
+ *
+ * @param {string} type - Target type
+ * @param {string[]} ids - Array of target IDs to remove
+ * @returns {number} Number of items successfully removed
+ */
+function removeMultipleHisData(type, ids) {
+  if (typeof window === 'undefined') return 0;
+  if (!isEnabledForDevice(type)) return 0;
+  if (!ids || ids.length === 0) return 0;
+
+  const hisData = loadHisData();
+  let removedCount = 0;
+
+  // Remove each item silently (without history.back)
+  ids.forEach(id => {
+    const index = hisData.findIndex(
+      (item) => item.type === type && item.id === id
+    );
+
+    if (index !== -1) {
+      const item = hisData[index];
+
+      // Remove function from closeFunctions (memory cleanup)
+      if (item.closeKey) {
+        closeFunctions.delete(item.closeKey);
+      }
+
+      // Remove item from stack
+      hisData.splice(index, 1);
+      removedCount++;
+    }
+  });
+
+  if (removedCount > 0) {
+    saveHisData(hisData);
+
+    // Synchronize browser history with single call
+    isDirectClose = true;
+    window.history.go(-removedCount);
+  }
+
+  return removedCount;
+}
+
 /**
  * Remove last item from history stack and execute close function (used for back button)
  * @returns {Object|null} Closed item info or null
@@ -310,6 +359,7 @@ const historyStackManager = {
   // Core functions
   addHisData,
   removeHisData,
+  removeMultipleHisData,
   silentRemoveHisData,
   popHisData,
 

data/lib/rails_modal_manager/version.rb

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

metadata

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