Merge branch 'main' into next-major

Author: rezrah

.changeset/safe-ssr-theming.md

@@ -1,5 +1,15 @@
 # @primer/components
 
+## 34.7.1
+
+### Patch Changes
+
+- [#1936](https://github.com/primer/react/pull/1936) [`ceaaf171`](https://github.com/primer/react/commit/ceaaf17174f08ccccd5223066e456c38b76241c1) Thanks [@siddharthkp](https://github.com/siddharthkp)! - ThemeProvider: Fix `setColorMode`. Broken in `34.6.0`
+
+* [#1913](https://github.com/primer/react/pull/1913) [`92a02377`](https://github.com/primer/react/commit/92a023770f04662a3571de7e87fab8565592bae4) Thanks [@siddharthkp](https://github.com/siddharthkp)! - Fixes the theming implementation with server side rendering to use a CSRF safe approach
+
+- [#1928](https://github.com/primer/react/pull/1928) [`4dc15c33`](https://github.com/primer/react/commit/4dc15c3300838733da39fd2895692cce5bc3a3b5) Thanks [@pksjce](https://github.com/pksjce)! - Add outline background and border color
+
 ## 34.7.0
 
 ### Minor Changes

.changeset/three-papayas-beg.md

@@ -1,6 +1,6 @@
 ---
 title: CheckboxGroup
-description: A `CheckboxGroup` is used to render a set of checkboxes to let users select one or more options
+description: Renders a set of checkboxes to let users make one or more selections from a short list of options
 status: Alpha
 source: https://github.com/primer/react/blob/main/src/CheckboxGroup/CheckboxGroup.tsx
 storybook: '/react/storybook/?path=/story/forms-checkboxgroup-examples--basic'

CHANGELOG.md

@@ -2,7 +2,7 @@
 componentId: form_control
 title: FormControl
 status: Alpha
-description: The FormControl component is used to render a labelled text input and, optionally, associated validation text and hint text.
+description: Renders a labelled input and, optionally, associated validation text and/or hint text.
 source: https://github.com/primer/react/blob/main/src/FormControl/FormControl.tsx
 storybook: '/react/storybook?path=/story/forms-inputfield--text-input-field'
 ---

docs/content/CheckboxGroup.mdx

@@ -1,6 +1,6 @@
 ---
 title: RadioGroup
-description: A `RadioGroup` is used to render a set of radio inputs to let users select a single option
+description: Renders a set of radio inputs to let users make a single selection from a short list of options
 status: Alpha
 source: https://github.com/primer/react/blob/main/src/RadioGroup/RadioGroup.tsx
 storybook: '/react/storybook/?path=/story/forms-radiogroup-examples--basic'

docs/content/FormControl.mdx

@@ -1,6 +1,6 @@
 {
   "name": "@primer/react",
-  "version": "34.7.0",
+  "version": "34.7.1",
   "description": "An implementation of GitHub's Primer Design System using React",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",

docs/content/RadioGroup.mdx

@@ -99,7 +99,11 @@ export const ThemeProvider: React.FC<ThemeProviderProps> = ({children, ...props}
   // Update state if props change
   React.useEffect(() => {
     setColorMode(props.colorMode ?? fallbackColorMode ?? defaultColorMode)
-  }, [props.colorMode, resolvedColorMode, fallbackColorMode])
+  }, [props.colorMode, fallbackColorMode])
+
+  React.useEffect(() => {
+    setColorMode(resolvedColorMode)
+  }, [resolvedColorMode])
 
   React.useEffect(() => {
     setDayScheme(props.dayScheme ?? fallbackDayScheme ?? defaultDayScheme)