tailwind_merge 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f76007fe9bc9eb3a01775ddfbc29e400884058373a9baeb001ccfff21ef9a7
-  data.tar.gz: 4d97ba3be89af9227c4b2aa6f38fc8e9926886b6c33225881630356d72576f3d
+  metadata.gz: 14ce1b50125c55e8f6d320cb0886d221ca2b91ddaf70e3c57fdb3147416d751f
+  data.tar.gz: dcedb7f0b798ae164669cccfd3f2c41385c5f33c36ea289d79062c8cdd806393
 SHA512:
-  metadata.gz: 28794887eeb6e5f73ac74768cad06e52b4d5463e5ea436661e07d61a316f1e4a41b1a6607600746153f0b5464004472c1b98982d7770ca947ea03eb714e0f141
-  data.tar.gz: 88e8f3ab1bb6f2173a1f5aceca7416d8c1c1b4d73608ed78ed97b364f67560792996dcd72e5bcca1f81327bf8fd7aaef318aaab55011772019e9e677fa03f667
+  metadata.gz: a02d67ea60287416a8c1a9b2076aedf1e0864dec8c2fd36ffe69492c1eac386e99eac2b84bd035a9e2d69728bd9711d256550329015d6056708a2f836260f8f4
+  data.tar.gz: 94bec180c77255b7d74cfc730fffbc28869150b8d0efdb3ebef019e7a0b7e36c9552887884c72c7d1104a9dc525b93a367555dd0f122ecbb9d01aa4108df03a2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.7.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.7.0) (2023-04-03)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.6.0...v0.7.0)
+
+**Merged pull requests:**
+
+- Add postfix support [\#10](https://github.com/gjtorikian/tailwind_merge/pull/10) ([gjtorikian](https://github.com/gjtorikian))
+
 ## [v0.6.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.6.0) (2023-03-29)
 
 [Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.5.2...v0.6.0)

data/README.md

@@ -122,6 +122,12 @@ Similarly to arbitrary properties, `tailwind_merge` does not resolve conflicts b
 @merger.merge('!right-2 !-inset-x-1') # → '!-inset-x-1'
 ```
 
+## Supports postfix modifiers
+
+ ```ts
+ twMerge('text-sm leading-6 text-lg/7') // → 'text-lg/7'
+ ```
+
 ### Preserves non-Tailwind classes
 
 ```ruby

data/lib/tailwind_merge/class_utils.rb

@@ -51,8 +51,14 @@ module TailwindMerge
       result.nil? ? result : result[:class_group_id]
     end
 
-    def get_conflicting_class_group_ids(class_group_id)
-      @config[:conflicting_class_groups][class_group_id] || []
+    def get_conflicting_class_group_ids(class_group_id, has_postfix_modifier)
+      conflicts = @config[:conflicting_class_groups][class_group_id] || []
+
+      if has_postfix_modifier && @config[:conflicting_class_group_modifiers][class_group_id]
+        return [...conflicts, ...@config[:conflicting_class_group_modifiers][class_group_id]]
+      end
+
+      conflicts
     end
 
     private def create_class_map(config)

data/lib/tailwind_merge/config.rb

@@ -1782,6 +1782,9 @@ module TailwindMerge
         "scroll-px" => ["scroll-pr", "scroll-pl"],
         "scroll-py" => ["scroll-pt", "scroll-pb"],
       },
+      conflicting_class_group_modifiers: {
+        "font-size": ["leading"],
+      },
     }.freeze
 
     def merge_configs(extension_config)

data/lib/tailwind_merge/modifier_utils.rb

@@ -7,22 +7,29 @@ module TailwindMerge
     def split_modifiers(class_name, separator: nil)
       separator ||= ":"
       separator_length = separator.length
+      seperator_is_single_char = separator_length == 1
+      first_seperator_char = separator[0]
 
       modifiers = []
       bracket_depth = 0
       modifier_start = 0
+      postfix_modifier_position = 0
 
       class_name.each_char.with_index do |char, index|
-        if bracket_depth.zero? && char == separator[0]
-          if separator_length == 1 || class_name[index..(index + separator_length - 1)] == separator
+        if bracket_depth.zero?
+          if char == first_seperator_char && (seperator_is_single_char || class_name[index..(index + separator_length - 1)] == separator)
             modifiers << class_name[modifier_start..index]
             modifier_start = index + separator_length
+            next
+          elsif char == "/"
+            postfix_modifier_position = index
+            next
           end
         end
 
-        if class_name[index] == "["
+        if char == "["
           bracket_depth += 1
-        elsif class_name[index] == "]"
+        elsif char == "]"
           bracket_depth -= 1
         end
       end
@@ -30,8 +37,9 @@ module TailwindMerge
       base_class_name_with_important_modifier = modifiers.empty? ? class_name : class_name[modifier_start..-1]
       has_important_modifier = base_class_name_with_important_modifier.start_with?(IMPORTANT_MODIFIER)
       base_class_name = has_important_modifier ? base_class_name_with_important_modifier[1..-1] : base_class_name_with_important_modifier
+      maybe_postfix_modifier_position = postfix_modifier_position && postfix_modifier_position > modifier_start ? postfix_modifier_position - modifier_start : false
 
-      [modifiers, has_important_modifier, base_class_name]
+      [modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position]
     end
 
     # Sorts modifiers according to following schema:

data/lib/tailwind_merge/validators.rb

@@ -55,9 +55,9 @@ module TailwindMerge
     }
 
     IS_LENGTH = ->(value) {
-      numeric?(value) || \
-        STRING_LENGTHS.include?(value) || \
-        FRACTION_REGEX.match?(value) || \
+      numeric?(value) ||
+        STRING_LENGTHS.include?(value) ||
+        FRACTION_REGEX.match?(value) ||
         IS_ARBITRARY_LENGTH.call(value)
     }
 

data/lib/tailwind_merge/version.rb

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

data/lib/tailwind_merge.rb

@@ -49,11 +49,31 @@ module TailwindMerge
       class_groups_in_conflict = Set.new
 
       classes.strip.split(SPLIT_CLASSES_REGEX).map do |original_class_name|
-        modifiers, has_important_modifier, base_class_name = split_modifiers(original_class_name, separator: @config[:separator])
+        modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position = split_modifiers(original_class_name, separator: @config[:separator])
 
-        class_group_id = @class_utils.class_group_id(base_class_name)
+        actual_base_class_name = maybe_postfix_modifier_position ? base_class_name[0...maybe_postfix_modifier_position] : base_class_name
+        class_group_id = @class_utils.class_group_id(actual_base_class_name)
 
         unless class_group_id
+          unless maybe_postfix_modifier_position
+            next {
+              is_tailwind_class: false,
+              original_class_name: original_class_name,
+            }
+          end
+
+          class_group_id = @class_utils.class_group_id(base_class_name)
+
+          unless class_group_id
+            next {
+              isTailwindClass: false,
+              original_class_name: original_class_name,
+            }
+
+          end
+
+          has_postfix_modifier = false
+
           next {
             is_tailwind_class: false,
             original_class_name: original_class_name,
@@ -69,6 +89,7 @@ module TailwindMerge
           modifier_id: modifier_id,
           class_group_id: class_group_id,
           original_class_name: original_class_name,
+          has_postfix_modifier: has_postfix_modifier,
         }
       end.reverse # Last class in conflict wins, so filter conflicting classes in reverse order.
         .select do |parsed|
@@ -76,6 +97,7 @@ module TailwindMerge
 
         modifier_id = parsed[:modifier_id]
         class_group_id = parsed[:class_group_id]
+        has_postfix_modifier = parsed[:has_postfix_modifier]
 
         class_id = "#{modifier_id}#{class_group_id}"
 
@@ -83,7 +105,7 @@ module TailwindMerge
 
         class_groups_in_conflict.add(class_id)
 
-        @class_utils.get_conflicting_class_group_ids(class_group_id).each do |group|
+        @class_utils.get_conflicting_class_group_ids(class_group_id, has_postfix_modifier).each do |group|
           class_groups_in_conflict.add("#{modifier_id}#{group}")
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux