From 4a70e6c8ba138b60d390c12d8c10825a7c0d6064 Mon Sep 17 00:00:00 2001
From: Hona <10430890+Hona@users.noreply.github.com>
Date: Sat, 22 Aug 2026 02:10:25 +0000
Subject: [PATCH] fix(ui): prevent text shimmer overlap

---
 packages/ui/src/typography/text-shimmer/text-shimmer.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/typography/text-shimmer/text-shimmer.css b/packages/ui/src/typography/text-shimmer/text-shimmer.css
index 3122bf031580..9974c6f4e8b5 100644
--- a/packages/ui/src/typography/text-shimmer/text-shimmer.css
+++ b/packages/ui/src/typography/text-shimmer/text-shimmer.css
@@ -36,12 +36,16 @@
 [data-component="text-shimmer"] [data-slot="text-shimmer-char-shimmer"] {
   grid-area: 1 / 1;
   white-space: pre;
-  transition: opacity var(--text-shimmer-swap) ease-out;
   font: inherit;
   letter-spacing: inherit;
   line-height: inherit;
 }
 
+[data-component="text-shimmer"]:where([data-active="true"]) [data-slot="text-shimmer-char-base"],
+[data-component="text-shimmer"]:where([data-active="true"]) [data-slot="text-shimmer-char-shimmer"] {
+  transition: opacity var(--text-shimmer-swap) ease-out;
+}
+
 [data-component="text-shimmer"] [data-slot="text-shimmer-char-base"] {
   color: inherit;
   opacity: 1;
@@ -112,6 +116,7 @@
     color: inherit;
     -webkit-text-fill-color: currentColor;
     background-image: none;
+    opacity: 0 !important;
   }
 
   [data-component="text-shimmer"] [data-slot="text-shimmer-char-base"] {