refine-rails 2.11.2 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec12ae81254832b4944ed63912029ae7e3b72bd6a148099165639d9722ccffce
-  data.tar.gz: bd7502535b6c4e135047a9c575d7ae3897943dec9492ff846b466cb0acf28b67
+  metadata.gz: d1421ece0ebb5f98fc900504e64ffe00792141506999a2103542c59b1ecfdf8c
+  data.tar.gz: d5877f85705a36f7fc669755875b753e616bd4592d68f584a7ec4cd3092b588a
 SHA512:
-  metadata.gz: 3463b960fb9f18706ac6bac468f17cb6f82c2a3cebe1f5faf9c99cb6f56afb4f42bd63738d07d57541755e0f675f8863b718d9ba2d22620d3aa6ce9aa6609ed9
-  data.tar.gz: 2cecf6e61f615e5fbba835545a2e5d5963c4b992233ba4fa194fc4e0e9ce9618520aff2a016225197eaf54c7b1d1385a229449126a20725eb8d943c70ec8d65c
+  metadata.gz: 00c6859c614af6b424d39f676c6a5c9f180231076803a13fd4be5a384e486adb4b10fd8bbea360964b67a368932896b527fe21a5a811db2a981206cd43e93500
+  data.tar.gz: 968fd2f3d6e8c3aae8cde871db0c4e8d88764fb9c5ea3b924e607a49398109013b2d0c294115c6b6c221c8770d42e4551fd0c94e4a6460e64ef88153081a7b51

data/app/assets/stylesheets/index.css

@@ -1219,7 +1219,14 @@
 }
 
 .refine--groups-wrapper {
-  flex-grow: 1;
+  display: flex;
+  gap: 10px;
+  row-gap: 15px;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.refine--or-group {
   display: flex;
   gap: 10px;
   row-gap: 15px;
@@ -1234,6 +1241,13 @@
   align-items: center;
 }
 
+@media (max-width: 960px) {
+  .refine--filter-control-group {
+    justify-content: end;
+    width: 25%;
+  }
+}
+
 .refine--group-join, .refine--condition-join {
   position: relative;
   padding: 5px 0;
@@ -1246,6 +1260,11 @@
   }
 }
 
+.refine--group-join-stack {
+  width: 100%;
+  text-align: left;
+}
+
 .refine--group {
   display: flex;
   gap: 10px;

data/app/assets/stylesheets/index.tailwind.css

@@ -398,7 +398,14 @@
 }
 
 .refine--groups-wrapper {
-  flex-grow: 1;
+  display: flex;
+  gap: 10px;
+  row-gap: 15px;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.refine--or-group {
   display: flex;
   gap: 10px;
   row-gap: 15px;
@@ -413,6 +420,13 @@
   align-items: center;
 }
 
+@media (max-width: 960px) {
+  .refine--filter-control-group {
+    justify-content: end;
+    width: 25%; 
+  }
+}
+
 .refine--group-join, .refine--condition-join {
   position: relative;
   padding: 5px 0;
@@ -425,6 +439,11 @@
   }
 }
 
+.refine--group-join-stack {
+  width: 100%;
+  text-align: left;
+}
+
 .refine--group {
   display: flex;
   gap: 10px;

data/app/views/refine/inline/filters/_criterion.html.erb

@@ -9,7 +9,7 @@
       <%= link_to refine_inline_criterion_path(criterion.position, criterion.to_params), class: "refine--remove-condition", data: {turbo_method: :delete, controller: "refine--turbo-stream-link", action: "refine--turbo-stream-link#visit"} do %>
         <span class="material-icons-outlined refine--icon-sm">clear</span>
       <% end %>
-      <%= link_to edit_refine_inline_criterion_path(criterion.position, criterion.to_params), class:"refine--condition-pill-button", data: {controller: "refine--turbo-stream-link", action: "refine--turbo-stream-link#visit"} do %>
+      <%= link_to edit_refine_inline_criterion_path(criterion.position, criterion.to_params), class:"refine--condition-pill-button", data: {controller: "refine--turbo-stream-link", action: "refine--turbo-stream-link#visit refine--popup#show"} do %>
         <div class="refine--condition-pill-name"><%= criterion.condition_display %></div>
         <div class="refine--condition-value-clause"><%= criterion.clause_display %></div>
         <div class="refine--condition-value-self" title="<%= criterion.human_readable_value %>">

data/app/views/refine/inline/filters/_group.html.erb

@@ -1,4 +1,12 @@
+<% render_stack ||= false %>
+
+<% if render_stack %>
+  <div class="refine--or-group">
+<% end %>
 <% group.each.with_index do |criterion, i| %>
   <%= render "refine/inline/filters/criterion", criterion: criterion, placement: i, size: group.length %>
 <% end %>
 <%= render "refine/inline/filters/and_button", position: group.last.position + 1, show_label: (group_count < 2 && condition_count < 2) %>
+<% if render_stack %>
+  </div> 
+<% end %>

data/app/views/refine/inline/filters/_show.html.erb

@@ -3,6 +3,7 @@
 
   root_data = (defined?(data) && data) || {}
 
+  render_stack = defined?(render_stack) ? render_stack : false
   main_row_class = class_names "refine--filter-row" => true,
     "refine--has-many-groups" => groups.many?
 %>
@@ -15,12 +16,18 @@
       <div class="refine--groups-wrapper">
         <% groups.each.with_index do |group, i| %>
           <% unless i == 0 %>
-              <div class="refine--group-join"><%= t("refine.inline.filters.or") %></div>
+            <% if render_stack %>
+              <div class="refine--group-join-stack">
             <% end %>
-            <%= render "refine/inline/filters/group", group: group, group_count: groups.count, condition_count: group.count %>
-            <% if i == groups.length - 1 %>
-              <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length %>
+              <div class="refine--group-join"><%= t("refine.inline.filters.or") %></div>
+            <% if render_stack %>
+              </div>
             <% end %>
+          <% end %>
+          <%= render "refine/inline/filters/group", group: group, group_count: groups.count, condition_count: group.count, render_stack: render_stack %>
+          <% if i == groups.length - 1 %>
+            <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length %>
+          <% end %>
         <% end %>
 
       </div>

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.11.2"
+    VERSION = "2.11.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.11.4
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails