ultimate_turbo_modal 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1149adbc9b8dd940af463061bdfc46d09d1071531a0f08d73538a41c2d44ef52
-  data.tar.gz: d5ce0192c54ff6f731758515a9ed60f839315759b70e9ceaba57ce2847ed298f
+  metadata.gz: a456aa7e0fdb49a0b9ae53817f965df422145433f6d981811cbb0172126422dd
+  data.tar.gz: 4fdb91772d698e7d1987024acb165f1ef8380446d600c5146b834025cb84c497
 SHA512:
-  metadata.gz: 07b07aa40ab5c4000a6c06fa1d3ed410f7bebc3d44c46a670371e8e1044a168167cdd8a402865d26e3314b18c2e013b451a542c45a2a42e33d19cc8ce7b31f82
-  data.tar.gz: 5dc24349c452b9c7c8a9280d4f8dd8a0c36dd89efb261b5aa8ae6715f3921aab0e15a128e704ce2eb21f0a94158ba621ca7760289efc1df17fa7180a1e2cbc1f
+  metadata.gz: 63ae9236655b7d2d300507413808a5771ca205dc12d08eecc48a3f256ddf24525f8b2b401a432a4df035d6fbd929c738e0a74c5bd1036a1f16b62b786ce756bb
+  data.tar.gz: d5fc098465cdba81f1981e49cce9721e049db78d02a448e734ea60f0c41b6119311a15e1ac922c7d0667d274431cb86bacaf9d3310c2ee51979f695cee3135ac

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 3.2
+
 require:
   - standard
 inherit_gem:

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-## [Unreleased]
+## [1.2.0] - 2023-11-05
+
+- Dark mode support
+- Added header divider (configurable)
+- Added footer section with divider (configurable)
+- Tailwind flavor now uses data attributes to style elements
+- Updated look and feel
+- Simplified code a bit
+
+## [1.1.3] - 2023-11-01
+
+- Added configuration block
+
+## [1.1.2] - 2023-10-31
+
+- Bug fix
 
 ## [1.1.0] - 2023-10-31
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ultimate_turbo_modal (1.1.1)
+    ultimate_turbo_modal (1.2.0)
       phlex-rails (>= 1.0, < 2.0)
       rails (>= 7)
       stimulus-rails

data/README.md

@@ -6,7 +6,7 @@ UTMR aims to be the be-all and end-all of Turbo Modals. I believe it is the best
 
 Under the hood, it uses [Stimulus](https://stimulus.hotwired.dev), [Turbo](https://turbo.hotwired.dev/), [el-transition](https://github.com/mmccall10/el-transition), and optionally [Idiomorph](https://github.com/bigskysoftware/idiomorph).
 
-It currently ships in a two flavors: Tailwind CSS, and regular, vanilla CSS. It is easy to create your own to suit your needs such as vanilla CSS or any other CSS framework you may prefer. See `lib/ultimate_turbo_modal/flavors/vanilla.rb` for an example code.
+It currently ships in a two flavors: Tailwind CSS, and regular, vanilla CSS. It is easy to create your own variant to suit your needs. See `lib/ultimate_turbo_modal/flavors/vanilla.rb` for an example code.
 
 
  
@@ -34,7 +34,7 @@ It currently ships in a two flavors: Tailwind CSS, and regular, vanilla CSS. It
  
 ## Demo
 
-A demo application can be found at https://github.com/cmer/ultimate_turbo_modal-demo. A video demo can be seen here: [https://youtu.be/eG5uWTH74NA](https://youtu.be/eG5uWTH74NA)
+A demo application can be found at https://github.com/cmer/ultimate_turbo_modal-demo. A video demo can be seen here: [https://youtu.be/BVRDXLN1I78](https://youtu.be/BVRDXLN1I78).
 
 
  
@@ -59,10 +59,18 @@ A demo application can be found at https://github.com/cmer/ultimate_turbo_modal-
 <%= turbo_frame_tag "modal" %>
 ``````
 
-4. Set your desired flavor at `app/config/initializers/modal.rb`. The default is `:tailwind`.
+4. Set your desired flavor and default configuration at `app/config/initializers/ultimate_turbo_modal.rb`.
 
 ```ruby
-UltimateTurboModal.flavor = :tailwind # or :vanilla
+UltimateTurboModal.configure do |config|
+  config.flavor = :tailwind
+  config.padding = true
+  config.advance = true
+  config.close_button = true
+  config.header = true
+  config.header_divider = true
+  config.footer_divider = true
+end
 ```
 
 5. Register the Stimulus controller in `app/javascript/controllers/index.js` adding the following lines at the end.
@@ -72,7 +80,33 @@ import setupUltimateTurboModal from "ultimate_turbo_modal";
 setupUltimateTurboModal(application);
 ```
 
-6. Optionally (but recommended), configure UTMR to use Idiomorph. See below for details.
+6. If using the Tailwind flavor, add the following to `tailwind.config.js`:
+
+```
+// For npm/yarn
+const { getUltimateTurboModalPath } = require('ultimate_turbo_modal/gemPath');
+
+// If using Importmaps, use the following instead:
+// const { execSync } = require('child_process');
+//
+// function getUltimateTurboModalPath() {
+//  const path = execSync('bundle show ultimate_turbo_modal').toString().trim();
+//  return `${path}/**/*.{erb,html,rb}`;
+//}
+```
+
+and then in the `content` section, add `getUltimateTurboModalPath()` as follow:
+
+```
+  content: [
+    './public/*.html',
+    './app/helpers/**/*.rb',
+    './app/javascript/**/*.js',
+    './app/views/**/*.{erb,haml,html,slim,rb}',
+    getUltimateTurboModalPath()
+```
+
+7. Optionally (but recommended), configure UTMR to use Idiomorph. See below for details.
 
 &nbsp;
 &nbsp;
@@ -122,6 +156,23 @@ When opening the modal, the URL in the URL bar will change to the URL of the vie
 
 If a URL is specified as a String, the browser history will advance, and the URL shown in the URL bad will be replaced by the URL specified.
 
+### `title`, default: `nil`
+
+Title to display in the modal header.
+
+### `header`, default: `true`
+
+Whether to display a modal header.
+
+### `header_divider`, default: `true`
+
+Whether to display a divider below the header.
+
+### `footer_divider`, default: `true`
+
+Whether to display a divider above the footer. The divider will not appear if no footer was specified.
+
+
 
 ### Example usage with options
 
@@ -161,6 +212,11 @@ addEventListener("turbo:before-frame-render", (event) => {
 })
 ```
 
+&nbsp;
+&nbsp;
+## Thanks
+
+Thanks to [@joeldrapper](https://github.com/KonnorRogers) and [@konnorrogers](https://github.com/KonnorRogers) for all the help!
 
 &nbsp;
 &nbsp;

data/lib/ultimate_turbo_modal/base.rb

@@ -1,90 +1,86 @@
 class UltimateTurboModal::Base < Phlex::HTML
-  INCLUDES = %w[
-    Turbo::FramesHelper
-    Turbo::StreamsHelper
-    Phlex::Rails::Helpers::ContentTag
-    Phlex::Rails::Helpers::Routes
-    Phlex::Rails::Helpers::Tag
-  ].freeze
-
   # @param padding [Boolean] Whether to add padding around the modal content
   # @param close_button [Boolean] Whether to show a close button.
   # @param advance [Boolean] Whether to update the browser history when opening and closing the modal
-  # @param advance_url [String] Override the URL to use when advancing the history
+  # @param header_divider [Boolean] Whether to show a divider between the header and the main content
+  # @param footer_divider [Boolean] Whether to show a divider between the main content and the footer
+  # @param title [String] The title of the modal
   # @param request [ActionDispatch::Request] The current Rails request object
-  def initialize(padding: true, close_button: true, advance: true, request: nil)
+  def initialize(
+    padding: UltimateTurboModal.configuration.padding,
+    close_button: UltimateTurboModal.configuration.close_button,
+    advance: UltimateTurboModal.configuration.advance,
+    header: UltimateTurboModal.configuration.header,
+    header_divider: UltimateTurboModal.configuration.header_divider,
+    footer_divider: UltimateTurboModal.configuration.footer_divider,
+    title: nil, request: nil
+  )
     @padding = padding
     @close_button = close_button
-    @advance = advance
-    @advance_url = advance if advance && advance.is_a?(String)
+    @advance = !!advance
+    @advance_url = advance if advance.present? && advance.is_a?(String)
+    @title = title
+    @header = header
+    @header_divider = header_divider
+    @footer_divider = footer_divider
     @request = request
 
-    self.class.include Turbo::FramesHelper
-    self.class.include Turbo::StreamsHelper
-    self.class.include Phlex::Rails::Helpers::ContentTag
-    self.class.include Phlex::Rails::Helpers::Routes
-    self.class.include Phlex::Rails::Helpers::Tag
+    unless self.class.include?(Turbo::FramesHelper)
+      self.class.include Turbo::FramesHelper
+      self.class.include Turbo::StreamsHelper
+      self.class.include Phlex::Rails::Helpers::ContentTag
+      self.class.include Phlex::Rails::Helpers::Routes
+      self.class.include Phlex::Rails::Helpers::Tag
+    end
   end
 
-  def template(&)
+  def template(&block)
     if turbo_frame?
-      turbo_frame_tag("modal") { modal(&) }
+      turbo_frame_tag("modal") do
+        modal(&block)
+      end
     elsif turbo_stream?
       Turbo::StreamsHelper.turbo_stream_action_tag("update", target: "modal") do
-        template { modal(&) }
+        modal(&block)
       end
     else
-      modal(&)
+      render block
     end
   end
 
+  def footer(&block)
+    @footer = block
+  end
+
   private
 
-  attr_accessor :request
+  attr_accessor :request, :title
 
-  def padding?
-    !!@padding
-  end
+  def padding? = !!@padding
 
-  def advance?
-    !!@advance
-  end
+  def close_button? = !!@close_button
 
-  def close_button?
-    !!@close_button
-  end
+  def title? = !!@title
 
-  def turbo_stream?
-    !!request&.format&.turbo_stream?
-  end
+  def header? = !!@header
 
-  def turbo_frame?
-    !!request&.headers&.key?("Turbo-Frame")
-  end
+  def footer? = @footer.present?
 
-  def turbo?
-    turbo_stream? || turbo_frame?
-  end
+  def header_divider? = !!@header_divider && title?
 
-  def advance_url
-    return nil unless advance?
-    @advance_url || request.original_url
-  end
+  def footer_divider? = !!@footer_divider && footer?
 
-  def method_missing(method, *, &block)
-    INCLUDES.each { |mod| include_if_defined(mod) }
+  def turbo_stream? = !!request&.format&.turbo_stream?
 
-    if self.class.method_defined?(method)
-      send(method, *, &block)
-    else
-      super
-    end
-  end
+  def turbo_frame? = !!request&.headers&.key?("Turbo-Frame")
 
-  def include_if_defined(mod_str)
-    if defined?(mod.constantize) && !self.class.included_modules.include?(mod.constantize)
-      self.class.include mod.constantize
-    end
+  def turbo? = turbo_stream? || turbo_frame?
+
+  def advance? = !!@advance && !!@advance_url
+
+  def advance_url
+    return nil unless !!@advance
+    @advance_url || request&.original_url
   end
 
   def respond_to_missing?(method, include_private = false)

data/lib/ultimate_turbo_modal/configuration.rb

@@ -0,0 +1,68 @@
+module UltimateTurboModal
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration) if block_given?
+  end
+
+  delegate :flavor, :flavor=, :close_button, :close_button=,
+    :advance, :advance=, :padding, :padding=, to: :configuration
+
+  class Configuration
+    attr_reader :flavor, :close_button, :advance, :padding, :header, :header_divider, :footer_divider
+
+    def initialize
+      @flavor = :tailwind
+      @close_button = true
+      @advance = true
+      @padding = true
+      @header = true
+      @header_divider = true
+      @footer_divider = true
+    end
+
+    def flavor=(flavor)
+      raise ArgumentError.new("Value must be a symbol.") unless flavor.is_a?(Symbol) || flavor.is_a?(String)
+      @flavor = flavor.to_sym
+    end
+
+    def close_button=(close_button)
+      raise ArgumentError.new("Value must be a boolean.") unless [true, false].include?(close_button)
+      @close_button = close_button
+    end
+
+    def advance=(advance)
+      raise ArgumentError.new("Value must be a boolean.") unless [true, false].include?(advance)
+      @advance = advance
+    end
+
+    def padding=(padding)
+      if [true, false].include?(padding) || padding.is_a?(String)
+        @padding = padding
+      else
+        raise ArgumentError.new("Value must be a boolean or a String.")
+      end
+    end
+
+    def header=(header)
+      raise ArgumentError.new("Value must be a boolean.") unless [true, false].include?(header)
+      @header = header
+    end
+
+    def header_divider=(header_divider)
+      raise ArgumentError.new("Value must be a boolean.") unless [true, false].include?(header_divider)
+      @header_divider = header_divider
+    end
+
+    def footer_divider=(footer_divider)
+      raise ArgumentError.new("Value must be a boolean.") unless [true, false].include?(footer_divider)
+      @footer_divider = footer_divider
+    end
+  end
+end
+
+# Make sure the configuration object is set up when the gem is loaded.
+UltimateTurboModal.configure

data/lib/ultimate_turbo_modal/flavors/tailwind.rb

@@ -1,27 +1,33 @@
 module UltimateTurboModal::Flavors
   class Tailwind < UltimateTurboModal::Base
+
     private
 
     def modal(&)
+      outer_divs do
+        div_content do
+          div_header
+          div_main(&)
+          div_footer if footer?
+        end
+      end
+    end
+
+    def outer_divs(&)
       div_dialog do
         div_overlay
         div_outer do
-          div_inner do
-            div_border do
-              button_close if close_button?
-              yield
-            end
-          end
+          div_inner(&)
         end
       end
     end
 
     def div_dialog(&)
       div(id: "modal-container",
-        class: "relative z-10",
+        class: "relative group",
         role: "dialog",
         aria: {
-          labeled_by: "modal-title",
+          labeled_by: "modal-title-h",
           modal: true
         },
         data: {
@@ -29,71 +35,91 @@ module UltimateTurboModal::Flavors
           modal_target: "container",
           modal_advance_url_value: advance_url,
           action: "turbo:submit-end->modal#submitEnd keyup@window->modal#closeWithKeyboard click@window->modal#outsideModalClicked click->modal#outsideModalClicked",
-          transition_enter: "ease-out duration-300",
+          transition_enter: "ease-out duration-100",
           transition_enter_start: "opacity-0",
           transition_enter_end: "opacity-100",
-          transition_leave: "ease-in duration-200",
+          transition_leave: "ease-in duration-50",
           transition_leave_start: "opacity-100",
-          transition_leave_end: "opacity-0"
+          transition_leave_end: "opacity-0",
+          padding: padding?.to_s,
+          title: title?.to_s,
+          header: header?.to_s,
+          close_button: close_button?.to_s,
+          header_divider: header_divider?.to_s,
+          footer_divider: footer_divider?.to_s
         }, &)
     end
 
-    def div_overlay(&)
+    def div_overlay
       div(id: "modal-overlay",
-        class: "fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity",
-        data: {
-          modal_target: "overlay",
-          action: "click->modal#outsideModalClicked"
-        })
+        class: "fixed inset-0 bg-gray-900 bg-opacity-50 transition-opacity dark:bg-opacity-80 z-40")
     end
 
     def div_outer(&)
       div(id: "modal-outer",
-        class: "fixed inset-0 z-10 overflow-y-auto sm:max-w-[80%] md:max-w-3xl sm:mx-auto m-4",
-        data: {
-          modal_target: "modal"
-        }, &)
+        class: "fixed inset-0 z-50 overflow-y-auto sm:max-w-[80%] md:max-w-3xl sm:mx-auto m-4", &)
     end
 
     def div_inner(&)
       div(id: "modal-inner",
-        class: "flex min-h-full items-center justify-center p-1 sm:p-4",
-        data: {
-          modal_target: "innerModal"
-        }, &)
+        class: "flex min-h-full items-center justify-center p-1 sm:p-4", &)
+    end
+
+    def div_content(&)
+      div(id: "modal-content",
+        class: "relative transform overflow-hidden rounded-lg bg-white text-left shadow transition-all
+                sm:my-8 sm:max-w-3xl dark:bg-gray-800 dark:text-white",
+        data: {modal_target: "content"}, &)
+    end
+
+    def div_main(&)
+      div(id: "modal-main", class: "group-data-[padding=true]:p-4 group-data-[padding=true]:pt-2", &)
     end
 
-    def div_border(&)
-      klass = "relative transform overflow-hidden rounded-lg bg-white text-left shadow-xl transition-all sm:my-8 sm:max-w-3xl"
-      klass = "#{klass} p-2 sm:p-4 md:p-6" if @padding == true
-      klass = "#{klass} #{@padding}" if @padding.is_a?(String)
-      div(id: "modal-border", class: klass, &)
+    def div_header(&)
+      div(id: "modal-header", class: "flex justify-between items-center w-full py-4 rounded-t dark:border-gray-600 group-data-[header-divider=true]:border-b group-data-[header=false]:absolute") do
+        div_title
+        button_close
+      end
     end
 
-    def button_close(&)
-      div(class: "absolute top-3 right-3") do
-        button(type: "button",
-          aria: {label: "close"},
-          class: "ml-auto inline-flex items-center rounded bg-transparent p-1 text-sm text-gray-400 bg-white bg-opacity-20 hover:bg-gray-100 hover:bg-opacity-70 hover:text-gray-900",
-          data: {
-            action: "modal#hideModal"
-          }) { icon_close }
+    def div_title
+      div(id: "modal-title", class: "pl-4") do
+        h3(id: "modal-title-h", class: "group-data-[title=false]:hidden text-lg font-semibold text-gray-900 dark:text-white") { @title }
       end
     end
 
+    def div_footer
+      div(id: "modal-footer", class: "flex p-4 rounded-b dark:border-gray-600 group-data-[footer-divider=true]:border-t") do
+        render @footer
+      end
+    end
+
+    def button_close
+      div(id: "modal-close", class: "mr-4") do
+        close_button_tag do
+          icon_close
+          span(class: "sr-only") { "Close modal" }
+        end
+      end
+    end
+
+    def close_button_tag(&)
+      button(type: "button",
+        aria: {label: "close"},
+        class: "text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm
+                p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white",
+        data: {
+          action: "modal#hideModal"
+        }, &)
+    end
+
     def icon_close
-      svg(
-        xmlns: "http://www.w3.org/2000/svg",
-        fill: "none",
-        viewbox: "0 0 24 24",
-        stroke_width: "1.5",
-        stroke: "currentColor",
-        class: "w-5 h-5"
-      ) do |s|
+      svg(class: "w-5 h-5", fill: "currentColor", viewBox: "0 0 20 20") do |s|
         s.path(
-          stroke_linecap: "round",
-          stroke_linejoin: "round",
-          d: "M6 18L18 6M6 6l12 12"
+          fill_rule: "evenodd",
+          d: "M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z",
+          clip_rule: "evenodd"
         )
       end
     end

data/lib/ultimate_turbo_modal/flavors/vanilla.rb

@@ -1,17 +1,23 @@
 module UltimateTurboModal::Flavors
   class Vanilla < UltimateTurboModal::Base
+
     private
 
     def modal(&)
+      outer_divs do
+        div_content do
+          div_header
+          div_main(&)
+          div_footer if footer?
+        end
+      end
+    end
+
+    def outer_divs(&)
       div_dialog do
         div_overlay
-        div_outer_container do
-          div_inner_container do
-            div_border do
-              button_close if close_button?
-              yield
-            end
-          end
+        div_outer do
+          div_inner(&)
         end
       end
     end
@@ -21,7 +27,7 @@ module UltimateTurboModal::Flavors
         class: "modal-container",
         role: "dialog",
         aria: {
-          labeled_by: "modal-title",
+          labeled_by: "modal-title-h",
           modal: true
         },
         data: {
@@ -29,69 +35,84 @@ module UltimateTurboModal::Flavors
           modal_target: "container",
           modal_advance_url_value: advance_url,
           action: "turbo:submit-end->modal#submitEnd keyup@window->modal#closeWithKeyboard click@window->modal#outsideModalClicked click->modal#outsideModalClicked",
-          transition_enter: "ease-out duration-300",
+          transition_enter: "ease-out duration-100",
           transition_enter_start: "opacity-0",
           transition_enter_end: "opacity-100",
-          transition_leave: "ease-in duration-200",
+          transition_leave: "ease-in duration-50",
           transition_leave_start: "opacity-100",
-          transition_leave_end: "opacity-0"
+          transition_leave_end: "opacity-0",
+          padding: padding?.to_s,
+          title: title?.to_s,
+          header: header?.to_s,
+          close_button: close_button?.to_s,
+          header_divider: header_divider?.to_s,
+          footer_divider: footer_divider?.to_s
         }, &)
     end
 
-    def div_overlay(&)
-      div(id: "modal-overlay",
-        class: "modal-overlay",
-        data: {
-          modal_target: "overlay",
-          action: "click->modal#outsideModalClicked"
-        })
+    def div_overlay
+      div(id: "modal-overlay", class: "modal-overlay")
     end
 
-    def div_outer_container(&)
-      div(id: "modal-outer",
-        class: "modal-outer",
-        data: {
-          modal_target: "modal"
-        }, &)
+    def div_outer(&)
+      div(id: "modal-outer", class: "modal-outer", &)
     end
 
-    def div_inner_container(&)
-      div(id: "modal-inner",
-        class: "modal-inner",
-        data: {
-          modal_target: "innerModal"
-        }, &)
+    def div_inner(&)
+      div(id: "modal-inner", class: "modal-inner", &)
+    end
+
+    def div_content(&)
+      div(id: "modal-content", class: "modal-content", data: {modal_target: "content"}, &)
+    end
+
+    def div_main(&)
+      div(id: "modal-main", class: "modal-main", &)
     end
 
-    def div_border(&)
-      klass = "modal-border"
-      klass = "#{klass} modal-padding" if @padding == true
-      klass = "#{klass} #{@padding}" if @padding.is_a?(String)
-      div(id: "modal-border", class: klass, &)
+    def div_header(&)
+      div(id: "modal-header", class: "modal-header") do
+        div_title
+        button_close
+      end
     end
 
-    def button_close(&)
-      div(class: "modal-close") do
-        button(type: "button",
-          aria: {label: "close"},
-          data: {
-            action: "modal#hideModal"
-          }) { icon_close }
+    def div_title
+      div(id: "modal-title", class: "modal-title") do
+        h3(id: "modal-title-h", class: "modal-title-h") { @title }
       end
     end
 
+    def div_footer
+      div(id: "modal-footer", class: "modal-footer") do
+        render @footer
+      end
+    end
+
+    def button_close
+      div(id: "modal-close", class: "modal-close") do
+        close_button_tag do
+          icon_close
+          span(class: "sr-only") { "Close modal" }
+        end
+      end
+    end
+
+    def close_button_tag(&)
+      button(type: "button",
+        aria: {label: "close"},
+        class: "modal-close-button",
+        data: {
+          action: "modal#hideModal"
+        }, &)
+    end
+
     def icon_close
-      svg(
-        xmlns: "http://www.w3.org/2000/svg",
-        fill: "none",
-        viewbox: "0 0 24 24",
-        stroke_width: "1.5",
-        stroke: "currentColor",
-      ) do |s|
+      svg(class: "modal-close-icon", fill: "currentColor", viewBox: "0 0 20 20") do |s|
         s.path(
-          stroke_linecap: "round",
-          stroke_linejoin: "round",
-          d: "M6 18L18 6M6 6l12 12"
+          fill_rule: "evenodd",
+          d: "M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z",
+          clip_rule: "evenodd"
         )
       end
     end

data/lib/ultimate_turbo_modal/helpers/view_helper.rb

@@ -1,9 +1,7 @@
 module UltimateTurboModal::Helpers
   module ViewHelper
-    def modal(**)
-      render UltimateTurboModal.new(request:, **) do
-        yield
-      end
+    def modal(**, &)
+      render(UltimateTurboModal.new(request:, **), &)
     end
   end
 end

data/lib/ultimate_turbo_modal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UltimateTurboModal
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/ultimate_turbo_modal.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "ultimate_turbo_modal/version"
+require "ultimate_turbo_modal/configuration"
 require "ultimate_turbo_modal/railtie"
 require "ultimate_turbo_modal/base"
 Dir[File.join(__dir__, "ultimate_turbo_modal/flavors", "*.rb")].sort.each do |file|
@@ -10,8 +11,6 @@ end
 module UltimateTurboModal
   extend self
 
-  DEFAULT_FLAVOR = :tailwind
-
   def new(**)
     modal_class.new(**)
   end
@@ -20,13 +19,5 @@ module UltimateTurboModal
     "UltimateTurboModal::Flavors::#{flavor.to_s.classify}".constantize
   end
 
-  def flavor=(flavor)
-    @flavor = flavor
-  end
-
-  def flavor
-    defined?(@flavor) ? @flavor&.to_sym : DEFAULT_FLAVOR
-  end
-
   class Error < StandardError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultimate_turbo_modal
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Carl Mercier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex-rails
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - lib/ultimate_turbo_modal.rb
 - lib/ultimate_turbo_modal/base.rb
+- lib/ultimate_turbo_modal/configuration.rb
 - lib/ultimate_turbo_modal/flavors/tailwind.rb
 - lib/ultimate_turbo_modal/flavors/vanilla.rb
 - lib/ultimate_turbo_modal/helpers/controller_helper.rb