phlex-forms 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e69e13250ea52121abd2e7e16f91e17b63f7e470131d333513037ad57cbb4cb
-  data.tar.gz: a5d9179052c02fa4462434d08df73164e5cca3506df42fdd6d5f78852a8cf0ab
+  metadata.gz: f6247172989a97967a471140547a44b29058f77827ce8d699b2f8ae9d0aa60ce
+  data.tar.gz: 5aaeccec4ad938988ee09ad31f8b42ca92bc29f55fd3a5c481a1d1b21f17d1b8
 SHA512:
-  metadata.gz: 53ea74ca2f23ad56b79180c453dafb9dd766604dfb380f579b30bb76ca9fd5be957a4b0e77bb9035069074563b25d63b80e1d372057aefda0d7be8cf1eb313ea
-  data.tar.gz: dc905da47d50a3a43f83adb65faa3f386dcfbcd70e1d7d25d7e646894f994331eb1c3c309eb666271cf03ef1e182c94a1ea19a2a42515af13d7fb1529ecd77b0
+  metadata.gz: 4dd96934af47c850597cd9f750bf03f97052301e6d9850239cb864f13fe914d17767b9c00f4b30fb23dcb0ea44c92b4e3d9f463d90e3832823d00dffd6700f70
+  data.tar.gz: 0a8acefb7a3bb47d002633482592aec0aa425b4b5df99d8a360efeb37455e1b9ea4ff9ba8dd918c4b15cdf08aa72ac8ab8bcbda6f37ef5c8d9f6091e966a540e

data/CHANGELOG.md

@@ -45,6 +45,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- **A caller width class stacked with the `w-full` default instead of replacing
+  it**: `DelegatedField#width_class` joined `"w-full"` and the caller's
+  `class:` verbatim, so `Forms::Select(class: "w-36")` emitted
+  `class="... w-full w-36"` and stylesheet source order — not author intent —
+  picked the winner (in practice `w-full`, which blew filter selects up to full
+  width; zazu#2934). `ClassMerge` gained a width family (anchored `w-*`, so
+  `min-w-*`/`max-w-*` still compose) and `width_class` merges through it —
+  last width wins, matching the daisyui size/color family semantics.
+
 - **`f.Radio` / `Field#radio` rendered the model's current value on every radio
   instead of each radio's own value**: `field_attributes` carried `value:
   field_value` and was splatted after the explicit positional value, clobbering

data/lib/phlex_forms/class_merge.rb

@@ -9,14 +9,21 @@ module PhlexForms
   # the same family, the LAST occurrence wins — matching Tailwind/daisyui
   # intuition (the later class overrides the earlier).
   #
-  # We deliberately do NOT depend on tailwind_merge: on form fields, callers pass
-  # daisyui modifiers (which this handles) rather than conflicting core Tailwind
-  # utilities, so tailwind_merge would add a runtime dependency for a conflict
-  # that does not occur here. Non-conflicting utilities (`w-full`, `py-0`, ...)
-  # simply pass through in order.
+  # Width utilities (`w-*`) are the one core-Tailwind family this gem injects a
+  # default for (DelegatedField's `w-full`), so they conflict the same way: a
+  # caller's `w-36` must REPLACE the default, or both land on the element and
+  # stylesheet source order — not author intent — decides which applies.
+  #
+  # We deliberately do NOT depend on tailwind_merge: daisyui modifier families
+  # and the width family are the only conflicts that occur on form fields, so
+  # tailwind_merge would add a runtime dependency for conflicts this handles.
+  # Other non-conflicting utilities (`py-0`, `min-w-32`, ...) pass through in
+  # order.
   module ClassMerge
     SIZE = /-(xs|sm|md|lg|xl)\z/
     COLOR = /-(primary|secondary|accent|neutral|info|success|warning|error)\z/
+    # Anchored so min-w-*/max-w-* (different CSS properties) stay out of the family.
+    WIDTH = /\Aw-/
 
     module_function
 
@@ -43,9 +50,12 @@ module PhlexForms
       end
     end
 
-    # A stable bucket key like "input:size" / "select:color", or nil if the token
-    # is not a recognized daisyui size/color modifier.
+    # A stable bucket key like "width" / "input:size" / "select:color", or nil if
+    # the token is not a recognized conflicting family. WIDTH is checked first so
+    # a `w-*` token can never be mis-bucketed as a daisyui modifier.
     def family_key(token)
+      return "width" if WIDTH.match?(token)
+
       if (m = token.match(SIZE))
         "#{token[0...m.begin(0)]}:size"
       elsif (m = token.match(COLOR))

data/lib/phlex_forms/delegated_field.rb

@@ -42,10 +42,13 @@ module PhlexForms
       attrs.compact
     end
 
+    # Merged via ClassMerge so a caller width (`w-36`) REPLACES the default
+    # instead of stacking with it (`w-full w-36` leaves the winner to stylesheet
+    # source order — that's how admin filter selects went full-width, zazu#2934).
     def width_class
       return @attributes[:class] unless @full_width
 
-      ["w-full", @attributes[:class]].compact.join(" ")
+      ClassMerge.merge("w-full", @attributes[:class])
     end
 
     # Unstyled variant of binding_attributes for the Plain theme: caller classes

data/lib/phlex_forms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PhlexForms
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlex-forms
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Mikael Henriksson