ultimate_turbo_modal 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a456aa7e0fdb49a0b9ae53817f965df422145433f6d981811cbb0172126422dd
-  data.tar.gz: 4fdb91772d698e7d1987024acb165f1ef8380446d600c5146b834025cb84c497
+  metadata.gz: b09b8cb53143af89cae066415021da467520342232aa61eec3c53b93fbc57b0d
+  data.tar.gz: b8c033322d1af2cf0117e7bbadf914668bdd8c7eb540487eadaccd31722a3473
 SHA512:
-  metadata.gz: 63ae9236655b7d2d300507413808a5771ca205dc12d08eecc48a3f256ddf24525f8b2b401a432a4df035d6fbd929c738e0a74c5bd1036a1f16b62b786ce756bb
-  data.tar.gz: d5fc098465cdba81f1981e49cce9721e049db78d02a448e734ea60f0c41b6119311a15e1ac922c7d0667d274431cb86bacaf9d3310c2ee51979f695cee3135ac
+  metadata.gz: fbe3f49e69952e28b6fcd3b26d7423700d10f5703a6802acb5be6a9dbdf7cff0003e01a44c4afdae255fd314f78e9c008f1d40f95f78254d6d8c6600762b398d
+  data.tar.gz: 66a67b13c8dfc6e8b1b0b36a091d1595034cce465196aa73c03f8fedcf09db4f1e733b8c13041f8e923fd6ab52697adb54b0e33e8308a3092365af062b9fd6b5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.3.0] - 2023-11-14
+
+- Added ability to pass in a `title` block.
+
+## [1.2.1] - 2023-11-11
+
+- Fix footer divider not showing
+
 ## [1.2.0] - 2023-11-05
 
 - Dark mode support

data/Gemfile.lock

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

data/README.md

@@ -75,14 +75,14 @@ end
 
 5. Register the Stimulus controller in `app/javascript/controllers/index.js` adding the following lines at the end.
 
-```js
+```javascript
 import setupUltimateTurboModal from "ultimate_turbo_modal";
 setupUltimateTurboModal(application);
 ```
 
 6. If using the Tailwind flavor, add the following to `tailwind.config.js`:
 
-```
+```javascript
 // For npm/yarn
 const { getUltimateTurboModalPath } = require('ultimate_turbo_modal/gemPath');
 
@@ -97,16 +97,17 @@ const { getUltimateTurboModalPath } = require('ultimate_turbo_modal/gemPath');
 
 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()
+```javascript
+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.
+1. Optionally (but recommended), configure UTMR to use Idiomorph. See below for details.
 
  
  
@@ -158,7 +159,7 @@ If a URL is specified as a String, the browser history will advance, and the URL
 
 ### `title`, default: `nil`
 
-Title to display in the modal header.
+Title to display in the modal header. Alternatively, you can set the title with a block.
 
 ### `header`, default: `true`
 
@@ -172,8 +173,6 @@ Whether to display a divider below the header.
 
 Whether to display a divider above the footer. The divider will not appear if no footer was specified.
 
-
-
 ### Example usage with options
 
 ```erb
@@ -188,6 +187,24 @@ Whether to display a divider above the footer. The divider will not appear if no
 <% end %>
 ```
 
+### Title and Footer
+
+You can set a custom title and footer by passing a block. For example
+
+```erb
+<%= modal do |m| %>
+  <% m.title do %>
+    <div>My Title</div>
+  <% end %>
+
+  Modal body
+
+  <% m.footer do %>
+    <input type="submit" form="myform">Submit</input>
+  <% end %>
+<% end %>
+```
+
 ## Installing & Configuring Idiomorph
 
 Idiomorph can morph Turbo Frame responses to allow seemless navigation within Turbo Frames
@@ -202,7 +219,7 @@ In the meantime, add `<script src="https://unpkg.com/idiomorph"></script>` to yo
 
 And the following code to `application.js`:
 
-```js
+```javascript
 addEventListener("turbo:before-frame-render", (event) => {
   event.detail.render = (currentElement, newElement) => {
     Idiomorph.morph(currentElement, newElement, {

data/lib/phlex/deferred_render_with_main_content.rb

@@ -0,0 +1,8 @@
+module Phlex
+  module DeferredRenderWithMainContent
+    def template(&)
+      output = capture(&)
+      super { unsafe_raw(output) }
+    end
+  end
+end

data/lib/ultimate_turbo_modal/base.rb

@@ -1,4 +1,5 @@
 class UltimateTurboModal::Base < Phlex::HTML
+  prepend Phlex::DeferredRenderWithMainContent
   # @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
@@ -48,25 +49,31 @@ class UltimateTurboModal::Base < Phlex::HTML
     end
   end
 
+  def title(&block)
+    @title_block = block
+  end
+
   def footer(&block)
     @footer = block
   end
 
   private
 
-  attr_accessor :request, :title
+  attr_accessor :request
 
   def padding? = !!@padding
 
   def close_button? = !!@close_button
 
+  def title_block? = !!@title_block
+
   def title? = !!@title
 
   def header? = !!@header
 
   def footer? = @footer.present?
 
-  def header_divider? = !!@header_divider && title?
+  def header_divider? = !!@header_divider && (@title_block || title?)
 
   def footer_divider? = !!@footer_divider && footer?
 

data/lib/ultimate_turbo_modal/flavors/tailwind.rb

@@ -76,6 +76,12 @@ module UltimateTurboModal::Flavors
       div(id: "modal-main", class: "group-data-[padding=true]:p-4 group-data-[padding=true]:pt-2", &)
     end
 
+    def header_block
+      return if @header_block.blank?
+      render @header_block
+      nil
+    end
+
     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
@@ -85,7 +91,11 @@ module UltimateTurboModal::Flavors
 
     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 }
+        if @title_block.present?
+          render @title_block
+        else
+          h3(id: "modal-title-h", class: "group-data-[title=false]:hidden text-lg font-semibold text-gray-900 dark:text-white") { @title }
+        end
       end
     end
 

data/lib/ultimate_turbo_modal/flavors/vanilla.rb

@@ -79,7 +79,11 @@ module UltimateTurboModal::Flavors
 
     def div_title
       div(id: "modal-title", class: "modal-title") do
-        h3(id: "modal-title-h", class: "modal-title-h") { @title }
+        if @title_block.present?
+          render @title_block
+        else
+          h3(id: "modal-title-h", class: "modal-title-h") { @title }
+        end
       end
     end
 

data/lib/ultimate_turbo_modal/version.rb

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

data/lib/ultimate_turbo_modal.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "ultimate_turbo_modal/version"
+require "phlex/deferred_render_with_main_content"
 require "ultimate_turbo_modal/configuration"
 require "ultimate_turbo_modal/railtie"
 require "ultimate_turbo_modal/base"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultimate_turbo_modal
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Carl Mercier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-05 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex-rails
@@ -90,6 +90,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/phlex/deferred_render_with_main_content.rb
 - lib/ultimate_turbo_modal.rb
 - lib/ultimate_turbo_modal/base.rb
 - lib/ultimate_turbo_modal/configuration.rb