yummy-guide-generic-administrate 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef007572ee8fc90b0579c0e6261263bb568d192702eb92ee418976a06404ffc
-  data.tar.gz: be42920844cf830f365d2297e21605ad5191257d5a3f37ba2dd9f364ae16c768
+  metadata.gz: a0a5f41bc5f403a7d4da80d9a2b66c7313a9370374e171d2916b96de8aea2a8d
+  data.tar.gz: 77c5494b19b7c2364477e394c954e5640ac737658e05ec481ecef62aafc30c59
 SHA512:
-  metadata.gz: 1f9203647f13a0974af5bd4b0de54ff23c2a8991ce0eb3e065a3c0d561b1f88898c9bc470642c294bf786f5250eab2f9d5780c91b35d3f6b3cc1da9f36e2a305
-  data.tar.gz: b5d15a4f6ca3e708542fab9b1ce320ee76e45f3774bf775394cbff9548f4aca75f945259ef5e1a4c703a5ac5a3baa604a6933a6171868e83633f203698119866
+  metadata.gz: 73ea4e2fb99ffc3e16393fc105e93b39e0812ad313f4e88f95a333ae18a10132e7207e482c956f37dad5391c8ceb6ab246724adc6e413fe8d5b012c3d45c03fc
+  data.tar.gz: e891e0b581251db97ac188c934bef264d77790b47b154e44dd57f4d82cc57e4bd1f8d5a48e1537cf710e0e585935ff10eb889c3bac690a1455d16477b979b069

data/app/assets/javascripts/yummy_guide_administrate/sticky_left_columns.js

@@ -1,5 +1,6 @@
 (function() {
   var TABLE_SELECTOR = "table[data-fixed-columns-count]";
+  var MOBILE_MEDIA_QUERY = "(max-width: 767px)";
   var resizeObservers = new WeakMap();
 
   function directCells(row) {
@@ -31,10 +32,20 @@
   }
 
   function fixedColumnsCount(table) {
-    var parsedCount = parseInt(table.dataset.fixedColumnsCount || "0", 10);
+    var rawCount = table.dataset.fixedColumnsCount || "0";
+
+    if (isMobile() && table.dataset.mobileFixedColumnsCount) {
+      rawCount = table.dataset.mobileFixedColumnsCount;
+    }
+
+    var parsedCount = parseInt(rawCount, 10);
     return Number.isNaN(parsedCount) ? 0 : Math.max(parsedCount, 0);
   }
 
+  function isMobile() {
+    return window.matchMedia && window.matchMedia(MOBILE_MEDIA_QUERY).matches;
+  }
+
   function stickyOffsets(table, count) {
     var headerRow = table.querySelector("thead tr");
     if (!headerRow) return [];

data/app/assets/javascripts/yummy_guide_administrate/sticky_table_headers.js

@@ -1,6 +1,7 @@
 (function() {
   var TABLE_SELECTOR = 'table[data-fixed-columns-count]';
   var WRAPPER_SELECTOR = '[data-fixed-header-scroll], .scroll-table, .home-table__wrapper, .table-wrap, .af__table__content';
+  var MOBILE_MEDIA_QUERY = '(max-width: 767px)';
   var resizeObservers = new WeakMap();
   var observedScrolls = new WeakMap();
   var observedFixedScrolls = new WeakMap();
@@ -36,10 +37,20 @@
   }
 
   function fixedColumnsCount(table) {
-    var parsedCount = parseInt(table.dataset.fixedColumnsCount || '0', 10);
+    var rawCount = table.dataset.fixedColumnsCount || '0';
+
+    if (isMobile() && table.dataset.mobileFixedColumnsCount) {
+      rawCount = table.dataset.mobileFixedColumnsCount;
+    }
+
+    var parsedCount = parseInt(rawCount, 10);
     return Number.isNaN(parsedCount) ? 0 : Math.max(parsedCount, 0);
   }
 
+  function isMobile() {
+    return window.matchMedia && window.matchMedia(MOBILE_MEDIA_QUERY).matches;
+  }
+
   function stickyOffsets(widths) {
     var offsets = [];
     var currentLeft = 0;
@@ -555,6 +566,7 @@
 
     fixedTable.className = fixedHeaderTableClassName(sourceTable);
     fixedTable.dataset.fixedColumnsCount = sourceTable.dataset.fixedColumnsCount || '0';
+    fixedTable.dataset.mobileFixedColumnsCount = sourceTable.dataset.mobileFixedColumnsCount || fixedTable.dataset.fixedColumnsCount;
     fixedTable.style.width = '';
     fixedTable.innerHTML = sourceHead.outerHTML;
 

data/app/assets/stylesheets/yummy_guide_administrate/components.scss

@@ -661,6 +661,27 @@ table[data-fixed-columns-count] [data-fixed-header-column-min-width] {
 }
 
 @media (max-width: 767px) {
+  .scroll-table,
+  .sticky-table-scroll,
+  .home-table__wrapper,
+  .table-wrap,
+  .af__table__content {
+    max-width: 100%;
+    overflow-x: auto;
+    overflow-y: hidden;
+    -webkit-overflow-scrolling: touch;
+    overscroll-behavior-x: contain;
+    touch-action: pan-x pan-y;
+  }
+
+  .scroll-table table[data-fixed-columns-count],
+  .sticky-table-scroll table[data-fixed-columns-count],
+  .home-table__wrapper table[data-fixed-columns-count],
+  .table-wrap table[data-fixed-columns-count],
+  .af__table__content table[data-fixed-columns-count] {
+    min-width: max-content;
+  }
+
   .yummy-guide-administrate-filter-form__title {
     padding: 16px 16px 12px;
   }

data/app/dashboards/yummy_guide/administrate/application_dashboard.rb

@@ -25,6 +25,18 @@ module YummyGuide
         end
       end
 
+      def self.index_mobile_fixed_columns_count
+        if const_defined?(:INDEX_MOBILE_FIXED_COLUMNS_COUNT, false)
+          const_get(:INDEX_MOBILE_FIXED_COLUMNS_COUNT)
+        elsif const_defined?(:INDEX_FIXED_COLUMNS_COUNT, false)
+          [index_fixed_columns_count.to_i, 1].min
+        elsif superclass.respond_to?(:index_mobile_fixed_columns_count)
+          superclass.index_mobile_fixed_columns_count
+        else
+          [index_fixed_columns_count.to_i, 1].min
+        end
+      end
+
       def self.collection_sortable_attributes
         if const_defined?(:COLLECTION_SORTABLE_ATTRIBUTES, false)
           const_get(:COLLECTION_SORTABLE_ATTRIBUTES)
@@ -43,4 +55,3 @@ module YummyGuide
     end
   end
 end
-

data/app/helpers/yummy_guide/administrate/collection_helper.rb

@@ -9,16 +9,19 @@ module YummyGuide
       ].freeze
 
       def yummy_guide_administrate_collection_table_fixed_columns_count(page:, collection_presenter:)
-        return 0 unless page.respond_to?(:instance_variable_defined?) && page.instance_variable_defined?(:@dashboard)
-
-        dashboard = page.instance_variable_get(:@dashboard)
-        return 0 unless dashboard&.class&.respond_to?(:index_fixed_columns_count)
-
-        fixed_columns_count = dashboard.class.index_fixed_columns_count.to_i
-        fixed_columns_count = 0 if fixed_columns_count.negative?
+        yummy_guide_administrate_collection_fixed_columns_count_for(
+          page: page,
+          collection_presenter: collection_presenter,
+          method_name: :index_fixed_columns_count
+        )
+      end
 
-        attribute_count = collection_presenter.attribute_types.size
-        [fixed_columns_count, attribute_count].min
+      def yummy_guide_administrate_collection_table_mobile_fixed_columns_count(page:, collection_presenter:)
+        yummy_guide_administrate_collection_fixed_columns_count_for(
+          page: page,
+          collection_presenter: collection_presenter,
+          method_name: :index_mobile_fixed_columns_count
+        )
       rescue NoMethodError
         0
       end
@@ -87,6 +90,21 @@ module YummyGuide
 
       private
 
+      def yummy_guide_administrate_collection_fixed_columns_count_for(page:, collection_presenter:, method_name:)
+        return 0 unless page.respond_to?(:instance_variable_defined?) && page.instance_variable_defined?(:@dashboard)
+
+        dashboard = page.instance_variable_get(:@dashboard)
+        return 0 unless dashboard&.class&.respond_to?(method_name)
+
+        fixed_columns_count = dashboard.class.public_send(method_name).to_i
+        fixed_columns_count = 0 if fixed_columns_count.negative?
+
+        attribute_count = collection_presenter.attribute_types.size
+        [fixed_columns_count, attribute_count].min
+      rescue NoMethodError
+        0
+      end
+
       def yummy_guide_administrate_collection_link(content, href:, target: nil, html_class: "action-show", aria: nil, data: nil)
         return content if href.blank?
 

data/app/helpers/yummy_guide/administrate/filter_controls_helper.rb

@@ -17,7 +17,8 @@ module YummyGuide
         extra_actions: [],
         button_label: "Filter",
         title: "Filter Options",
-        submit_label: "Filter"
+        submit_label: "Filter",
+        close_label: "Close"
       )
         dashboard ||= admin_filter_dashboard_from_page(page)
         scope = form.to_s
@@ -63,7 +64,8 @@ module YummyGuide
                 locals: locals,
                 extra_actions: extra_actions,
                 title: title,
-                submit_label: submit_label
+                submit_label: submit_label,
+                close_label: close_label
               )
             ])
           end
@@ -104,7 +106,7 @@ module YummyGuide
           .select { |field| field.visible?(self, locals) }
       end
 
-      def admin_filter_form(fields:, scope:, path:, clear_path:, method:, current_values:, hidden_fields:, root_hidden_fields:, locals:, extra_actions:, title:, submit_label:)
+      def admin_filter_form(fields:, scope:, path:, clear_path:, method:, current_values:, hidden_fields:, root_hidden_fields:, locals:, extra_actions:, title:, submit_label:, close_label:)
         form_with(
           url: path,
           scope: scope,
@@ -119,7 +121,7 @@ module YummyGuide
         ) do |f|
           safe_join([
             admin_filter_hidden_fields(scope, hidden_fields, root_hidden_fields),
-            content_tag(:h2, title, class: "filter-form__title"),
+            admin_filter_form_header(title: title, close_label: close_label),
             content_tag(:div, class: "filter-form__body") do
               content_tag(:table, class: "filter_table") do
                 safe_join(fields.map { |field| field.row(self, f, scope, current_values, locals) })
@@ -136,6 +138,22 @@ module YummyGuide
         end
       end
 
+      def admin_filter_form_header(title:, close_label:)
+        content_tag(:div, class: "filter-form__header") do
+          safe_join([
+            content_tag(:h2, title, class: "filter-form__title"),
+            button_tag(
+              "x",
+              type: "button",
+              class: "filter-form__close",
+              data: { behavior: "filter-form-close" },
+              aria: { label: close_label },
+              title: close_label
+            )
+          ])
+        end
+      end
+
       def admin_filter_hidden_fields(scope, hidden_fields, root_hidden_fields)
         root_tags = admin_filter_evaluated_hash(root_hidden_fields).map do |key, value|
           hidden_field_tag(key, value)

data/app/views/yummy_guide/administrate/administrate/application/_collection.html.erb

@@ -2,6 +2,7 @@
   <table
     aria-labelledby="<%= table_title %>"
     data-fixed-columns-count="<%= yummy_guide_administrate_collection_table_fixed_columns_count(page: page, collection_presenter: collection_presenter) %>"
+    data-mobile-fixed-columns-count="<%= yummy_guide_administrate_collection_table_mobile_fixed_columns_count(page: page, collection_presenter: collection_presenter) %>"
     data-fixed-header-source
   >
     <thead>

data/lib/yummy_guide/administrate/version.rb

@@ -2,6 +2,6 @@
 
 module YummyGuide
   module Administrate
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/spec/yummy_guide/administrate/application_dashboard_spec.rb

@@ -18,6 +18,30 @@ RSpec.describe YummyGuide::Administrate::ApplicationDashboard do
     end
   end
 
+  describe ".index_mobile_fixed_columns_count" do
+    it "uses the subclass mobile constant when defined" do
+      subclass = Class.new(described_class)
+      subclass.const_set(:INDEX_FIXED_COLUMNS_COUNT, 5)
+      subclass.const_set(:INDEX_MOBILE_FIXED_COLUMNS_COUNT, 2)
+
+      expect(subclass.index_mobile_fixed_columns_count).to eq(2)
+    end
+
+    it "caps a subclass desktop fixed column count to one by default" do
+      subclass = Class.new(described_class)
+      subclass.const_set(:INDEX_FIXED_COLUMNS_COUNT, 5)
+
+      expect(subclass.index_mobile_fixed_columns_count).to eq(1)
+    end
+
+    it "keeps zero fixed columns on mobile when desktop fixed columns are zero" do
+      subclass = Class.new(described_class)
+      subclass.const_set(:INDEX_FIXED_COLUMNS_COUNT, 0)
+
+      expect(subclass.index_mobile_fixed_columns_count).to eq(0)
+    end
+  end
+
   describe ".collection_attribute_sortable?" do
     it "uses collection attributes when explicit sortable attributes are absent" do
       subclass = Class.new(described_class)

data/spec/yummy_guide/administrate/collection_helper_spec.rb

@@ -37,6 +37,23 @@ RSpec.describe YummyGuide::Administrate::CollectionHelper do
     end
   end
 
+  describe "#yummy_guide_administrate_collection_table_mobile_fixed_columns_count" do
+    # dashboard のモバイル固定列数も表示列数を超えないことを確認する
+    it "caps the mobile fixed column count by the number of visible attributes" do
+      dashboard_class = Class.new do
+        def self.index_mobile_fixed_columns_count
+          4
+        end
+      end
+
+      page = Object.new
+      page.instance_variable_set(:@dashboard, dashboard_class.new)
+      collection_presenter = Struct.new(:attribute_types).new({ id: :integer, name: :string })
+
+      expect(helper_host.yummy_guide_administrate_collection_table_mobile_fixed_columns_count(page: page, collection_presenter: collection_presenter)).to eq(2)
+    end
+  end
+
   describe "#yummy_guide_administrate_build_collection_cell" do
     let(:present_path) { "/admin/articles/test-article" }
 

data/spec/yummy_guide/administrate/filter_controls_helper_spec.rb

@@ -42,8 +42,12 @@ RSpec.describe YummyGuide::Administrate::FilterControlsHelper do
         search_options: { keyword: "tokyo", status: "closed" }
       )
       document = fragment(html)
+      close_button = document.at_css('button.filter-form__close[data-behavior="filter-form-close"]')
 
       expect(document.at_css("#reserv-filter-options > a.button").text).to eq("Filter")
+      expect(document.at_css(".filter-form__header .filter-form__title").text).to eq("Filter Options")
+      expect(close_button["aria-label"]).to eq("Close")
+      expect(close_button["type"]).to eq("button")
       expect(document.at_css("form.filter-form")["action"]).to eq("/admin/resources")
       expect(document.at_css('input[name="search_options[keyword]"]')["value"]).to eq("tokyo")
       expect(document.at_css('select[name="search_options[status]"] option[selected]')["value"]).to eq("closed")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yummy-guide-generic-administrate
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - akatsuki-kk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-29 00:00:00.000000000 Z
+date: 2026-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate