Skip to content

Commit

Permalink
chore(textProps): cleanup spreading textProps.style
Browse files Browse the repository at this point in the history
  • Loading branch information
theonetheycallneo committed Oct 25, 2024
1 parent dc3a991 commit 54b31ae
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions packages/flash-calendar/src/components/CalendarItemDay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<View style={containerStyles}>
Expand Down

0 comments on commit 54b31ae

Please sign in to comment.