overlastic 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e96bc71c763fd39cbc4b0ee2a07019e30844548150f6ed631cb0620841b5eda1
-  data.tar.gz: e69237d7b05f3fca7725cf24d23e4ef995359d3f3a52dd1dff942c341afe1c47
+  metadata.gz: 6d66f3738b0bd9d8474526231f6473f18a64d564219f0cf8434b0e69dd7c2d62
+  data.tar.gz: 408a1146a746df3bd9a1c9776b212df6d79d3d366a90fa1f136e7dc35f811b4c
 SHA512:
-  metadata.gz: 6c3ebd9884690c569505c86b47d4b6e05c99ec62460c7645151a392c23ce7f44a7cec50fdd5b49d939d88876e04f65691c8a17528ce4a88d25fbddca9688015e
-  data.tar.gz: 60aecc32d39d580e76f574720e6a0bdb9e1357b997d66d83c350f2a2d87492c821e4cbb8ebd3c61bb199101cf84f431ca4246fdfc1cf34acd978e21754df952e
+  metadata.gz: 823f2352f8706a17cdd3852a94610ca463f5a9984ba988e0423f32cbfbc964f4d1db7352e730df34eb2c05901c0f073546e1a4a1fe12e82e438f3f2a311f9ea7
+  data.tar.gz: 5cfd7af089adddfd47c618d23932030ffadb706da1a0811de87a62003d94a92d9e5e6a4600a49edfbcba19012e4dde82764169e177019aa5088303417defd926

data/app/controllers/overlastic/concerns/overlay_handling.rb

@@ -13,6 +13,10 @@ module Overlastic::Concerns::OverlayHandling
     def close_overlay(key = :last, **options)
       overlay_name = helpers.overlay_name_from(key) || :overlay1
 
+      # In case a Turbo Stream is appended which renders new overlay links, they should be generated
+      # relative to the foremost overlay still open after closing the requested overlays.
+      request.headers["Overlay-Name"] = :"overlay#{helpers.overlay_number_from(overlay_name) - 1}"
+
       options.filter { |key, _| key.in? self.class._flash_types }.each { |key, value| flash.now[key] = value }
 
       if block_given?
@@ -92,8 +96,6 @@ module Overlastic::Concerns::OverlayHandling
 
       if request.variant.overlay?
         if overlay_name.present?
-          overlay_name = nil unless helpers.valid_overlay_name?(overlay_name)
-
           request.variant.delete :overlay
           flash.merge! response_options.filter { |key, _| key.in? self.class._flash_types }
 

data/app/helpers/overlastic/overlays_helper.rb

@@ -19,8 +19,12 @@ module Overlastic::OverlaysHelper
     request.headers["Overlay-Name"]&.to_sym
   end
 
+  def overlay_number_from(name)
+    name.to_s.scan(/\d+/)&.first.to_i
+  end
+
   def overlay_name_from(key)
-    current_number = current_overlay_name.to_s.scan(/\d+/)&.first.to_i
+    current_number = overlay_number_from current_overlay_name
 
     case key
     when :first, :all
@@ -37,7 +41,7 @@ module Overlastic::OverlaysHelper
   end
 
   def valid_overlay_name?(name)
-    name.to_s.scan(/\d+/)&.first&.to_i&.positive?
+    overlay_number_from(name).positive?
   end
 
   def render_overlay(locals = {}, &block)

data/lib/overlastic/version.rb

@@ -1,3 +1,3 @@
 module Overlastic
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overlastic
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Martin Zamuner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack