phlex-forms 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9541561e98ecd2afda34daf77d2eeebd725aac0badde75fdbf51401628d081f6
-  data.tar.gz: 5d4008e8e6e5748ae12fdbcd12a667d016ab30549da71498dbc2e286fe202d81
+  metadata.gz: 26a87406065dfe0b6d5b023949661d89548c3ad6379af9d0e4d74c4162f49070
+  data.tar.gz: b36430b1faf88ad5095a358709bce31a72869c40619dc527bc3e04be10450c0f
 SHA512:
-  metadata.gz: f10fd9155f6ff9841bdae9c34fb2ac89dbbdbc49df33c012af7efad526fa914d21c6379430e1ee66a1aadeff387dcc9bab353d33cb017ce8b07798dd8058dd2c
-  data.tar.gz: 7ea1bdaa7fea101bde79b7975759c79b30bc502fb50c2b18e279a5cf4032b294745055e23f2f66ed22cba33c4e43c637c6499ea3c62059f425a3b3aec141ad83
+  metadata.gz: f9e5a95dfea504c6b487c23a0b5683a4a68391b4e07ff33192b548a40a5b7eff3a0562e0af1097a20bbeca3762017254fe626fb1fe7079408996815f8b1d7a71
+  data.tar.gz: 1ae2b903bfe9057f1705b3d3a6e788c16acf1c4d837c0bdbd723434aca71c45432d194ebf638ce17c14d597826751a6c4bb124e92f02e7b3d01fdf29ac6bbf34

data/CHANGELOG.md

@@ -7,6 +7,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Upgrading to 0.4
+
+phlex-forms now depends on **daisyui `~> 2.0`** and merges every default +
+caller `class:` through `DaisyUI::ClassMerge` (a port of tailwind_merge 1.5.6
+plus daisyUI's modifier groups). `PhlexForms::ClassMerge` is gone.
+
+- **Bundle daisyui 2.** It's a hard dependency now, so a `gem "daisyui", "~> 1.x"`
+  pin in your Gemfile must move to 2.x (or be dropped).
+- **Register your custom Tailwind utilities.** The old merger only knew daisy
+  sizes/colors and `w-*`, and passed everything else through. The new one
+  classifies every utility, so an unregistered custom one can be dropped as a
+  conflict. For example, a `text-h1` you pass next to `FieldError`'s
+  `text-error` reads as a colour:
+
+  ```ruby
+  # config/initializers/daisy_ui.rb
+  DaisyUI.configure do |config|
+    config.class_merge.utility("text-h1", like: "text-lg")
+  end
+  ```
+
+- **`CollectionCheckBox` merges a caller `class:` instead of replacing its
+  base class.** `class: "checkbox-primary"` now renders `checkbox
+  checkbox-primary` (it used to drop `checkbox`). A caller who used `class:` to
+  swap the base class entirely (`class: "toggle"`) now gets both classes.
+- **More conflicts resolve now.** A caller's `mt-4` / `text-xs` replaces a
+  component's default `mt-1` / `text-sm` instead of stacking beside it.
+- **Daisy leaves lean on daisyui's own merge.** Input, Select, Textarea and the
+  other delegated leaves hand `class:` to the daisyui component, so
+  `DaisyUI.configure { |c| c.class_merge.enabled = false }` applies to them too.
+  The components that render plain HTML (FieldHint, FieldError, Row, Form,
+  FormControl, TagField, ChoicesSelect) merge through `DaisyUI::ClassMerge.merge`
+  directly, which that switch doesn't affect.
+
+### Removed
+
+- **`PhlexForms::ClassMerge`**: use `DaisyUI::ClassMerge.merge`.
+- **The daisyui soft-dependency path.** `require "phlex_forms"` loads daisyui
+  unconditionally, the daisy theme is always the default, and `Theme.daisy` no
+  longer raises `FeatureUnavailable`. The Plain theme is unchanged and still
+  emits zero daisy classes.
+
 ### Fixed
 
 - **`rich_textarea` forwards its block into `<lexxy-editor>`**: Lexxy configures

data/README.md

@@ -42,7 +42,6 @@ end
 ```ruby
 # Gemfile
 gem "phlex-forms"
-gem "daisyui"        # optional — the daisy theme; omit for plain semantic HTML
 gem "phlex-reactive" # optional — the `live` server-truth validation
 ```
 
@@ -254,11 +253,10 @@ f.field(:search).wrapped_input(:primary) do
 end
 ```
 
-## Themes — using phlex-forms without daisyui
+## Themes — using phlex-forms without daisyUI styling
 
-Every component resolves through a theme (a role → component-class map). With
-the daisyui gem loaded, the daisy theme is the default. Without it — or on
-demand — the **Plain theme** renders bare semantic HTML: the same binding
+Every component resolves through a theme (a role → component-class map). The
+daisy theme is the default. On demand, the **Plain theme** renders bare semantic HTML: the same binding
 (names, ids, values, required, errors), variants accepted and ignored, no
 styling classes, and stable hooks (`aria-invalid`, `role="alert"`,
 `data-field-error`, `data-field-hint`, `data-form-row`) for your own CSS.

data/lib/forms/choices_select.rb

@@ -44,7 +44,7 @@ module Forms
       a = {
         name: select_name,
         id: @id,
-        class: PhlexForms::ClassMerge.merge("choices-select w-full", @options[:class]),
+        class: DaisyUI::ClassMerge.merge("choices-select w-full", @options[:class]),
         data: stimulus_data,
         **@options.except(:class, :value, :data)
       }

data/lib/forms/collection_check_box.rb

@@ -18,7 +18,7 @@ module Forms
         name: @name,
         id: @id,
         value: @value,
-        class: @options[:class] || "checkbox",
+        class: DaisyUI::ClassMerge.merge("checkbox", @options[:class]),
         checked: @checked || nil
       )
     end

data/lib/forms/field_error.rb

@@ -20,7 +20,7 @@ module Forms
     private
 
     def classes
-      PhlexForms::ClassMerge.merge("text-error text-sm mt-1", @options[:class])
+      DaisyUI::ClassMerge.merge("text-error text-sm mt-1", @options[:class])
     end
   end
 end

data/lib/forms/field_hint.rb

@@ -18,7 +18,7 @@ module Forms
     private
 
     def classes
-      PhlexForms::ClassMerge.merge("text-base-content/60 text-sm mt-1", @options[:class])
+      DaisyUI::ClassMerge.merge("text-base-content/60 text-sm mt-1", @options[:class])
     end
   end
 end

data/lib/forms/form.rb

@@ -224,10 +224,9 @@ module Forms
     end
 
     def form_classes
-      classes = []
-      classes << "space-y-4" if @base_modifiers.include?(:spaced)
-      classes << "space-y-6" if @base_modifiers.include?(:spacious)
-      PhlexForms::ClassMerge.merge(classes.join(" "), @options[:class]).presence
+      spaced = "space-y-4" if @base_modifiers.include?(:spaced)
+      spacious = "space-y-6" if @base_modifiers.include?(:spacious)
+      DaisyUI::ClassMerge.merge(spaced, spacious, @options[:class]).presence
     end
 
     def authenticity_token_field

data/lib/forms/form_control.rb

@@ -40,9 +40,8 @@ module Forms
     private
 
     def control_classes
-      base = %w[form-control w-full]
-      base << "flex flex-row items-center gap-4" if @modifiers.include?(:horizontal)
-      PhlexForms::ClassMerge.merge(base.join(" "), @options[:class])
+      horizontal = "flex flex-row items-center gap-4" if @modifiers.include?(:horizontal)
+      DaisyUI::ClassMerge.merge("form-control w-full", horizontal, @options[:class])
     end
   end
 end

data/lib/forms/rich_textarea.rb

@@ -70,7 +70,7 @@ module Forms
     end
 
     def editor_classes
-      [@options[:class], "lexxy-content"].compact.join(" ")
+      DaisyUI::ClassMerge.merge(@options[:class], "lexxy-content")
     end
   end
 end

data/lib/forms/row.rb

@@ -27,8 +27,7 @@ module Forms
     private
 
     def row_classes
-      base = ["grid grid-cols-1 gap-4", COLUMN_CLASSES[@columns]].compact.join(" ")
-      PhlexForms::ClassMerge.merge(base, @options[:class])
+      DaisyUI::ClassMerge.merge("grid grid-cols-1 gap-4", COLUMN_CLASSES[@columns], @options[:class])
     end
   end
 end

data/lib/forms/tag_field.rb

@@ -135,6 +135,6 @@ module Forms
     def option_classes = nil
     def chip_classes = "badge badge-primary gap-1"
     def remove_classes = "cursor-pointer"
-    def input_classes = PhlexForms::ClassMerge.merge("input w-full", @attributes[:class])
+    def input_classes = DaisyUI::ClassMerge.merge("input w-full", @attributes[:class])
   end
 end

data/lib/phlex_forms/configuration.rb

@@ -51,11 +51,11 @@ module PhlexForms
     end
 
     # The default theme: :daisy, :plain, or a PhlexForms::Theme instance.
-    # Defaults to daisy when the daisyui gem is loaded, plain otherwise.
+    # Defaults to daisy.
     attr_writer :theme
 
     def theme
-      @theme ||= defined?(DaisyUI) ? Theme.daisy : Theme.plain
+      @theme ||= Theme.daisy
     end
 
     def infer_from_model

data/lib/phlex_forms/delegated_field.rb

@@ -42,13 +42,12 @@ 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).
+    # Handed to the daisyui component as parts: its class merge lets a caller
+    # width (`w-36`) REPLACE the default instead of stacking with it (zazu#2934).
     def width_class
       return @attributes[:class] unless @full_width
 
-      ClassMerge.merge("w-full", @attributes[:class])
+      ["w-full", *@attributes[:class]]
     end
 
     # Unstyled variant of binding_attributes for the Plain theme: caller classes

data/lib/phlex_forms/theme.rb

@@ -9,8 +9,7 @@ module PhlexForms
   # visual variant nor an error state.
   #
   # Built-ins:
-  #   Theme.daisy — the DaisyUI-delegating Forms::* leaves (default when the
-  #                 daisyui gem is loaded)
+  #   Theme.daisy — the DaisyUI-delegating Forms::* leaves (the default)
   #   Theme.plain — bare semantic HTML (Forms::Plain::*): variants accepted and
   #                 ignored, zero styling classes, aria/data hooks only
   #
@@ -47,12 +46,6 @@ module PhlexForms
       end
 
       def daisy
-        unless defined?(DaisyUI)
-          raise PhlexForms::FeatureUnavailable,
-            "the daisy theme requires the daisyui gem. Add `gem \"daisyui\"` to your " \
-            "Gemfile, or use the plain theme."
-        end
-
         @daisy ||= new({
           input: Forms::Input, select: Forms::Select, choices_select: Forms::ChoicesSelect,
           textarea: Forms::Textarea, rich_textarea: Forms::RichTextarea,

data/lib/phlex_forms/version.rb

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

data/lib/phlex_forms.rb

@@ -7,14 +7,7 @@ require "active_support/core_ext/string" # underscore/pluralize/humanize (scope/
 require "phlex"
 require "glyphs"
 require "zeitwerk"
-
-begin
-  require "daisy_ui"
-rescue LoadError
-  # daisyui is a soft dependency: without it the Plain theme is the default.
-  # The daisy leaf components only reference DaisyUI inside view_template, so
-  # they load fine — they just must not be rendered (Theme.daisy raises).
-end
+require "daisy_ui"
 
 begin
   require "phlex/reactive"
@@ -75,7 +68,7 @@ loader.inflector.inflect(
 )
 
 # Two sibling (non-nested) autoload roots:
-#   lib/phlex_forms -> PhlexForms::  (gem internals: config, class_merge, ...)
+#   lib/phlex_forms -> PhlexForms::  (gem internals: config, inference, theme, ...)
 #   lib/forms       -> Forms::        (the component kit)
 # Keeping them as separate top-level dirs avoids the ambiguity of nesting one
 # namespace root inside another.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlex-forms
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -29,6 +29,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
+- !ruby/object:Gem::Dependency
+  name: daisyui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: glyphs
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +182,6 @@ files:
 - lib/phlex-forms.rb
 - lib/phlex_forms.rb
 - lib/phlex_forms/builder.rb
-- lib/phlex_forms/class_merge.rb
 - lib/phlex_forms/configuration.rb
 - lib/phlex_forms/delegated_field.rb
 - lib/phlex_forms/engine.rb

data/lib/phlex_forms/class_merge.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module PhlexForms
-  # Class-string merging for phlex-forms components.
-  #
-  # DaisyUI component-class families are mutually exclusive: an element can't be
-  # both `input-sm` and `input-lg`, or both `input-primary` and `input-error`.
-  # When a component's default classes and a caller's `class:` override both name
-  # the same family, the LAST occurrence wins — matching Tailwind/daisyui
-  # intuition (the later class overrides the earlier).
-  #
-  # 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
-
-    # Merge any number of class strings/nil into one deduped string. Preserves
-    # order; within a daisyui size/color family only the last token survives.
-    def merge(*parts)
-      tokens = parts.flat_map { |p| p.to_s.split }.reject(&:empty?)
-      dedupe_daisyui_families(tokens).join(" ")
-    end
-
-    # For each (component-prefix, family) pair, keep only the last token.
-    def dedupe_daisyui_families(tokens)
-      last_index = {}
-      tokens.each_with_index do |tok, idx|
-        key = family_key(tok)
-        last_index[key] = idx if key
-      end
-      tokens.each_with_index.filter_map do |tok, idx|
-        key = family_key(tok)
-        next tok if key.nil? # not a daisyui family token — keep
-        next tok if last_index[key] == idx # last in its family — keep
-
-        nil # earlier duplicate in the family — drop
-      end
-    end
-
-    # 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))
-        "#{token[0...m.begin(0)]}:color"
-      end
-    end
-  end
-end