Merge branch 'main' into feature/replace-openstruct-with-data

avo-hq · Oct 4, 2024 · ce64420 · ce64420
2 parents ec93dbc + d860282
commit ce64420
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 21 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -107,7 +107,7 @@ GIT
 PATH
   remote: .
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/app/components/avo/modal_component.rb b/app/components/avo/modal_component.rb
@@ -6,7 +6,7 @@ class Avo::ModalComponent < Avo::BaseComponent
 
   prop :width, Symbol, default: :md
   prop :body_class, _Nilable(String)
-  prop :overflow, Symbol, default: :auto
+  prop :overflow, _Nilable(Symbol), default: :auto
 
   def width_classes
     case @width.to_sym

diff --git a/app/javascript/js/controllers/toggle_controller.js b/app/javascript/js/controllers/toggle_controller.js
@@ -6,12 +6,12 @@ export default class extends Controller {
   static targets = ['panel']
 
   static values = {
-    // One may want to have an element that is exempt from triggerring the click outside event
-    exemptionContainer: String,
+    // One may want to have elements that are exempt from triggering the click outside event
+    exemptionContainers: Array,
   }
 
-  get exemptionContainerTarget() {
-    return document.querySelector(this.exemptionContainerValue)
+  get exemptionContainerTargets() {
+    return this.exemptionContainersValue.map((selector) => document.querySelector(selector)).filter(Boolean)
   }
 
   connect() {
@@ -20,13 +20,9 @@ export default class extends Controller {
 
   clickOutside(e) {
     if (this.hasPanelTarget) {
-      if (this.hasExemptionContainerValue && this.exemptionContainerTarget) {
-        const inExemptionContainer = this.exemptionContainerTarget.contains(e.target)
+      const isInExemptionContainer = this.hasExemptionContainersValue && this.exemptionContainerTargets.some((container) => container.contains(e.target))
 
-        if (!inExemptionContainer) {
-          leave(this.panelTarget)
-        }
-      } else {
+      if (!isInExemptionContainer) {
         leave(this.panelTarget)
       }
     }

diff --git a/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock b/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock b/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock b/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock
@@ -112,7 +112,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock b/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock
@@ -112,7 +112,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.13.1)
+    avo (3.13.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

diff --git a/lib/avo/version.rb b/lib/avo/version.rb
@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.13.1" unless const_defined?(:VERSION)
+  VERSION = "3.13.3" unless const_defined?(:VERSION)
 end