Skip to content

fix(feedback): Deep merge custom styles with defaults in FeedbackWidget #5625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonis merged 1 commit into from
Feb 6, 2026
Merged

fix(feedback): Deep merge custom styles with defaults in FeedbackWidget #5625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
> make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
<!-- prettier-ignore-end -->

## Unreleased

### Fixes

- Deep merge custom `styles` with defaults in `FeedbackWidget` instead of replacing them ([#5625](https://github.com/getsentry/sentry-react-native/pull/5625))
- Note that partial style overrides now preserve default properties like padding and borders

## 7.12.0

### Features
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/js/feedback/FeedbackWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,15 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
const config: FeedbackGeneralConfiguration = this.props;
const imagePickerConfiguration: ImagePickerConfiguration = this.props;
const text: FeedbackTextConfiguration = this.props;
const styles: FeedbackWidgetStyles = { ...defaultStyles(theme), ...this.props.styles };
const _defaultStyles = defaultStyles(theme);
const _propStyles = this.props.styles || {};
const styles = (Object.keys(_defaultStyles) as Array<keyof FeedbackWidgetStyles>).reduce<FeedbackWidgetStyles>(
(merged, key) => {
(merged as Record<string, unknown>)[key] = { ...(_defaultStyles[key] as object), ...(_propStyles[key] as object) };
return merged;
},
{},
);
const onCancel = (): void => {
if (onFormClose) {
onFormClose();
Expand Down
24 changes: 24 additions & 0 deletions packages/core/test/feedback/FeedbackWidget.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,30 @@ describe('FeedbackWidget', () => {
expect(toJSON()).toMatchSnapshot();
});

it('deep merges custom styles with defaults instead of replacing them', () => {
const partialStyles: FeedbackWidgetStyles = {
input: {
color: '#ff0000',
},
};
const { getByTestId } = render(
<FeedbackWidget {...defaultProps} styles={partialStyles} />,
);

const nameInput = getByTestId('sentry-feedback-name-input');
const inputStyle = nameInput.props.style;

// The custom color should be applied
expect(inputStyle.color).toBe('#ff0000');
// Default properties should be preserved, not lost
expect(inputStyle.height).toBe(50);
expect(inputStyle.borderWidth).toBe(1);
expect(inputStyle.borderRadius).toBe(5);
expect(inputStyle.paddingHorizontal).toBe(10);
expect(inputStyle.marginBottom).toBe(15);
expect(inputStyle.fontSize).toBe(16);
});

it('renders correctly', () => {
const { getByPlaceholderText, getByText, getByTestId, queryByText } = render(<FeedbackWidget {...defaultProps} />);

Expand Down
70 changes: 70 additions & 0 deletions packages/core/test/feedback/__snapshots__/FeedbackWidget.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
style={
{
"backgroundColor": "#ffffff",
"flex": 1,
"padding": 20,
}
}
>
Expand All @@ -39,7 +41,11 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
style={
{
"color": "#ff0000",
"flex": 1,
"fontSize": 20,
"fontWeight": "bold",
"marginBottom": 20,
"textAlign": "left",
}
}
testID="sentry-feedback-form-title"
Expand Down Expand Up @@ -67,6 +73,7 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
{
"color": "#00ff00",
"fontSize": 15,
"marginBottom": 4,
}
}
>
Expand All @@ -78,9 +85,13 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
style={
{
"borderColor": "#0000ff",
"borderRadius": 5,
"borderWidth": 1,
"color": "#000000",
"fontSize": 13,
"height": 50,
"marginBottom": 15,
"paddingHorizontal": 10,
}
}
testID="sentry-feedback-name-input"
Expand All @@ -91,6 +102,7 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
{
"color": "#00ff00",
"fontSize": 15,
"marginBottom": 4,
}
}
>
Expand All @@ -103,9 +115,13 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
style={
{
"borderColor": "#0000ff",
"borderRadius": 5,
"borderWidth": 1,
"color": "#000000",
"fontSize": 13,
"height": 50,
"marginBottom": 15,
"paddingHorizontal": 10,
}
}
testID="sentry-feedback-email-input"
Expand All @@ -116,6 +132,7 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
{
"color": "#00ff00",
"fontSize": 15,
"marginBottom": 4,
}
}
>
Expand All @@ -130,13 +147,18 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
[
{
"borderColor": "#0000ff",
"borderRadius": 5,
"borderWidth": 1,
"color": "#000000",
"fontSize": 13,
"height": 50,
"marginBottom": 15,
"paddingHorizontal": 10,
},
{
"color": "#00ff00",
"height": 50,
"textAlignVertical": "top",
},
]
}
Expand Down Expand Up @@ -173,8 +195,12 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "center",
"backgroundColor": "#ffff00",
"borderRadius": 5,
"marginBottom": 10,
"opacity": 1,
"paddingVertical": 15,
}
}
>
Expand Down Expand Up @@ -220,7 +246,13 @@ exports[`FeedbackWidget matches the snapshot with custom styles 1`] = `
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "center",
"backgroundColor": "#ffffff",
"borderColor": "rgba(41, 35, 47, 0.13)",
"borderRadius": 5,
"borderWidth": 1,
"opacity": 1,
"padding": 15,
"paddingVertical": 10,
}
}
Expand Down Expand Up @@ -263,6 +295,8 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
style={
{
"backgroundColor": "#ffffff",
"flex": 1,
"padding": 20,
}
}
>
Expand All @@ -278,7 +312,11 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
style={
{
"color": "#ff0000",
"flex": 1,
"fontSize": 20,
"fontWeight": "bold",
"marginBottom": 20,
"textAlign": "left",
}
}
testID="sentry-feedback-form-title"
Expand Down Expand Up @@ -306,6 +344,7 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
{
"color": "#00ff00",
"fontSize": 15,
"marginBottom": 4,
}
}
>
Expand All @@ -317,9 +356,13 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
style={
{
"borderColor": "#0000ff",
"borderRadius": 5,
"borderWidth": 1,
"color": "#000000",
"fontSize": 13,
"height": 50,
"marginBottom": 15,
"paddingHorizontal": 10,
}
}
testID="sentry-feedback-name-input"
Expand All @@ -330,6 +373,7 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
{
"color": "#00ff00",
"fontSize": 15,
"marginBottom": 4,
}
}
>
Expand All @@ -342,9 +386,13 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
style={
{
"borderColor": "#0000ff",
"borderRadius": 5,
"borderWidth": 1,
"color": "#000000",
"fontSize": 13,
"height": 50,
"marginBottom": 15,
"paddingHorizontal": 10,
}
}
testID="sentry-feedback-email-input"
Expand All @@ -355,6 +403,7 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
{
"color": "#00ff00",
"fontSize": 15,
"marginBottom": 4,
}
}
>
Expand All @@ -369,13 +418,18 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
[
{
"borderColor": "#0000ff",
"borderRadius": 5,
"borderWidth": 1,
"color": "#000000",
"fontSize": 13,
"height": 50,
"marginBottom": 15,
"paddingHorizontal": 10,
},
{
"color": "#00ff00",
"height": 50,
"textAlignVertical": "top",
},
]
}
Expand Down Expand Up @@ -422,8 +476,14 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "center",
"backgroundColor": "#00ff00",
"borderColor": "rgba(41, 35, 47, 0.13)",
"borderRadius": 5,
"borderWidth": 1,
"flex": 1,
"opacity": 1,
"padding": 15,
}
}
>
Expand Down Expand Up @@ -469,8 +529,12 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "center",
"backgroundColor": "#ffff00",
"borderRadius": 5,
"marginBottom": 10,
"opacity": 1,
"paddingVertical": 15,
}
}
>
Expand Down Expand Up @@ -516,7 +580,13 @@ exports[`FeedbackWidget matches the snapshot with custom styles and screenshot b
onStartShouldSetResponder={[Function]}
style={
{
"alignItems": "center",
"backgroundColor": "#ffffff",
"borderColor": "rgba(41, 35, 47, 0.13)",
"borderRadius": 5,
"borderWidth": 1,
"opacity": 1,
"padding": 15,
"paddingVertical": 10,
}
}
Expand Down
Loading