rails_modal_manager 1.0.39 → 1.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72c6ffe5c9f3e50fff79422b1807782c9f7ec6b8d2e24c7f3bce5b4ed82e908
-  data.tar.gz: 118f90d8a19326d558115e337c6664d4c6e0ea5daeae119fcf10fbf2848a9f15
+  metadata.gz: 0df266d9e80cbe4f6999522dfc7d42dd07614651f4e85fca57cd43bd59bd1f56
+  data.tar.gz: fd760622af26da416a71bf8928ae5247db821de551111f6b60d54c9f9462b01b
 SHA512:
-  metadata.gz: b901dc36606b53e8397779b2220fa860798abd4c2968067c3ce2c32140648f1ae98da01206f54498d9005454867c96260ca7166ca3beef91498d31bf4a7d8963
-  data.tar.gz: 6565408604feecc0dd2990d65a7fde29c672446e4ad35f31301a61d31866589b6482266f88c02921fa0920b7505b1046ac9b6cd871aecad8f532960bec0cdb50
+  metadata.gz: b121a1d40ea4d3f3f368e4f3cf69de017f2afa3fc999c3bc03377a376d0011912d970966e34d6d5310e42d5c65c2dc8aeeb1c5b398bfb7b53da14d5459d48a15
+  data.tar.gz: 169d8b9067a9ea55f0749324e1a349a634f0741a42c776b30e9410478dc20e6d0f1be3f50d2f0c30a048a4a00a45ee2cc9db92f10e1759de3817294e2b2e2fde

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

@@ -240,9 +240,19 @@ export default class extends Controller {
     e.stopPropagation()
     const modalId = e.currentTarget.dataset.modalId
     if (modalId) {
-      const confirmed = window.confirm('이 모달을 닫으시겠습니까?')
-      if (confirmed) {
-        modalStore.closeModalWithDescendants(modalId)
+      // 해당 그룹이 복구된 상태인지 확인
+      const groups = modalStore.getMinimizedModalGroups()
+      const group = groups.find(g => g.rootModalId === modalId)
+
+      if (group && group.isRestored) {
+        // 복구된 상태: taskbar에서만 제거, 모달은 유지
+        modalStore.clearMinimizedStateGroup(modalId)
+      } else {
+        // 최소화 상태: 확인 후 모달 닫기
+        const confirmed = window.confirm('이 모달을 닫으시겠습니까?')
+        if (confirmed) {
+          modalStore.closeModalWithDescendants(modalId)
+        }
       }
     }
   }

data/app/javascript/rails_modal_manager/modal_store.js

@@ -575,6 +575,29 @@ class ModalStore {
     this.notify();
   }
 
+  /**
+   * Clear minimized state for a modal group (remove from taskbar but keep modal open)
+   * Used when closing taskbar item for a restored (visible) modal
+   * @param {string} modalId - Any modal ID in the group
+   */
+  clearMinimizedStateGroup(modalId) {
+    const rootId = this.getRootModal(modalId);
+    const descendants = this.getAllDescendants(rootId);
+    const allModalIds = [rootId, ...descendants];
+
+    // isMinimized와 isRestored 모두 false로 설정 (taskbar에서 제거, 모달은 유지)
+    allModalIds.forEach(id => {
+      if (this.activeModals[id]) {
+        this.activeModals[id].isMinimized = false;
+        this.activeModals[id].isRestored = false;
+        delete this.activeModals[id].minimizedAt;
+      }
+    });
+
+    this.updateBodyScroll();
+    this.notify();
+  }
+
   getMinimizedModalGroups() {
     const minimizedRoots = new Set();
     const processedModals = new Set();

data/lib/rails_modal_manager/version.rb

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

metadata

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