From 466e4ad910d41535376ac4663df3e54fcecbed7f Mon Sep 17 00:00:00 2001
From: Philipp Spiess <hello@philippspiess.com>
Date: Tue, 1 Apr 2025 13:16:19 +0200
Subject: [PATCH] Add `self-baseline-last` and `content-baseline-last`

---
 CHANGELOG.md                                                 | 2 +-
 .../tailwindcss/src/__snapshots__/intellisense.test.ts.snap  | 1 +
 packages/tailwindcss/src/utilities.test.ts                   | 5 +++++
 packages/tailwindcss/src/utilities.ts                        | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d0eec549ace..365cae0999ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - _Experimental_: Add `details-content` variant ([#15319](https://github.com/tailwindlabs/tailwindcss/pull/15319))
 - _Experimental_: Add `inverted-colors` variant ([#11693](https://github.com/tailwindlabs/tailwindcss/pull/11693))
 - _Experimental_: Add `noscript` variant ([#11929](https://github.com/tailwindlabs/tailwindcss/pull/11929), [#17431](https://github.com/tailwindlabs/tailwindcss/pull/17431))
-- _Experimental_: Add `items-baseline-last` utility ([#13888](https://github.com/tailwindlabs/tailwindcss/pull/13888))
+- _Experimental_: Add `items-baseline-last` and `self-baseline-last` utilities ([#13888](https://github.com/tailwindlabs/tailwindcss/pull/13888), [#17476](https://github.com/tailwindlabs/tailwindcss/pull/17476))
 - _Experimental_: Add `pointer-none`, `pointer-coarse`, and `pointer-fine` variant ([#16946](https://github.com/tailwindlabs/tailwindcss/pull/16946))
 - _Experimental_: Add `any-pointer-none`, `any-pointer-coarse`, and `any-pointer-fine` variants ([#16941](https://github.com/tailwindlabs/tailwindcss/pull/16941))
 - _Experimental_: Add safe alignment utilities ([#14607](https://github.com/tailwindlabs/tailwindcss/pull/14607))
diff --git a/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap b/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap
index 18fb9a95ceb3..2a8c9eae3bc1 100644
--- a/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap
+++ b/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap
@@ -9608,6 +9608,7 @@ exports[`getClassList 1`] = `
   "select-text",
   "self-auto",
   "self-baseline",
+  "self-baseline-last",
   "self-center",
   "self-center-safe",
   "self-end",
diff --git a/packages/tailwindcss/src/utilities.test.ts b/packages/tailwindcss/src/utilities.test.ts
index 25dc020d6b07..2032601407b0 100644
--- a/packages/tailwindcss/src/utilities.test.ts
+++ b/packages/tailwindcss/src/utilities.test.ts
@@ -8432,6 +8432,7 @@ test('self', async () => {
       'self-center-safe',
       'self-stretch',
       'self-baseline',
+      'self-baseline-last',
     ]),
   ).toMatchInlineSnapshot(`
     ".self-auto {
@@ -8442,6 +8443,10 @@ test('self', async () => {
       align-self: baseline;
     }
 
+    .self-baseline-last {
+      align-self: last baseline;
+    }
+
     .self-center {
       align-self: center;
     }
diff --git a/packages/tailwindcss/src/utilities.ts b/packages/tailwindcss/src/utilities.ts
index 52f958c4af89..922b4e53bd0c 100644
--- a/packages/tailwindcss/src/utilities.ts
+++ b/packages/tailwindcss/src/utilities.ts
@@ -2039,6 +2039,9 @@ export function createUtilities(theme: Theme) {
   }
   staticUtility('self-stretch', [['align-self', 'stretch']])
   staticUtility('self-baseline', [['align-self', 'baseline']])
+  if (enableBaselineLast) {
+    staticUtility('self-baseline-last', [['align-self', 'last baseline']])
+  }
 
   staticUtility('justify-self-auto', [['justify-self', 'auto']])
   staticUtility('justify-self-start', [['justify-self', 'flex-start']])