trestle-search 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1df45597ebe609e810ac3abfb19ea0355ce6f3e5257abe234d0db52520612fc2
-  data.tar.gz: 7a0bf19efeabfa9e717c8d070936608c7dc02e9155a7211af4383adc91701b2f
+  metadata.gz: c1ba3963b3be70834383be75f9ea8b4babd68c0555cb0757dc4bbc100ae27bb3
+  data.tar.gz: d267ebc746d46782983543e656959cd2f34a060fdd15fac1d26e544c567e0cbd
 SHA512:
-  metadata.gz: ceebae083e563dc093dfc04b157b9976d9d87b7382f1e2d5189bc4f669a2cd07d6d897018a9e0a354bdac3dbf8799282a57dcda6a6c8bd8b02f57f2bb028f8b7
-  data.tar.gz: 01fa168282d6041a9cf6f3d6f7de2c3ea5ba9f1ab7511d4e6b1af51ea7d0e438dddc5e1ffbafc11f6f5cd7dcee8c05b1c2386a23c19a92f5258cac9dee54a752
+  metadata.gz: 4520214c2670c705604957686d9261234189e4cdea69e2e34d6e0f742d84f4dae74d5c99b2496dc5fd20607971f4ec6aabe998c027c68e2e8666421a71aab15b
+  data.tar.gz: 4e96a03daf68830169aa0a4ca005e81529fdd886361ca774289e2f493a26ec1861e944395b50e17966d28d0231c4da381a42a97a4ccac7ae03f9d17c99df9bba

data/app/assets/bundle/trestle/search.css

@@ -1 +1 @@
-.searchbox{margin-right:auto;max-width:30em;width:100%}.searchbox .input-group{background:#fff;border:1px solid #ccc;border-radius:50rem}.searchbox .form-control,.searchbox .input-group-text{background:transparent;border:0}.searchbox .form-control{box-shadow:none;padding-left:0}.searchbox .form-control::-webkit-search-cancel-button{display:none}.searchbox .clear-search{color:#555;font-size:1.2rem;padding:.35rem;position:absolute;right:.75rem;z-index:5}.searchbox .clear-search:focus,.searchbox .clear-search:hover{color:#333}
+.searchbox{margin-right:auto;max-width:30em;width:100%}.searchbox .input-group{background:#fff;border:1px solid #ccc;border-radius:50rem}.searchbox .form-control,.searchbox .input-group-text{background:transparent;border:0}.searchbox .form-control{box-shadow:none;padding-left:0}.searchbox .form-control::-webkit-search-cancel-button{display:none}.searchbox .btn-clear-search{--bs-btn-padding-y:0;--bs-btn-font-size:1.325rem;--bs-btn-color:#555;--bs-btn-hover-color:#333}@media(min-width:576px){.searchbox .btn-clear-search{--bs-btn-font-size:1.25rem}}

data/app/views/trestle/search/_search.html.erb

@@ -1,9 +1,13 @@
 <div class="searchbox">
-  <%= form_tag admin.path, method: :get do %>
+  <%= form_tag admin.path, method: :get, data: { turbo_frame: "main" } do %>
+    <%= serialize_persistent_params except: :q %>
+
     <div class="input-group">
-      <span class="input-group-text"><icon class="fa fa-search"></icon></span>
-      <%= link_to icon("fa fa-times"), admin.path, class: "clear-search" if params[:q].present? %>
+      <%= label_tag :q, icon("fas fa-search"), class: "input-group-text" %>
+
       <%= search_field_tag :q, params[:q], class: "form-control", autocomplete: "off", placeholder: admin.t("search.placeholder", default: "Search") %>
+
+      <%= link_to icon("fas fa-times"), persistent_params.except(:q), class: "btn btn-clear-search", data: { turbo_frame: "main" } if params[:q].present? %>
     </div>
   <% end %>
 </div>

data/frontend/index.scss

@@ -1,3 +1,5 @@
+@import "~trestle/frontend/css/support";
+
 .searchbox {
   width: 100%;
   max-width: 30em;
@@ -27,16 +29,14 @@
     }
   }
 
-  .clear-search {
-    position: absolute;
-    right: 0.75rem;
-    z-index: 5;
-    color: #555;
-    font-size: 1.2rem;
-    padding: 0.35rem;
+  .btn-clear-search {
+    --bs-btn-padding-y: 0;
+    --bs-btn-font-size: 1.325rem;
+    --bs-btn-color: #555;
+    --bs-btn-hover-color: #333;
 
-    &:hover, &:focus {
-      color: #333;
+    @include media-breakpoint-up(sm) {
+      --bs-btn-font-size: 1.25rem;
     }
   }
 }

data/lib/trestle/search/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Search
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle-search",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Search plugin for the Trestle admin framework",
   "main": "index.scss",
   "repository": "https://github.com/TrestleAdmin/trestle-search.git",
@@ -13,16 +13,16 @@
     "watch": "webpack --mode development --watch"
   },
   "devDependencies": {
-    "autoprefixer": "^10.2.6",
-    "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^3.0.2",
-    "mini-css-extract-plugin": "^2.0.0",
-    "node-sass": "^7.0.0",
-    "postcss-loader": "^6.1.1",
-    "sass-loader": "^12.1.0",
-    "webpack": "^5.42.0",
-    "webpack-cli": "^4.7.2",
-    "webpack-remove-empty-scripts": "^0.7.1"
+    "autoprefixer": "^10.4.20",
+    "css-loader": "^7.1.2",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "mini-css-extract-plugin": "^2.9.1",
+    "postcss-loader": "^8.1.1",
+    "sass": "^1.79.1",
+    "sass-loader": "^16.0.1",
+    "webpack": "^5.94.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-remove-empty-scripts": "^1.0.4"
   },
   "dependencies": {
     "trestle": "https://github.com/TrestleAdmin/trestle.git"

data/trestle-search.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/TrestleAdmin/trestle-search"
 
-  spec.add_dependency "trestle", "~> 0.10.0"
+  spec.add_dependency "trestle", "~> 0.10.1"
 
   spec.add_development_dependency "rspec-rails"
 end