tailwind_merge 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd029b3106698874b67142336e597f9369c92664531879ad22eedd0cba6645b
-  data.tar.gz: 5389d8adf19d10d5f4edd08bff8cfd94f23e8ce65f6893400b0a8416de629faa
+  metadata.gz: 963bec3ea5a28c6f2e282b5836fd2b1bb317aafee92a6c65872b1b52919bca3a
+  data.tar.gz: 8b86c7e251064a52b8a591933bb09dcdf5e72efba0edc508066d0bcbf3bf3cfa
 SHA512:
-  metadata.gz: 2236d20be8ac16e9fb1ee61682c00d8cc00a8102a1f12ef6ab2d56bd9829a041feb08e5448ebcf09e7940a43b3d6ca512ce0f381bdd006275302167c245700b1
-  data.tar.gz: aa34f52e7f697c8b1c01d3bead20a4868393f054dfbf9dbb7595d842d3883c26c23e1039dc6b14cd309671b198f6751181465478f246f5b609acf628694de861
+  metadata.gz: f980fb0cb733e00de99e109fa12c36a125af360f62ee471ec49da0c2aaa4d57590dcd2957cb3531ab4ebb25bf197ca8e3ccd85b679c140e0dcecb5b38b96324d
+  data.tar.gz: 7327cef609f7617f99196d2ef8dd2f98190e7eaf90dc7af0305b5eb4062bc3c8887b5653ce13be427602b9665671745c788a57fa8fa4b1775253b4784ed7bbee

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v0.13.0] - 29-08-2024
+## What's Changed
+* Add theme support by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/32
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.12.2...v0.13.0
 # [v0.12.2] - 18-08-2024
 ## What's Changed
 * remove spurious debug statement by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/28

data/README.md

@@ -310,7 +310,18 @@ In the Tailwind config you can modify theme scales. `tailwind_merge` follows the
 - `space`
 - `translate`
 
-If you modified one of these theme scales in your Tailwind config, you can add all your keys right here and tailwind-merge will take care of the rest. If you modified other theme scales, you need to figure out the class group to modify in the [default config](#getdefaultconfig).
+If you modified one of these theme scales in your Tailwind config, you can add all your keys right here and tailwind-merge will take care of the rest. For example, to add custom spaces and margin, you would provide the following `theme`:
+
+```ruby
+merger = TailwindMerge::Merger.new(config: {
+    theme: {
+    "spacing" => ["my-space"],
+    "margin" => ["my-margin"],
+    },
+})
+```
+
+If you modified other theme scales, you need to figure out the class group to modify in the [default config](#getdefaultconfig).
 
 ### Validators
 

data/lib/tailwind_merge/config.rb

@@ -4,8 +4,8 @@ module TailwindMerge
   module Config
     include Validators
 
-    FROM_THEME = ->(config, theme) {
-      config.fetch(:theme, {}).fetch(theme, nil)
+    FROM_THEME = ->(config, key) {
+      config[:theme].fetch(key, nil)
     }
 
     COLORS = ->(config) { FROM_THEME.call(config, "colors") }
@@ -1840,10 +1840,13 @@ module TailwindMerge
     def merge_configs(extension_config)
       config = TailwindMerge::Config::DEFAULTS
       [:theme].each do |type|
-        extension_config.fetch(type, {}).each_pair do |key, value|
-          config[type][value] = ->(config) { FROM_THEME.call(config, key) }
+        extension_config.fetch(type, {}).each_pair do |key, scales|
+          config[type][key] << ->(klass) {
+            scales.include?(klass)
+          }
         end
       end
+
       config
     end
   end

data/lib/tailwind_merge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux