Merge branch 'main' into release/7.12.0

antonis · antonis · commit 2ff64907d88b · 2026-02-10T16:27:49.000+01:00
# Conflicts:
#	CHANGELOG.md
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
@@ -14,5 +14,5 @@ permissions:
 
 jobs:
   changelog-preview:
-    uses: getsentry/craft/.github/workflows/changelog-preview.yml@beea4aba589c66381258cbd131c5551ae8245b82 # V2
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@63d1636bead951f6e034ed62c2a3610965fef010 # V2
     secrets: inherit
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
+        uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v4.32.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
+        uses: github/codeql-action/autobuild@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v4.32.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
+        uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v4.32.2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,7 +43,7 @@ jobs:
           cache-dependency-path: yarn.lock
 
       - name: Prepare release
-        uses: getsentry/craft@beea4aba589c66381258cbd131c5551ae8245b82 # v2
+        uses: getsentry/craft@63d1636bead951f6e034ed62c2a3610965fef010 # v2
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,27 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
+## Unreleased
+
+### Features
+
+- Add `autoCorrect` and `spellCheck` config options to `FeedbackWidget` ([#5627](https://github.com/getsentry/sentry-react-native/pull/5627))
+- Add `autoCapitalize="none"` to `FeedbackWidget` email input ([#5627](https://github.com/getsentry/sentry-react-native/pull/5627))
+
+### 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
+
+### Dependencies
+
+- Bump Android SDK from v8.31.0 to v8.32.0 ([#5633](https://github.com/getsentry/sentry-react-native/pull/5633))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8320)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.31.0...8.32.0)
+- Bump Android SDK Stubs from v8.31.0 to v8.32.0 ([#5634](https://github.com/getsentry/sentry-react-native/pull/5634))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8320)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.31.0...8.32.0)
+
 ## 7.12.1
 
 ### Fixes
@@ -14,6 +35,10 @@
 
 ## 7.12.0
 
+> [!WARNING]
+> This release contains an issue that can cause iOS builds to fail with circular dependency errors.
+> See issue [#5641](https://github.com/getsentry/sentry-react-native/issues/5641) for more details.
+
 ### Features
 
 - Extends the experimental support of UI profiling to iOS ([#5611](https://github.com/getsentry/sentry-react-native/pull/5611))
diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
@@ -55,5 +55,5 @@ android {
 dependencies {
     compileOnly files('libs/replay-stubs.jar')
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:8.31.0'
+    api 'io.sentry:sentry-android:8.32.0'
 }
diff --git a/packages/core/android/libs/replay-stubs.jar b/packages/core/android/libs/replay-stubs.jar
diff --git a/packages/core/android/replay-stubs/build.gradle b/packages/core/android/replay-stubs/build.gradle
@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
 }
 
 dependencies {
-  compileOnly 'io.sentry:sentry:8.31.0'
+  compileOnly 'io.sentry:sentry:8.32.0'
 }
diff --git a/packages/core/scripts/expo-upload-sourcemaps.js b/packages/core/scripts/expo-upload-sourcemaps.js
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const { execSync } = require('child_process');
+const { spawnSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const process = require('process');
@@ -16,8 +16,11 @@ function getEnvVar(varname) {
 
 function getSentryPluginPropertiesFromExpoConfig() {
   try {
-    const stdOutBuffer = execSync('npx expo config --json');
-    const config = JSON.parse(stdOutBuffer.toString());
+    const result = spawnSync('npx', ['expo', 'config', '--json'], { encoding: 'utf8' });
+    if (result.error || result.status !== 0) {
+      throw result.error || new Error(`expo config exited with status ${result.status}`);
+    }
+    const config = JSON.parse(result.stdout);
     const plugins = config.plugins;
     if (!plugins) {
       return null;
@@ -217,8 +220,15 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
   }
 
   const isHermes = assets.find(asset => asset.endsWith('.hbc'));
-  const windowsCallback = process.platform === 'win32' ? 'node ' : '';
-  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')}`, {
+
+  // Build arguments array for spawnSync (no shell interpretation needed)
+  const args = ['sourcemaps', 'upload'];
+  if (isHermes) {
+    args.push('--debug-id-reference');
+  }
+  args.push(...assets);
+
+  const result = spawnSync(sentryCliBin, args, {
     env: {
       ...process.env,
       [SENTRY_PROJECT]: sentryProject,
@@ -227,6 +237,15 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
     },
     stdio: 'inherit',
   });
+
+  if (result.error) {
+    console.error('Failed to upload sourcemaps:', result.error);
+    process.exit(1);
+  }
+  if (result.status !== 0) {
+    console.error(`sentry-cli exited with status ${result.status}`);
+    process.exit(result.status);
+  }
   numAssetsUploaded++;
 }
 
diff --git a/packages/core/src/js/feedback/FeedbackWidget.tsx b/packages/core/src/js/feedback/FeedbackWidget.tsx
@@ -260,7 +260,17 @@ 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 autoCorrect = config.autoCorrect !== false;
+    const spellCheck = config.spellCheck !== false;
+    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();
@@ -310,6 +320,8 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
                 placeholder={text.namePlaceholder}
                 value={name}
                 onChangeText={value => this.setState({ name: value })}
+                autoCorrect={false}
+                spellCheck={false}
               />
             </>
           )}
@@ -325,6 +337,9 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
                 testID="sentry-feedback-email-input"
                 placeholder={text.emailPlaceholder}
                 keyboardType={'email-address' as KeyboardTypeOptions}
+                autoCapitalize="none"
+                autoCorrect={false}
+                spellCheck={false}
                 value={email}
                 onChangeText={value => this.setState({ email: value })}
               />
@@ -342,6 +357,8 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
             value={description}
             onChangeText={value => this.setState({ description: value })}
             multiline
+            autoCorrect={autoCorrect}
+            spellCheck={spellCheck}
           />
           {(config.enableScreenshot || imagePickerConfiguration.imagePicker || this._hasScreenshot()) && (
             <View style={styles.screenshotContainer}>
diff --git a/packages/core/src/js/feedback/FeedbackWidget.types.ts b/packages/core/src/js/feedback/FeedbackWidget.types.ts
@@ -60,6 +60,20 @@ export interface FeedbackGeneralConfiguration {
    */
   enableTakeScreenshot?: boolean;
 
+  /**
+   * Enable auto-correct for text inputs.
+   *
+   * @default true
+   */
+  autoCorrect?: boolean;
+
+  /**
+   * Enable spell check for text inputs.
+   *
+   * @default true
+   */
+  spellCheck?: boolean;
+
   /**
    * Fill in email/name input fields with Sentry user context if it exists.
    * The value of the email/name keys represent the properties of your user context.
diff --git a/packages/core/test/feedback/FeedbackWidget.test.tsx b/packages/core/test/feedback/FeedbackWidget.test.tsx
@@ -149,6 +149,61 @@ describe('FeedbackWidget', () => {
     expect(toJSON()).toMatchSnapshot();
   });
 
+  it('passes autoCorrect and spellCheck props to message input', () => {
+    const { getByTestId } = render(
+      <FeedbackWidget {...defaultProps} autoCorrect={false} spellCheck={false} />,
+    );
+
+    expect(getByTestId('sentry-feedback-message-input').props.autoCorrect).toBe(false);
+    expect(getByTestId('sentry-feedback-message-input').props.spellCheck).toBe(false);
+  });
+
+  it('defaults autoCorrect and spellCheck to true on message input', () => {
+    const { getByTestId } = render(<FeedbackWidget {...defaultProps} />);
+
+    expect(getByTestId('sentry-feedback-message-input').props.autoCorrect).toBe(true);
+    expect(getByTestId('sentry-feedback-message-input').props.spellCheck).toBe(true);
+  });
+
+  it('hardcodes autoCorrect and spellCheck to false on name and email inputs', () => {
+    const { getByTestId } = render(<FeedbackWidget {...defaultProps} />);
+
+    expect(getByTestId('sentry-feedback-name-input').props.autoCorrect).toBe(false);
+    expect(getByTestId('sentry-feedback-name-input').props.spellCheck).toBe(false);
+    expect(getByTestId('sentry-feedback-email-input').props.autoCorrect).toBe(false);
+    expect(getByTestId('sentry-feedback-email-input').props.spellCheck).toBe(false);
+  });
+
+  it('sets autoCapitalize to none on email input', () => {
+    const { getByTestId } = render(<FeedbackWidget {...defaultProps} />);
+
+    expect(getByTestId('sentry-feedback-email-input').props.autoCapitalize).toBe('none');
+   });
+
+  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} />);
 
diff --git a/packages/core/test/feedback/__snapshots__/FeedbackWidget.test.tsx.snap b/packages/core/test/feedback/__snapshots__/FeedbackWidget.test.tsx.snap
diff --git a/packages/core/test/feedback/__snapshots__/FeedbackWidgetManager.test.tsx.snap b/packages/core/test/feedback/__snapshots__/FeedbackWidgetManager.test.tsx.snap
diff --git a/packages/core/test/scripts/expo-upload-sourcemaps.test.ts b/packages/core/test/scripts/expo-upload-sourcemaps.test.ts

Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,5 @@ android {`
`55`	`55`	`dependencies {`
`56`	`56`	`compileOnly files('libs/replay-stubs.jar')`
`57`	`57`	`implementation 'com.facebook.react:react-native:+'`
`58`		`- api 'io.sentry:sentry-android:8.31.0'`
	`58`	`+ api 'io.sentry:sentry-android:8.32.0'`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- compileOnly 'io.sentry:sentry:8.31.0'`
	`21`	`+ compileOnly 'io.sentry:sentry:8.32.0'`
`22`	`22`	`}`