Merge pull request #478 from sherlockdoyle/main

Adds support for logical border color properties
dcastil · Oct 3, 2024 · 9ec6338 · 9ec6338
2 parents 63b477e + b93b2d9
commit 9ec6338
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/src/lib/default-config.ts b/src/lib/default-config.ts
@@ -1158,6 +1158,16 @@ export const getDefaultConfig = () => {
              * @see https://tailwindcss.com/docs/border-color
              */
             'border-color-y': [{ 'border-y': [borderColor] }],
+            /**
+             * Border Color S
+             * @see https://tailwindcss.com/docs/border-color
+             */
+            'border-color-s': [{ 'border-s': [borderColor] }],
+            /**
+             * Border Color E
+             * @see https://tailwindcss.com/docs/border-color
+             */
+            'border-color-e': [{ 'border-e': [borderColor] }],
             /**
              * Border Color Top
              * @see https://tailwindcss.com/docs/border-color
@@ -1821,6 +1831,8 @@ export const getDefaultConfig = () => {
             'border-w-x': ['border-w-r', 'border-w-l'],
             'border-w-y': ['border-w-t', 'border-w-b'],
             'border-color': [
+                'border-color-s',
+                'border-color-e',
                 'border-color-t',
                 'border-color-r',
                 'border-color-b',

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -210,8 +210,10 @@ export type DefaultClassGroupIds =
     | 'blur'
     | 'border-collapse'
     | 'border-color-b'
+    | 'border-color-e'
     | 'border-color-l'
     | 'border-color-r'
+    | 'border-color-s'
     | 'border-color-t'
     | 'border-color-x'
     | 'border-color-y'

diff --git a/tests/class-map.test.ts b/tests/class-map.test.ts
@@ -55,8 +55,10 @@ test('class map has correct class groups at first part', () => {
             'border-collapse',
             'border-color',
             'border-color-b',
+            'border-color-e',
             'border-color-l',
             'border-color-r',
+            'border-color-s',
             'border-color-t',
             'border-color-x',
             'border-color-y',

diff --git a/tests/per-side-border-colors.test.ts b/tests/per-side-border-colors.test.ts
@@ -5,4 +5,6 @@ import { twMerge } from '../src'
 test('merges classes with per-side border colors correctly', () => {
     expect(twMerge('border-t-some-blue border-t-other-blue')).toBe('border-t-other-blue')
     expect(twMerge('border-t-some-blue border-some-blue')).toBe('border-some-blue')
+    expect(twMerge('border-some-blue border-s-some-blue')).toBe('border-some-blue border-s-some-blue')
+    expect(twMerge('border-e-some-blue border-some-blue')).toBe('border-some-blue')
 })