From 0cfd6b127db097aeca2d90153b553fefcb55de3b Mon Sep 17 00:00:00 2001 From: Hossein Mirhadi Date: Tue, 22 Sep 2026 01:35:23 +0330 Subject: [PATCH 1/2] fix: preserve RTL shaping in animated greetings --- .../client/src/components/SplitText.spec.tsx | 31 +++++++++++++++++++ packages/client/src/components/SplitText.tsx | 7 +++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/SplitText.spec.tsx b/packages/client/src/components/SplitText.spec.tsx index daf6419bc9..51a1c8799f 100644 --- a/packages/client/src/components/SplitText.spec.tsx +++ b/packages/client/src/components/SplitText.spec.tsx @@ -2,6 +2,37 @@ import { render } from '@testing-library/react'; import SplitText from './SplitText'; describe('SplitText', () => { + it.each(['سلام', 'می‌توانید', 'مرحبا', 'שלום'])( + 'keeps the RTL word %s together so the browser can shape it', + (word) => { + const { container } = render(); + const animatedSegments = container.querySelectorAll('p > span > span.inline-block'); + + expect(animatedSegments).toHaveLength(1); + expect(animatedSegments[0]).toHaveTextContent(word); + expect(container.querySelector('p')).toHaveAttribute('dir', 'auto'); + }, + ); + + it('preserves the logical order of mixed Persian and Latin text', () => { + const { container } = render(); + const words = container.querySelectorAll('p > span'); + + expect(Array.from(words, (word) => word.textContent?.trim())).toEqual([ + 'سلام', + 'OpenAI', + '123!', + ]); + expect(words[1].querySelectorAll('span.inline-block')).toHaveLength(1); + expect(words[2].querySelectorAll('span.inline-block')).toHaveLength(1); + }); + + it('keeps per-grapheme animation for Latin-only text', () => { + const { container } = render(); + + expect(container.querySelectorAll('p > span > span.inline-block')).toHaveLength(6); + }); + it('renders emojis correctly', () => { const emojis = ['🚧', '❤️‍🔥', '💜', '🦎', '❌', '✅', '⚠️']; const originalText = emojis.join(''); diff --git a/packages/client/src/components/SplitText.tsx b/packages/client/src/components/SplitText.tsx index 46dd757365..f4e81f26f5 100644 --- a/packages/client/src/components/SplitText.tsx +++ b/packages/client/src/components/SplitText.tsx @@ -1,5 +1,6 @@ -import { useSprings, animated, SpringConfig } from '@react-spring/web'; import { useEffect, useRef, useState } from 'react'; +import { useSprings, animated } from '@react-spring/web'; +import type { SpringConfig } from '@react-spring/web'; interface SegmenterOptions { granularity?: 'grapheme' | 'word' | 'sentence'; @@ -71,7 +72,8 @@ const SplitText: React.FC = ({ onLetterAnimationComplete, onLineCountChange, }) => { - const words = text.split(' ').map(splitGraphemes); + const containsRtl = /[\p{Script=Arabic}\p{Script=Hebrew}]/u.test(text); + const words = text.split(' ').map((word) => (containsRtl ? [word] : splitGraphemes(word))); const letters = words.flat(); const [inView, setInView] = useState(false); const ref = useRef(null); @@ -138,6 +140,7 @@ const SplitText: React.FC = ({ {text}