rails_modal_manager 1.0.38 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e635b4d1de69eb311d4d9e6e4784019f6bd66318c0a2212dcd0b0e20c6f1f21
-  data.tar.gz: b96cb63a48fde00310a2754d4fdd0810ee8a5021deaf7aab05d593fea6413343
+  metadata.gz: f72c6ffe5c9f3e50fff79422b1807782c9f7ec6b8d2e24c7f3bce5b4ed82e908
+  data.tar.gz: 118f90d8a19326d558115e337c6664d4c6e0ea5daeae119fcf10fbf2848a9f15
 SHA512:
-  metadata.gz: 1fca82ee462c8aaedaebe54ccc4760a35efe957f04a98508dc100d618a08d9c0c7e0e9fa768ac0336d604110627dfd1554c3cc3bf2c414de71bb3b29c1a99823
-  data.tar.gz: d7b73a297f1c4461bdec59e3fa9cb007f9102a39ffc6dc4938e6d4722ee67be5fbe149d1d3fef6773d771cd7ab2c2ffb128f2b476ba832b32e4679fdd8ab2701
+  metadata.gz: b901dc36606b53e8397779b2220fa860798abd4c2968067c3ce2c32140648f1ae98da01206f54498d9005454867c96260ca7166ca3beef91498d31bf4a7d8963
+  data.tar.gz: 6565408604feecc0dd2990d65a7fde29c672446e4ad35f31301a61d31866589b6482266f88c02921fa0920b7505b1046ac9b6cd871aecad8f532960bec0cdb50

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

@@ -48,6 +48,8 @@ export default class extends Controller {
     this.previousFocus = null
     this.isDragging = false
     this.isResizing = false
+    this.isClosing = false
+    this.closeTimeout = null
     this.dragStart = { x: 0, y: 0 }
     this.initialPos = { top: 0, left: 0 }
     this.resizeDirection = null
@@ -107,6 +109,12 @@ export default class extends Controller {
   open() {
     const modalId = this.effectiveModalId
 
+    // 닫기 애니메이션 중이면 취소하고 다시 열기
+    if (this.isClosing) {
+      this.cancelClose()
+      return
+    }
+
     if (modalStore.getModalConfig(modalId)) {
       return // Already open
     }
@@ -177,6 +185,12 @@ export default class extends Controller {
   close(source = 'button') {
     const modalId = this.effectiveModalId
 
+    // 이미 닫는 중이면 무시
+    if (this.isClosing) return
+
+    // store에 없으면 이미 닫힌 상태
+    if (!modalStore.getModalConfig(modalId)) return
+
     // Allow closing from programmatic source, footer button, or if closable is true
     if (!this.closableValue && source !== 'programmatic' && source !== 'footer') {
       return
@@ -188,6 +202,9 @@ export default class extends Controller {
       return
     }
 
+    // 닫기 시작
+    this.isClosing = true
+
     // Get all descendants to close them too
     const descendants = modalStore.getAllDescendants(modalId)
 
@@ -402,7 +419,13 @@ export default class extends Controller {
     modal.classList.remove('rmm-active')
     if (overlay) overlay.classList.remove('rmm-active')
 
-    setTimeout(() => {
+    // 타이머 저장 (취소 가능하도록)
+    this.closeTimeout = setTimeout(() => {
+      this.closeTimeout = null
+
+      // 닫기가 취소되었으면 콜백 실행 안 함
+      if (!this.isClosing) return
+
       // 애니메이션 완료 후 드래그로 인한 커스텀 위치 클래스 및 인라인 스타일 제거
       modal.classList.remove('rmm-custom-position')
       modal.classList.remove('rmm-dragging')
@@ -416,10 +439,32 @@ export default class extends Controller {
       this.openValue = false
       this._closingProgrammatically = false
 
+      // 닫기 완료
+      this.isClosing = false
+
       if (callback) callback()
     }, this.animationDurationValue)
   }
 
+  /**
+   * Cancel ongoing close animation and restore modal visibility
+   * Called when open() is triggered during close animation
+   */
+  cancelClose() {
+    if (this.closeTimeout) {
+      clearTimeout(this.closeTimeout)
+      this.closeTimeout = null
+    }
+    this.isClosing = false
+
+    // UI 다시 활성화
+    const modal = this.element
+    const overlay = this.getOverlay()
+
+    modal.classList.add('rmm-active')
+    if (overlay) overlay.classList.add('rmm-active')
+  }
+
   /**
    * Reset sidebar and submenu controllers to first item
    * Called when modal is closed to ensure clean state on next open

data/lib/rails_modal_manager/version.rb

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

metadata

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