Skip to content

Commit 6761978

Browse files
committed
RelativeTime: prefer children if passed
1 parent 06f57f4 commit 6761978

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

packages/react/src/RelativeTime/RelativeTime.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import {createComponent} from '../utils/custom-element'
66
const RelativeTimeComponent = createComponent(RelativeTimeElement, 'relative-time')
77

88
const localeOptions: Intl.DateTimeFormatOptions = {month: 'short', day: 'numeric', year: 'numeric'}
9-
function RelativeTime({date, datetime, ...props}: RelativeTimeProps) {
9+
function RelativeTime({date, datetime, children, ...props}: RelativeTimeProps) {
1010
if (datetime) date = new Date(datetime)
1111
return (
1212
<RelativeTimeComponent {...props} date={date}>
13-
{date?.toLocaleDateString('en', localeOptions) || ''}
13+
{children || date?.toLocaleDateString('en', localeOptions) || ''}
1414
</RelativeTimeComponent>
1515
)
1616
}

packages/react/src/__tests__/RelativeTime.test.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,11 @@ describe('RelativeTime', () => {
3030
const date = new Date('2024-03-07T12:22:48.123Z')
3131
expect(render(<RelativeTime datetime={date.toJSON()} />).children).toEqual(['Mar 7, 2024'])
3232
})
33+
34+
it('renders children if passed', () => {
35+
const date = new Date('2024-03-07T12:22:48.123Z')
36+
expect(render(<RelativeTime date={date}>server rendered date</RelativeTime>).children).toEqual([
37+
'server rendered date',
38+
])
39+
})
3340
})

0 commit comments

Comments
 (0)