From 54b31aea0546e123ec9c4afbd595e9cc71dfd0d7 Mon Sep 17 00:00:00 2001 From: Anthony Wentzel Date: Fri, 25 Oct 2024 13:15:07 -0400 Subject: [PATCH] chore(textProps): cleanup spreading textProps.style --- .../flash-calendar/src/components/CalendarItemDay.tsx | 1 + .../src/components/CalendarItemWeekName.tsx | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/flash-calendar/src/components/CalendarItemDay.tsx b/packages/flash-calendar/src/components/CalendarItemDay.tsx index 48bca81..a18ffc6 100644 --- a/packages/flash-calendar/src/components/CalendarItemDay.tsx +++ b/packages/flash-calendar/src/components/CalendarItemDay.tsx @@ -202,6 +202,7 @@ export const CalendarItemDay = ({ {...textProps} style={{ ...content, + ...(textProps?.style ?? ({} as object)), ...theme?.base?.({ ...metadata, isPressed }).content, ...theme?.[metadata.state]?.({ ...metadata, isPressed }).content, }} diff --git a/packages/flash-calendar/src/components/CalendarItemWeekName.tsx b/packages/flash-calendar/src/components/CalendarItemWeekName.tsx index a635a8d..53e2d88 100644 --- a/packages/flash-calendar/src/components/CalendarItemWeekName.tsx +++ b/packages/flash-calendar/src/components/CalendarItemWeekName.tsx @@ -45,10 +45,17 @@ export const CalendarItemWeekName = ({ const contentStyles = [ styles.content, { color: colors.content.primary }, + textProps?.style, theme?.content, ]; return { containerStyles, contentStyles }; - }, [colors.content.primary, height, theme?.container, theme?.content]); + }, [ + colors.content.primary, + height, + theme?.container, + theme?.content, + textProps?.style, + ]); return (