daisyui 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bf5647c845ed4fbdf7d538e4934c7171b23039cbc9029d8c68330b82f0acd2
-  data.tar.gz: 9282c494a1db396b4153fda3c9696040e8c95ac7d495d0bbcf9a0be983a49fb1
+  metadata.gz: a83f4b0512262bb7ae533a4c76e09badf6a1f6d9504429dc6cc3febbf163d034
+  data.tar.gz: 86bc9c1f0751a6fd58dd64c172202c2d0f87cc7af7f95d46d7a9c8c8dd888d26
 SHA512:
-  metadata.gz: f2fa7469a01b18c4bb28110ab4da1238ce8c846fef910e3edc488d283ed641e8cee5fb3b2fb69ca528f643283a1339114db14354a0f3d0d306b67f996923e4d8
-  data.tar.gz: 282f9add88cc7e82eabd013b81bb4e1470c8809f6687ada460470ef97a472d228182154f644c56a7df000f4714dd8d51eca4bbc5692f5ddbbdba7607e84617f4
+  metadata.gz: c1c0df513bd19ed59577cc986f6f10ae48c4c3269097e58077c75addcfa3714296e00347232a044b838e69a98c8c02b0f03a5b7e7a8216a1ef92629292b0b95a
+  data.tar.gz: f8ee5ef84355d080506310783167fb64cf19d4c9875eb5082862b2d2240f79575a1cc84c685ff6cd8630f192a8d75a8d3ac65ca49ef8cf0c20d4a176669c9cd7

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 ## [Unreleased]
 
+## [2.2.2] - 2026-10-27
+
+### Fixed
+
+- A variant member's classes no longer knock each other out. A group now holds
+  only the component's own `<component_class>-*` classes; a member's other
+  classes Tailwind does not classify (plugin utilities such as
+  `motion-opacity-in-0 motion-duration-[400ms]`) are ungrouped, as a flag's
+  are, so all of them render. A component without a `component_class` groups
+  none of its own classes; globally configured grouped modifiers are unchanged
+  (#73).
+
+## [2.2.1] - 2026-10-27
+
+### Fixed
+
+- The Tailwind sources generator accepts named groups and peers
+  (`group/item`, `group-has-[…]/item:block`, `peer-checked/field:block`) and a
+  plugin utility's named modifier (`motion-ease-in-out/opacity`) instead of
+  raising on them as paths. A bare word before the `/` (`app/components`) and a
+  second `/` (`lib/daisy_ui/base.rb`) are still rejected (#71).
+
+## [2.2.0] - 2026-10-26
+
 ### Documentation for the variants API
 
 - Docs site: "Variants, states and slots" (when to use `variant`, `flag`,

data/README.md

@@ -269,6 +269,12 @@ dependency). daisyUI modifiers conflict when the component declares them as
 alternatives in one group: `btn-sm btn-lg` keeps `btn-lg`, while
 `dropdown-top dropdown-end` keeps both (placement and alignment are separate
 groups). Ungrouped modifiers (`btn-wide`, `btn-active`) never conflict.
+A group holds only the component's own `<component_class>-*` classes: a
+member's Tailwind utilities resolve by Tailwind's groups, and any other class
+in it (a plugin utility such as `motion-duration-[400ms]`) never conflicts, so
+the classes of one member never knock each other out. To make such classes
+alternatives, set the component's `component_class` and name them
+`<component_class>-*`, or register them with `class_groups` (below).
 Component base classes such as `table` and `collapse` are never dropped.
 
 Register custom utilities so the merger knows what they are. Unregistered,
@@ -382,7 +388,7 @@ Widget(:ghost, :sm) # btn font-medium btn-ghost btn-sm [--fontsize:…] [--btn-b
 
 | Declaration | |
 |---|---|
-| `variant :group, member: "classes", …` | Alternatives: the grouped `register_modifiers(group: { … })`. Members merge as one ClassMerge group. |
+| `variant :group, member: "classes", …` | Alternatives: the grouped `register_modifiers(group: { … })`. Members' own `<component_class>-*` classes merge as one ClassMerge group. |
 | `flag :name, "classes"` | An on/off modifier: an ungrouped `register_modifiers` entry. `flag :name` alone is a `register_flags` flag, no class, for compounds to match. |
 | `base "classes"` | Classes every instance gets, appended to the inherited base. |
 | `default :group, :member` | The member used when the caller names none of the group. Never rendered beside a member the caller gives. |

data/lib/daisy_ui/class_merge/daisy_groups.rb

@@ -8,8 +8,14 @@ module DaisyUI
     #
     # gives the group `daisy:group:btn-size` = ["btn-sm", "btn-lg"], so
     # `btn-sm btn-lg` merges to `btn-lg`. Ungrouped modifiers never conflict.
+    #
+    # A group holds only the component's own `<component_class>-*` classes.
     # Tokens Tailwind already classifies (`bg-primary text-primary-content`)
-    # are left to the Tailwind groups, which resolve them per utility.
+    # are left to the Tailwind groups, which resolve them per utility. Any
+    # other class (a plugin utility such as `motion-duration-[400ms]`) is left
+    # ungrouped, as a flag is: a group would make the classes of one member
+    # knock each other out. A component without a component_class groups
+    # nothing of its own.
     #
     # Every gem component base class (`btn`, `table`) also gets a group of its
     # own and is never dropped, even where Tailwind has a utility of the same
@@ -33,14 +39,16 @@ module DaisyUI
           components.each do |component|
             component.modifier_groups.each do |group, members|
               tokens = members.flat_map { |member| component.modifiers[member].to_s.split }
-              add(groups, "daisy:group:#{component.component_class || component.name}-#{group}", tokens, prefix)
+              add(groups, "daisy:group:#{component.component_class || component.name}-#{group}", own(tokens, component), prefix)
             end
           end
 
           # Configured modifiers join the component's own group of that name.
+          # A global one has no component to own its classes: all are grouped.
           configuration.modifiers.groups.each do |(component, group), classes|
             owner = component ? component.component_class || component.name : "global"
-            add(groups, "daisy:group:#{owner}-#{group}", classes.flat_map(&:split), prefix)
+            tokens = classes.flat_map(&:split)
+            add(groups, "daisy:group:#{owner}-#{group}", component ? own(tokens, component) : tokens, prefix)
           end
 
           groups
@@ -68,6 +76,13 @@ module DaisyUI
 
         private
 
+        # The component's own modifier classes: `btn-sm` for `btn`.
+        def own(tokens, component)
+          return [] unless (base = component.component_class)
+
+          tokens.select { |token| token.start_with?("#{base}-") }
+        end
+
         # Subclasses share their parent's component_class and group names, so
         # their tokens land in the same group id and are unioned.
         def add(groups, id, tokens, prefix)

data/lib/daisy_ui/tailwind/candidate.rb

@@ -6,18 +6,24 @@ module DaisyUI
     # quoted string with brace expansion, and one unbalanced bracket in it
     # makes Tailwind drop every class after it, so a candidate starts and ends
     # like a utility or variant, has balanced () and [], and holds no quote,
-    # brace, semicolon, backslash or backtick. A `/` only introduces a
-    # fraction or an opacity (`w-1/2`, `bg-base-100/50`), never a path.
+    # brace, semicolon, backslash or backtick.
+    #
+    # A `/` before a digit or `[` is a fraction or an opacity (`w-1/2`,
+    # `bg-base-100/50`). A `/` before anything else is a path, except one
+    # trailing `/<name>` on a variant or utility: a named group or peer
+    # (`group/item`, `group-hover/item:underline`, `peer-checked/field:block`)
+    # or a plugin utility's named modifier (`motion-ease-in-out/opacity`).
     #
     # @api private
     module Candidate
       SHAPE = /\A[a-z@!\[*-][^\s"'`;{}\\]*[a-z0-9\])%!]\z/
       PATH = %r{/(?![0-9\[])}
+      NAMED = %r{\A(?<head>.+)/[A-Za-z0-9_-]+!?\z}
       CLOSING = { ")" => "(", "]" => "[" }.freeze
 
       class << self
         def valid?(token)
-          SHAPE.match?(token) && token.match?(/[a-z]/) && !PATH.match?(token) && balanced?(token)
+          SHAPE.match?(token) && token.match?(/[a-z]/) && balanced?(token) && !paths?(token)
         end
 
         # The candidates among the whitespace-separated words of `classes`.
@@ -38,6 +44,35 @@ module DaisyUI
           end
           open.empty?
         end
+
+        def paths?(token)
+          parts(token).any? { |part| path?(part) }
+        end
+
+        def path?(part)
+          return false unless PATH.match?(part)
+
+          head = part[NAMED, :head]
+          head.nil? || PATH.match?(head) || !named?(head)
+        end
+
+        # What may carry a `/<name>`: a group or a peer, or a utility with a
+        # `-` in it. A bare word (`app`, `vendor`, `hover`) is a directory.
+        def named?(head)
+          %w[group peer].include?(head) || (head.include?("-") && SHAPE.match?(head))
+        end
+
+        # The token split on its top-level `:`, as Tailwind splits variants
+        # from the utility; a `:` inside [] or () belongs to its part.
+        def parts(token)
+          depth = 0
+          slices = token.each_char.slice_when do |char, _|
+            depth += 1 if "[(".include?(char)
+            depth -= 1 if "])".include?(char)
+            char == ":" && depth.zero?
+          end
+          slices.map { |chars| chars.join.delete_suffix(":") }
+        end
       end
     end
   end

data/lib/daisy_ui/updated_at.rb

@@ -3,5 +3,5 @@
 module DaisyUI
   # This timestamp is automatically updated when releasing a new version
   # Format: YYYY-MM-DD HH:MM:SS UTC
-  UPDATED_AT = "2026-10-26 18:45:50 UTC"
+  UPDATED_AT = "2026-10-27 17:15:51 UTC"
 end

data/lib/daisy_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaisyUI
-  VERSION = "2.2.0"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daisyui
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Mikael Henriksson