rails_modal_manager 1.0.53 → 1.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ea3c9a0f748719fffb7a377e31eb8ffa82aa92a51fe5e57d0c9e766757f6bd
-  data.tar.gz: 299fa546552e45abccac98ddd60d258b8b24d8a5ffe3b4e8c8e5647df5b63003
+  metadata.gz: e0cf503bb2cd8309b4682f5fa03fbac83853d251624a0e695110dd7ca984b1e5
+  data.tar.gz: eb75b69501205a841d2fa1220f2510bea5e96ffb169f19307dedb968efc6edbb
 SHA512:
-  metadata.gz: 577924acb8554d70314b4380100d2f6c72ffed2216fb43f78c6197007508e833b35c11f527644cf8ca3e2115cfd06328bb3fa74b7c4eb648336ba3a94587f779
-  data.tar.gz: f56d2917b83eab179ec1a54e9cf3654e0c81e3e3fe778d0982279d13c18e859dd069f1d7bf73238c0771ddea72d1dbe0b6d189db039bfc0892ad7bfce414b877
+  metadata.gz: 9f09c9cfdecc894a959360eb1f4ee4f8a36841b1d19e9e2922803e2d017a4ff810de075ac7a7e8c3ce9fe7d0ff6c8059f84a9252a2c80e0435278eed42f33153
+  data.tar.gz: 595f2da63377cde83786907e7c8adb78620ba965ad8cae92e605b072492291bc2ca7ce1f8a2cc3181254eb3c765db1f0457a840588fb22591e1ce96f522aba31

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

@@ -72,12 +72,41 @@ export default class extends Controller {
     // Subscribe to store changes
     this.unsubscribe = modalStore.subscribe(() => this.handleStoreChange())
 
+    // v1.0.54+: Bind `data-rmm-onclick` on footer buttons rendered by the ERB partial.
+    // Matches the binding path in setModalFooter() so footer buttons declared via the
+    // footer_buttons: [{ onclick: "..." }] option work regardless of whether the footer
+    // was rendered by the server ERB or replaced dynamically by setModalFooter.
+    this._bindFooterOnclicks()
+
     // Check if should be open on connect
     if (this.openValue) {
       this.open()
     }
   }
 
+  /**
+   * Bind data-rmm-onclick attributes on footer buttons as real click listeners.
+   * Idempotent: each button bound only once (tracked via _rmmOnclickBound flag).
+   * Called on connect; setModalFooter() handles its own buttons when it replaces the footer.
+   */
+  _bindFooterOnclicks() {
+    const footer = this.element.querySelector(".rmm-footer")
+    if (!footer) return
+    footer.querySelectorAll("[data-rmm-onclick]").forEach((btn) => {
+      if (btn._rmmOnclickBound) return
+      btn._rmmOnclickBound = true
+      const code = btn.getAttribute("data-rmm-onclick")
+      btn.addEventListener("click", function() {
+        try {
+          // `this` inside onclick code refers to the clicked button element
+          new Function(code).call(this)
+        } catch (e) {
+          console.warn("[rmm-footer] onclick handler error:", e)
+        }
+      })
+    })
+  }
+
   // Getter for effective modal ID (fallback to element.id if modalIdValue is empty)
   get effectiveModalId() {
     return this.modalIdValue || this.element.id

data/app/javascript/rails_modal_manager/footer_renderer.js

@@ -23,17 +23,24 @@ function renderButtonHtml(btn) {
   const classes = ["rmm-btn", `rmm-btn-${btn.variant || "secondary"}`]
   if (btn.loading) classes.push("rmm-btn-loading")
 
-  const attrs = [`class="${classes.join(" ")}"`]
+  const type = btn.type || "button"
+  const attrs = [`type="${escapeHtml(type)}"`, `class="${classes.join(" ")}"`]
+  // v1.0.55+: button[form="..."] HTML5 attribute — submit a form that lives outside the button
+  if (btn.form) attrs.push(`form="${escapeHtml(btn.form)}"`)
   if (btn.disabled || btn.loading) attrs.push("disabled")
   if (btn.action) attrs.push(`data-action="${escapeHtml(btn.action)}"`)
-  // v1.0.53+: onclick 을 `data-rmm-onclick` 속성에 저장하고 setModalFooter 가
-  // 렌더 직후 실제 click listener 로 바인딩. innerHTML 로 박힌 inline `onclick`
-  // 은 일부 환경(CSP, 특정 브라우저 파싱) 에서 핸들러로 등록되지 않는 경우가 있어
-  // 이 방식으로 확실히 동작시킴.
+  // DEPRECATED in v1.0.55. Kept for backward compatibility — prefer type+form or action.
   if (btn.onclick) attrs.push(`data-rmm-onclick="${escapeHtml(btn.onclick)}"`)
+  // v1.0.55+: extra data-* attributes (e.g. data: { rmm_loading_label: "저장 중..." })
+  if (btn.data && typeof btn.data === "object") {
+    Object.entries(btn.data).forEach(([k, v]) => {
+      const key = String(k).replace(/_/g, "-")
+      attrs.push(`data-${escapeHtml(key)}="${escapeHtml(v)}"`)
+    })
+  }
   if (btn.id) attrs.push(`data-button-id="${escapeHtml(btn.id)}"`)
 
-  return `<button type="button" ${attrs.join(" ")}>${escapeHtml(btn.label || "")}</button>`
+  return `<button ${attrs.join(" ")}>${escapeHtml(btn.label || "")}</button>`
 }
 
 /**

data/app/views/rails_modal_manager/_footer.html.erb

@@ -1,16 +1,43 @@
 <%#
-  Rails Modal Manager - Footer Component
+  Rails Modal Manager - Footer Component (v1.0.55+)
 
   Locals:
     modal_id: String - The modal ID
     message: String - Footer message (optional)
-    buttons: Array - Footer buttons [{id:, label:, variant:, disabled:, loading:, action:}]
-                     variant: primary, secondary, danger, success, warning
+    buttons: Array - Footer buttons [{id:, label:, variant:, type:, form:, action:, disabled:, loading:, data:, onclick:}]
+
+  Button option fields:
+    id:        String - Button identifier (rendered as data-button-id)
+    label:     String - Button text
+    variant:   String - primary, secondary, success, danger, warning (default: secondary)
+    type:      String - "button" (default) or "submit"
+                        With "submit" + form, the browser submits the form natively.
+    form:      String - id of a form to submit when this button is clicked
+                        (HTML5 button[form] attribute). Pairs with type: "submit".
+    action:    String - Stimulus data-action (e.g. "click->my-controller#save")
+    disabled:  Boolean - Render as disabled
+    loading:   Boolean - DEPRECATED in 1.0.55. Was rmm-btn-loading class but its CSS
+                        made the label transparent; prefer label-swap via data-rmm-loading-label.
+    data:      Hash   - Extra data-* attributes (e.g. { rmm_loading_label: "저장 중..." })
+                        Keys are dasherized: rmm_loading_label → data-rmm-loading-label
+    onclick:   String - DEPRECATED in 1.0.55. Inline JavaScript code string. Use type+form
+                        or action: instead. Kept for backward compatibility.
+
+  Recommended pattern (form submission):
+    { id: "save", label: "저장", variant: "primary",
+      type: "submit", form: "my-form-id",
+      data: { rmm_loading_label: "저장 중..." } }
 %>
 <%
   modal_id ||= ""
   message ||= nil
   buttons ||= []
+
+  # Helper: dasherize hash keys → data-* attribute pairs string
+  data_attr_string = ->(data_hash) {
+    return "" unless data_hash.is_a?(Hash)
+    data_hash.map { |k, v| %(data-#{k.to_s.tr('_', '-')}="#{ERB::Util.html_escape(v)}") }.join(" ")
+  }
 %>
 <div class="rmm-footer">
   <div class="rmm-footer-left">
@@ -25,11 +52,15 @@
         btn_classes = ["rmm-btn"]
         btn_classes << "rmm-btn-#{btn[:variant] || 'secondary'}"
         btn_classes << "rmm-btn-loading" if btn[:loading]
+        btn_type = btn[:type].presence || "button"
       %>
-      <button type="button"
+      <button type="<%= btn_type %>"
               class="<%= btn_classes.join(' ') %>"
+              <% if btn[:form].present? %>form="<%= btn[:form] %>"<% end %>
               <% if btn[:disabled] || btn[:loading] %>disabled<% end %>
               <% if btn[:action] %>data-action="<%= btn[:action] %>"<% end %>
+              <% if btn[:onclick] %>data-rmm-onclick="<%= btn[:onclick] %>"<% end %>
+              <%= data_attr_string.call(btn[:data]).html_safe if btn[:data] %>
               data-button-id="<%= btn[:id] %>">
         <%= btn[:label] %>
       </button>

data/lib/rails_modal_manager/version.rb

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

metadata

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