phlex-forms 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e69e13250ea52121abd2e7e16f91e17b63f7e470131d333513037ad57cbb4cb
-  data.tar.gz: a5d9179052c02fa4462434d08df73164e5cca3506df42fdd6d5f78852a8cf0ab
+  metadata.gz: f09c916a2ff918b4abceddb58267e59d2a7584090aabb8daeacfd2112bf36d9f
+  data.tar.gz: b19313a3517a7289a7dc46575e47965ce62849c712cdf27cc6e3fd0cbed13db8
 SHA512:
-  metadata.gz: 53ea74ca2f23ad56b79180c453dafb9dd766604dfb380f579b30bb76ca9fd5be957a4b0e77bb9035069074563b25d63b80e1d372057aefda0d7be8cf1eb313ea
-  data.tar.gz: dc905da47d50a3a43f83adb65faa3f386dcfbcd70e1d7d25d7e646894f994331eb1c3c309eb666271cf03ef1e182c94a1ea19a2a42515af13d7fb1529ecd77b0
+  metadata.gz: 557674f0906795a1f9a09e9d815c6b398b1cd8e8dfd60481512815c85cf276dc3372543272771a1b5dd5cb1a20f45c475bf2254c89d3ab303b1f997b9a1df067
+  data.tar.gz: 3994c3583c2c091b0f035df86f3ad9f0428ad7b955cd03bdb8c649756e0840cb474cbba290c916445919fff6afcb73f84f6dca948294a4b7970d2ba43e8b6b30

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- **`FileInput` multiple uploads submit an array** (Rails `file_field` parity):
+  with `multiple:` set, the input name now gets `[]` appended (unless already
+  present), for the standalone component, the `Plain` variant, and the form
+  builder path. Without it the browser collapsed a multi-file selection into
+  ONE scalar param, which a host app's `params.expect(attr: [])` silently
+  discarded — uploads no-opped with a success response.
+
 ### Added
 
 - **`checkbox_group` — batched checkbox group for array-valued fields** (the
@@ -45,6 +54,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/forms/field.rb

@@ -30,6 +30,12 @@ module Forms
     # PhlexForms::Theme), so the same field renders daisy or plain.
 
     def input(*modifiers, type: :text, **)
+      # type: :hidden reroutes to #hidden so EVERY path to a hidden field lands on
+      # the bare leaf — `f.Input(:token, :hidden)` and `f.Input(:token, type:
+      # :hidden)` would otherwise still emit the styled `input w-full`. Positional
+      # modifiers are dropped with it: a hidden field has no visual variants.
+      return hidden(**) if type.to_s == "hidden"
+
       theme[:input].new(*modifiers, type:, **field_attributes, **)
     end
 
@@ -43,8 +49,13 @@ module Forms
     end
     alias rich_text_area rich_textarea
 
+    # Bare <input type="hidden">, never the styled :input leaf — daisyui's
+    # `.input` beats WebKit's non-!important `input[type=hidden] { display: none }`
+    # and turns the field into a focusable phantom tab stop in Safari. Built from
+    # the explicit accessors (not field_attributes) so the meaningless
+    # `error: invalid?` is never introduced.
     def hidden(**)
-      theme[:input].new(type: :hidden, **field_attributes, **)
+      theme[:hidden].new(name: field_name, id: field_id, value: field_value, **)
     end
 
     # daisyui v5 "icon/text inside the field" wrapper. The block renders the

data/lib/forms/file_input.rb

@@ -8,7 +8,10 @@ module Forms
     def initialize(*modifiers, name: nil, id: nil, multiple: false, accept: nil,
                    error: false, disabled: false, required: false, full_width: true, **attributes)
       @modifiers = normalize_modifiers(modifiers)
-      @name = name
+      # Rails file_field parity: a multiple input needs an array param name, or
+      # the browser collapses the selection into one scalar file — which a host
+      # app's `params.expect(attr: [])` then silently discards.
+      @name = multiple && name && !name.to_s.end_with?("[]") ? "#{name}[]" : name
       @id = id
       @multiple = multiple
       @accept = accept

data/lib/forms/hidden.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Forms
+  # A model-bound hidden field: a bare <input type="hidden"> carrying name/id/
+  # value plus whatever the caller passes through. Deliberately NOT a
+  # DelegatedField/DaisyUI::Input like Forms::Input — a hidden field must never
+  # carry visual styling. daisyui's `.input { display: inline-flex }` overrides
+  # WebKit's *non*-!important UA rule `input[type=hidden] { display: none }`, so a
+  # styled hidden field renders as an empty box and joins the keyboard tab order
+  # in Safari (Chromium's UA rule is !important, hiding the bug there).
+  #
+  #   Forms::Hidden.new(name: "user[token]", id: "user_token", value: "abc123")
+  #
+  # Same component under both themes (:hidden role) — there are no styling
+  # classes for a Plain twin to strip. It takes no positional variants and no
+  # error:: a hidden field has no visual or error state.
+  class Hidden < Phlex::HTML
+    def initialize(name: nil, id: nil, value: nil, **attributes)
+      @name = name
+      @id = id
+      @value = value
+      @attributes = attributes
+      super()
+    end
+
+    def view_template
+      input(type: "hidden", name: @name, id: @id, value: @value.to_s, **@attributes)
+    end
+  end
+end

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/theme.rb

@@ -4,7 +4,9 @@ module PhlexForms
   # A theme maps component roles (:input, :select, :control, ...) to component
   # classes. The binding contract — the leaf initializer signatures
   # (*modifiers, name:, id:, value:, error:, required:, ...) — is the stable
-  # interface, so the same form class renders under any theme.
+  # interface, so the same form class renders under any theme. The one exception
+  # is :hidden, which takes name:/id:/value: only — a hidden field has neither a
+  # visual variant nor an error state.
   #
   # Built-ins:
   #   Theme.daisy — the DaisyUI-delegating Forms::* leaves (default when the
@@ -56,7 +58,7 @@ module PhlexForms
           textarea: Forms::Textarea, rich_textarea: Forms::RichTextarea,
           checkbox: Forms::Checkbox, toggle: Forms::Toggle, radio: Forms::Radio,
           checkbox_group: Forms::CheckboxGroup,
-          file: Forms::FileInput, wrapped_input: Forms::WrappedInput,
+          file: Forms::FileInput, wrapped_input: Forms::WrappedInput, hidden: Forms::Hidden,
           control: Forms::FormControl, label: Forms::Label,
           field_error: Forms::FieldError, field_hint: Forms::FieldHint,
           submit: Forms::Submit, row: Forms::Row, group: Forms::Group,
@@ -74,7 +76,7 @@ module PhlexForms
           textarea: Forms::Plain::Textarea, rich_textarea: Forms::Plain::Textarea,
           checkbox: Forms::Plain::Checkbox, toggle: Forms::Plain::Checkbox, radio: Forms::Plain::Radio,
           checkbox_group: Forms::Plain::CheckboxGroup,
-          file: Forms::Plain::FileInput, wrapped_input: Forms::Plain::WrappedInput,
+          file: Forms::Plain::FileInput, wrapped_input: Forms::Plain::WrappedInput, hidden: Forms::Hidden,
           control: Forms::Plain::Control, label: Forms::Plain::Label,
           field_error: Forms::Plain::FieldError, field_hint: Forms::Plain::FieldHint,
           submit: Forms::Plain::Submit, row: Forms::Plain::Row, group: Forms::Plain::Group,

data/lib/phlex_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlex-forms
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -128,6 +128,7 @@ files:
 - lib/forms/form.rb
 - lib/forms/form_control.rb
 - lib/forms/group.rb
+- lib/forms/hidden.rb
 - lib/forms/input.rb
 - lib/forms/label.rb
 - lib/forms/live.rb