yummy-guide-generic-administrate 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010d1c2fe4f859c1888130041b8b6f9e6031c4950ac8951992cb787e9ad99f10
-  data.tar.gz: cea0d9110b7208f632e421d7275f75f34f36d1b5114855b1d74812158eaa04ab
+  metadata.gz: 5ba6a92509f2b98a13491fb25f85808f471dc3ffaf53d5c3d4a4d5c1b06da3b3
+  data.tar.gz: 3990affb7c42115e6a7c07f987d895c2bd2ddfc5f82be2e79c71eb1d3a34854e
 SHA512:
-  metadata.gz: 86ffba95443e2a3537b8ee0343c31cccca6fbdb23f1b577b552d5812da2e6058e0c602b8f4e6097714301b8c773d29e3927c2b6cb1ac03be012fe936dedd9811
-  data.tar.gz: 07d92c76ea5b17277640a67a9952ef5b19d22b9507bd5ef62f2967bd567832d04b87d1c30358b3941346f16f9926b4bb3e5c6cce2fd29121fa70ce02c976cf9e
+  metadata.gz: e1000b82bf41b9b4169a30b049d4e53faa1f3fcd3e0c7643619682cb6bbc03fdab1a077637f233545299e18c6e639f838677205a5a3b70ec3f7a4830e8a34403
+  data.tar.gz: 4f0abf3d64dedab0a39a3a51964cca2d98d8703e2fa2dcd98e7bd4368503534ce5b1330ac2463f8fdb901658cafb72cfcce383fd430d49d89e9e4a2b7736a922

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

@@ -344,6 +344,10 @@
   vertical-align: middle;
 }
 
+body {
+  --admin-copy-cell-width-offset: 1.85rem;
+}
+
 .admin-copy-cell {
   position: relative;
   display: inline-flex;

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

@@ -17,6 +17,7 @@ module YummyGuide
       }.freeze
       DEFAULT_FIXED_COLUMN_WIDTH = "8rem"
       CONTENT_WIDTH_VALUE = "max-content"
+      COPY_CELL_ACTION_WIDTH_OFFSET = "var(--admin-copy-cell-width-offset, 1.85rem)"
       MAX_MOBILE_FIXED_COLUMNS_COUNT = 1
 
       CollectionTableDefinition = Struct.new(
@@ -174,7 +175,7 @@ module YummyGuide
         names.first(max_count).each_with_index.each_with_object({}) do |(name, index), sticky_columns|
           classes = []
           styles = []
-          width = widths.fetch(name, DEFAULT_FIXED_COLUMN_WIDTH)
+          width = widths.fetch(name, yummy_guide_administrate_collection_default_fixed_column_width)
 
           if index < fixed_count
             classes << "sticky-left"
@@ -210,7 +211,7 @@ module YummyGuide
         )
 
         names.first(6).each_with_index.flat_map do |name, index|
-          width = widths.fetch(name, DEFAULT_FIXED_COLUMN_WIDTH)
+          width = widths.fetch(name, yummy_guide_administrate_collection_default_fixed_column_width)
           column_number = index + 1
 
           [
@@ -349,13 +350,17 @@ module YummyGuide
             dashboard.class.index_fixed_column_widths if dashboard&.class&.respond_to?(:index_fixed_column_widths)
           end
 
-        DEFAULT_FIXED_COLUMN_WIDTHS.merge(
+        raw_widths = DEFAULT_FIXED_COLUMN_WIDTHS.merge(
           (configured_widths || {}).to_h.each_with_object({}) do |(name, width), widths|
             next if width.nil?
 
             widths[name.to_sym] = yummy_guide_administrate_collection_column_width_value(width)
           end
         )
+
+        raw_widths.transform_values do |width|
+          yummy_guide_administrate_collection_fixed_column_width_value(width)
+        end
       end
 
       def yummy_guide_administrate_collection_default_column_widths(page:)
@@ -371,7 +376,7 @@ module YummyGuide
           value = yummy_guide_administrate_collection_column_width_value(width)
           next if value == CONTENT_WIDTH_VALUE
 
-          widths[name.to_sym] = value
+          widths[name.to_sym] = yummy_guide_administrate_collection_default_column_width_value(value)
         end
       end
 
@@ -470,12 +475,30 @@ module YummyGuide
         width.to_s
       end
 
+      def yummy_guide_administrate_collection_default_column_width_value(width)
+        yummy_guide_administrate_collection_column_width_value_with_copy_action(width)
+      end
+
+      def yummy_guide_administrate_collection_fixed_column_width_value(width)
+        yummy_guide_administrate_collection_column_width_value_with_copy_action(width)
+      end
+
+      def yummy_guide_administrate_collection_column_width_value_with_copy_action(width)
+        return width if width == CONTENT_WIDTH_VALUE
+
+        "calc(#{width} + #{COPY_CELL_ACTION_WIDTH_OFFSET})"
+      end
+
+      def yummy_guide_administrate_collection_default_fixed_column_width
+        yummy_guide_administrate_collection_fixed_column_width_value(DEFAULT_FIXED_COLUMN_WIDTH)
+      end
+
       def yummy_guide_administrate_collection_sticky_lefts(column_names, widths)
         current_parts = []
 
         column_names.each_with_object({}) do |name, lefts|
           lefts[name] = yummy_guide_administrate_collection_css_sum(current_parts)
-          current_parts << widths.fetch(name, DEFAULT_FIXED_COLUMN_WIDTH)
+          current_parts << widths.fetch(name, yummy_guide_administrate_collection_default_fixed_column_width)
         end
       end
 

data/lib/yummy_guide/administrate/version.rb

@@ -2,6 +2,6 @@
 
 module YummyGuide
   module Administrate
-    VERSION = "0.8.11"
+    VERSION = "0.8.12"
   end
 end

data/spec/yummy_guide/administrate/collection_helper_spec.rb

@@ -131,21 +131,23 @@ RSpec.describe YummyGuide::Administrate::CollectionHelper do
         collection_presenter: collection_presenter,
         column_names: %i[id customer note]
       )
+      id_width = "calc(4rem + var(--admin-copy-cell-width-offset, 1.85rem))"
+      customer_width = "calc(14rem + var(--admin-copy-cell-width-offset, 1.85rem))"
 
       expect(definition.fixed_columns_count).to eq(2)
       expect(definition.mobile_fixed_columns_count).to eq(1)
       expect(definition.sticky_column(:customer)).to include(
         class: "sticky-left sticky-left--last",
-        style: "--sticky-left: 4rem; --sticky-width: 14rem"
+        style: "--sticky-left: #{id_width}; --sticky-width: #{customer_width}"
       )
-      expect(definition.table_style).to include("--admin-sticky-col-2-width: 14rem")
+      expect(definition.table_style).to include("--admin-sticky-col-2-width: #{customer_width}")
       expect(definition.table_style).to include("--admin-sticky-col-3-width: max-content")
-      expect(definition.grid_template_columns).to eq("4rem 14rem max-content")
+      expect(definition.grid_template_columns).to eq("#{id_width} #{customer_width} max-content")
       expect(definition.column_id(:customer)).to eq("reservation.customer")
       expect(definition.actions_column_id).to eq("reservation.actions")
     end
 
-    # Dashboard のデフォルト幅とブラウザ別の保存幅がCSS変数として同じテーブル定義へ反映されることを確認する
+    # Dashboard のデフォルト幅にはコピー操作幅を含め、ブラウザ別の保存幅はそのまま反映されることを確認する
     it "builds resizable width variables from default and saved column widths" do
       dashboard_class = Class.new do
         def self.index_default_column_widths
@@ -170,12 +172,14 @@ RSpec.describe YummyGuide::Administrate::CollectionHelper do
         column_names: %i[name interview_summary memo]
       )
 
-      expect(definition.table_style).to include("--admin-column-resizer-default-col-2: 800px")
+      default_width = "calc(800px + var(--admin-copy-cell-width-offset, 1.85rem))"
+
+      expect(definition.table_style).to include("--admin-column-resizer-default-col-2: #{default_width}")
       expect(definition.table_style).to include("--admin-column-resizer-user-col-3: 320px")
       expect(definition.table_style).to include("--admin-column-resizer-col-2: var(--admin-column-resizer-user-col-2, var(--admin-column-resizer-default-col-2))")
       expect(definition.table_style).to include("--admin-column-resizer-col-3: var(--admin-column-resizer-user-col-3)")
       expect(definition.adjusted_column_indexes).to eq([2, 3])
-      expect(definition.colgroup_widths).to eq([nil, "800px", "320px"])
+      expect(definition.colgroup_widths).to eq([nil, default_width, "320px"])
     end
   end
 
@@ -205,14 +209,16 @@ RSpec.describe YummyGuide::Administrate::CollectionHelper do
         collection_presenter: collection_presenter,
         column_names: %i[id customer note]
       )
+      id_width = "calc(4rem + var(--admin-copy-cell-width-offset, 1.85rem))"
+      customer_width = "calc(14rem + var(--admin-copy-cell-width-offset, 1.85rem))"
 
       expect(sticky_columns[:id]).to eq(
         class: "sticky-left sticky-left-mobile sticky-left-mobile--last",
-        style: "--sticky-left: 0px; --sticky-width: 4rem; --sticky-mobile-left: 0px; --sticky-mobile-width: 4rem"
+        style: "--sticky-left: 0px; --sticky-width: #{id_width}; --sticky-mobile-left: 0px; --sticky-mobile-width: #{id_width}"
       )
       expect(sticky_columns[:customer]).to eq(
         class: "sticky-left sticky-left--last",
-        style: "--sticky-left: 4rem; --sticky-width: 14rem"
+        style: "--sticky-left: #{id_width}; --sticky-width: #{customer_width}"
       )
       expect(sticky_columns).not_to have_key(:note)
     end
@@ -291,11 +297,14 @@ RSpec.describe YummyGuide::Administrate::CollectionHelper do
         page: page,
         column_names: %i[id customer note]
       )
-
-      expect(style).to include("--admin-sticky-col-1-width: 4rem")
-      expect(style).to include("--admin-sticky-mobile-col-1-width: 4rem")
-      expect(style).to include("--admin-sticky-col-2-width: 14rem")
-      expect(style).to include("--admin-sticky-col-3-width: 8rem")
+      id_width = "calc(4rem + var(--admin-copy-cell-width-offset, 1.85rem))"
+      customer_width = "calc(14rem + var(--admin-copy-cell-width-offset, 1.85rem))"
+      fallback_width = "calc(8rem + var(--admin-copy-cell-width-offset, 1.85rem))"
+
+      expect(style).to include("--admin-sticky-col-1-width: #{id_width}")
+      expect(style).to include("--admin-sticky-mobile-col-1-width: #{id_width}")
+      expect(style).to include("--admin-sticky-col-2-width: #{customer_width}")
+      expect(style).to include("--admin-sticky-col-3-width: #{fallback_width}")
     end
   end
 

data/spec/yummy_guide/administrate/column_resizer_asset_spec.rb

@@ -422,6 +422,7 @@ RSpec.describe "column resizer assets" do
     expect(components_source).to include("width: max-content")
     expect(components_source).to include("min-width: max-content")
     expect(components_source).to include("white-space: nowrap")
+    expect(components_source).to include("--admin-copy-cell-width-offset: 1.85rem")
     expect(stylesheet_source).to include("> .admin-copy-cell")
     expect(stylesheet_source).to include("width: 100% !important")
     expect(stylesheet_source).to include("flex: 1 1 auto !important")

metadata

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