phlexy_ui 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e6545417ad6baf0ab1e8b33c1c23ab3513089c787ad274f08fb3094a43d9a44
-  data.tar.gz: 13c7469dac369c048a1f78cebda90e9035457326b072b7ae2d3f6fb4bca8c35f
+  metadata.gz: 2442fc77587b1b97a19ebcbd234473202f73dae6f7acfc3feedb570e57525944
+  data.tar.gz: b77cf08ad3f977de8fcd04f1ccb5f090a638beb36353c6b1ef2a7ac2f55c1831
 SHA512:
-  metadata.gz: 870e25f3780ed7cadf59047cfe78330a429ee0f4b0e27c5f635be30df4792165304b0acd9343f341efdd22bcde9aeae5d420ce67b467c16a8bad5613efd2aa17
-  data.tar.gz: 4a3dbfa5b575f9aaa408e216ee635fd9d23a5eae619acf5be7c92e8438683f964ba72cbc94b767e1f32375d2e791bf804916cf33320666da76e2b1ba30faf40e
+  metadata.gz: 525b56ee4587186d2cbfdd8a5180b2975f7bd76954e852f039745ee029d8f62eec5a88688bc14e2c1f8d5b8d63dad7208477e8bee2c71c15f430d2dad8270aea
+  data.tar.gz: e856be656fec15626d2982824587f03b6fd61d3b13f22707b28153a6267fbfc7f59ee1fa85c5854c9679aac651d8b54398212395f110d925379f96dca1d9bda9

data/lib/phlexy_ui/button.rb

@@ -16,52 +16,10 @@ module PhlexyUI
         options:
       ).then do |classes|
         if modal
-          # TODO: Remove this abomination once Phlex 2.0 is released.
-          #
-          # The cleanest way to do this is with a single:
-          #
-          # onclick: "#{modal}.showModal()"
-          #
-          # However, currently, Phlex does not allow you to use the "onclick"
-          # attribute.
-          #
-          # Once Phlex 2.0 is released, it will add a #safe method
-          # that will allow us to replace this with a single line:
-          #
-          # onclick: safe("#{modal}.showModal()")
-          #
-          # For now, at least this only runs once and uses event delegation
-          # so that it only adds a single event listener to the document.body.
-          #
-          # The downside is a bigger HTML payload.
-          options[:data] ||= {}
-          options[:data][:modal] = modal
-          script do
-            unsafe_raw <<~JS
-              // Will be replaced with a single line on the <button> once Phlex 2.0 is released.
-              (() => {
-                if (window.PhlexyUI && window.PhlexyUI.modalInitialized) {
-                  return;
-                }
-                
-                document.body.addEventListener("click", (event) => {
-                  if (event.target.tagName === 'BUTTON' && 
-                      event.target.dataset.modal) {
-                    const modal = document.getElementById(event.target.dataset.modal);
-                    if (modal) {
-                      modal.showModal();
-                    }
-                  }
-                });
-                
-                if (!window.PhlexyUI) window.PhlexyUI = {};
-                window.PhlexyUI.modalInitialized = true;
-              })();
-            JS
-          end
+          build_button_via_unsafe_raw(classes, &)
+        else
+          public_send(as, class: classes, **options, &)
         end
-
-        public_send(as, class: classes, **options, &)
       end
     end
 
@@ -69,6 +27,41 @@ module PhlexyUI
 
     attr_reader :modal
 
+    # TODO: Remove this once Phlex 2.0 is released.
+    #
+    # The cleanest way to do this is with a single:
+    #
+    # onclick: "#{Phlex::Escape.html_escape(modal)}.showModal()"
+    #
+    # However, currently, Phlex does not allow you to use the "onclick"
+    # attribute.
+    #
+    # Once Phlex 2.0 is released, it will add a #safe method
+    # that will allow us to replace this with a single line:
+    #
+    # onclick: safe("#{Phlex::Escape.html_escape(modal)}.showModal()")
+    def build_button_via_unsafe_raw(classes, &)
+      classes = Phlex::Escape.html_escape(classes.join(" "))
+      @options = options
+        .merge(onclick: "#{modal}.showModal()")
+        .reduce("") do |acc, (k, v)|
+        if k == :data
+          v.each do |k, v|
+            k = Phlex::Escape.html_escape(k)
+            v = Phlex::Escape.html_escape(v)
+            acc += " data-#{k}=\"#{v}\""
+          end
+          acc
+        else
+          k = Phlex::Escape.html_escape(k)
+          v = Phlex::Escape.html_escape(v)
+          "#{acc} #{k}=\"#{v}\""
+        end
+      end.strip
+
+      unsafe_raw %(<button class="#{classes}" #{options}>#{capture(&)}</button>)
+    end
+
     register_modifiers(
       # "sm:no-animation"
       # "md:no-animation"

data/lib/phlexy_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PhlexyUI
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexy_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - David Alejandro Aguilar Ramos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2024-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex