tailwind_merge 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92f465b5aa6ea57a71afc60b37c61b05986667919ff88754a97b846921e191c
-  data.tar.gz: e83db43c20ac8b867dd8c2dfb0450c6e5a5de3a6c03dc37563bc787b4f71f0e3
+  metadata.gz: 1a99d9ee4d20e83c9f5c87005378fd99952a6f4b252e4f31d4ab7adc2ae2e02a
+  data.tar.gz: 51292822b8b1fa87e90706a46b5c7f6a6d8e754f9062eefdcf12638e04aa908d
 SHA512:
-  metadata.gz: 3ab5af9395abec32b81c841db1e2a5a54b6b96456167fae54d5792264cb2effcc3605ab1ee3a33ca84e45262267839ff70846caf09786aab284e5cdfda330fc8
-  data.tar.gz: e91081abf6c23662126192a2c2431497bbcda86e95bd25be166ecde54fa2a447cf664300d190af4e424cb1af1428e086730aba557fc826e6d71b77d10a83293e
+  metadata.gz: f3df7fdc21a39f75890c1130fb911abc8a236666fafd469c1d1463ea2620286ad46fe8d8355410ae605325834d472da3c534e1b43a9d42da7f262297e2fc8649
+  data.tar.gz: 3929d56d319c52a5631baefbee50ad6e25c055757a60ee5f9c2cff1f2d2c65898db3426b66b42ffcface6b17ee44edc401a378ff967ea08fe6c5c7df8d8fc8e0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v1.5.0] - 11-05-2026
+## What's Changed
+* Add TW 4.3 features by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/75
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.4.0...v1.5.0
 # [v1.4.0] - 22-02-2026
 ## What's Changed
 * Support Tailwind v4.2 by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/73

data/lib/tailwind_merge/config.rb

@@ -248,6 +248,18 @@ module TailwindMerge
         ##
         "container" => ["container"],
         ##
+        # Container Type
+        # @see https://tailwindcss.com/docs/responsive-design#container-queries
+        ##
+        "container-type" => [
+          { "@container" => ["", "normal", "size", IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] },
+        ],
+        ##
+        # Container Name
+        # @see https://tailwindcss.com/docs/responsive-design#named-containers
+        ##
+        "container-named" => [IS_NAMED_CONTAINER_QUERY],
+        ##
         # Columns
         # @see https://tailwindcss.com/docs/columns
         ##
@@ -1020,6 +1032,11 @@ module TailwindMerge
         ##
         "indent" => [{ "indent" => SCALE_UNAMBIGUOUS_SPACING.call }],
         ##
+        # Tab Size
+        # @see https://tailwindcss.com/docs/tab-size
+        ##
+        "tab-size" => [{ "tab" => [IS_INTEGER, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }],
+        ##
         # Vertical Alignment
         # @see https://tailwindcss.com/docs/vertical-align
         ##
@@ -1965,6 +1982,11 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/translate
         ##
         "translate-none" => ["translate-none"],
+        ##
+        # Zoom
+        # @see https://tailwindcss.com/docs/zoom
+        ##
+        "zoom" => [{ "zoom" => [IS_INTEGER, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }],
 
         ###############
         # Interactivity
@@ -2061,6 +2083,26 @@ module TailwindMerge
         ##
         "scroll-behavior" => [{ "scroll" => ["auto", "smooth"] }],
         ##
+        # Scrollbar Thumb Color
+        # @see https://tailwindcss.com/docs/scrollbar-color
+        ##
+        "scrollbar-thumb-color" => [{ "scrollbar-thumb" => SCALE_COLOR.call }],
+        ##
+        # Scrollbar Track Color
+        # @see https://tailwindcss.com/docs/scrollbar-color
+        ##
+        "scrollbar-track-color" => [{ "scrollbar-track" => SCALE_COLOR.call }],
+        ##
+        # Scrollbar Gutter
+        # @see https://tailwindcss.com/docs/scrollbar-gutter
+        ##
+        "scrollbar-gutter" => [{ "scrollbar-gutter" => ["auto", "stable", "both"] }],
+        ##
+        # Scrollbar Width
+        # @see https://tailwindcss.com/docs/scrollbar-width
+        ##
+        "scrollbar-w" => [{ "scrollbar" => ["auto", "thin", "none"] }],
+        ##
         # Scroll Margin
         # @see https://tailwindcss.com/docs/scroll-margin
         ##
@@ -2266,6 +2308,7 @@ module TailwindMerge
         "forced-color-adjust" => [{ "forced-color-adjust" => ["auto", "none"] }],
       },
       conflicting_class_groups: {
+        "container-named" => ["container-type"],
         "overflow" => ["overflow-x", "overflow-y"],
         "overscroll" => ["overscroll-x", "overscroll-y"],
         "inset" => ["inset-x", "inset-y", "start", "end", "inset-bs", "inset-be", "top", "right", "bottom", "left"],
@@ -2383,6 +2426,7 @@ module TailwindMerge
       conflicting_class_group_modifiers: {
         "font-size" => ["leading"],
       },
+      postfix_lookup_class_groups: ["container-type"],
       order_sensitive_modifiers: [
         "*",
         "**",

data/lib/tailwind_merge/validators.rb

@@ -86,6 +86,12 @@ module TailwindMerge
       !IS_ARBITRARY_VALUE.call(value) && !IS_ARBITRARY_VARIABLE.call(value)
     }
 
+    NAMED_CONTAINER_QUERY_REGEX = %r{\A@container(?:-size|-normal)?/.+\z}
+
+    IS_NAMED_CONTAINER_QUERY = ->(value) {
+      NAMED_CONTAINER_QUERY_REGEX.match?(value)
+    }
+
     IS_ARBITRARY_SIZE = ->(value) {
       arbitrary_value?(value, IS_LABEL_SIZE, IS_NEVER)
     }

data/lib/tailwind_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/lib/tailwind_merge.rb

@@ -25,6 +25,7 @@ module TailwindMerge
       @config[:important_modifier] = @config[:important_modifier].to_s
       @class_utils = TailwindMerge::ClassGroupUtils.new(@config)
       @cache = LruRedux::Cache.new(@config[:cache_size], @config[:ignore_empty_cache])
+      @postfix_lookup_class_group_ids = build_postfix_lookup_class_group_ids(@config[:postfix_lookup_class_groups])
     end
 
     def merge(classes)
@@ -62,8 +63,21 @@ module TailwindMerge
         end
 
         has_postfix_modifier = maybe_postfix_modifier_position ? true : false
-        actual_base_class_name = has_postfix_modifier ? base_class_name[0...maybe_postfix_modifier_position] : base_class_name
-        class_group_id = @class_utils.class_group_id(actual_base_class_name)
+
+        if has_postfix_modifier
+          base_class_name_without_postfix = base_class_name[0...maybe_postfix_modifier_position]
+          class_group_id = @class_utils.class_group_id(base_class_name_without_postfix)
+
+          if class_group_id && @postfix_lookup_class_group_ids[class_group_id]
+            class_group_id_with_postfix = @class_utils.class_group_id(base_class_name)
+            if class_group_id_with_postfix && class_group_id_with_postfix != class_group_id
+              class_group_id = class_group_id_with_postfix
+              has_postfix_modifier = false
+            end
+          end
+        else
+          class_group_id = @class_utils.class_group_id(base_class_name)
+        end
 
         unless class_group_id
           unless has_postfix_modifier
@@ -103,5 +117,13 @@ module TailwindMerge
 
       merged_classes.reverse.join(" ")
     end
+
+    private def build_postfix_lookup_class_group_ids(class_group_ids)
+      lookup = {}
+      return lookup unless class_group_ids
+
+      class_group_ids.each { |id| lookup[id] = true }
+      lookup
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Garen J. Torikian
@@ -73,15 +73,15 @@ files:
 - lib/tailwind_merge/version.rb
 - script/test
 - tailwind_merge.gemspec
-homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.4.0
+homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.0
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.4.0
-  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.4.0
-  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.4.0/CHANGELOG.md
+  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.0
+  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.0
+  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
-  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.4.0
+  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.0
   funding_uri: https://github.com/sponsors/gjtorikian
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Utility function to efficiently merge Tailwind CSS classes without style
   conflicts.