Merge remote-tracking branch 'origin/main' into jm/use-common-space-type

guardian · May 28, 2024 · ee350ef · ee350ef
2 parents baa7406 + 546f021
commit ee350ef
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 15 deletions.
diff --git a/libs/@guardian/source-development-kitchen/react-components/package.json b/libs/@guardian/source-development-kitchen/react-components/package.json
@@ -1,6 +1,6 @@
 {
-	"//": "sub-package to match the `exports` field in the parent package.json",
 	"private": true,
 	"type": "module",
-	"main": "../dist/react-components.js"
+	"main": "../dist/react-components.js",
+	"//": "sub-package to match the `exports` field in the parent package.json"
 }
diff --git a/libs/@guardian/source/CHANGELOG.md b/libs/@guardian/source/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @guardian/source
 
+## 1.0.3
+
+### Patch Changes
+
+- 957cbac: call react hook useId before conditional
+
 ## 1.0.2
 
 ### Patch Changes

diff --git a/libs/@guardian/source/foundations/package.json b/libs/@guardian/source/foundations/package.json
@@ -1,6 +1,6 @@
 {
-	"//": "sub-package to match the `exports` field in the parent package.json",
 	"private": true,
 	"type": "module",
-	"main": "../dist/foundations.js"
+	"main": "../dist/foundations.js",
+	"//": "sub-package to match the `exports` field in the parent package.json"
 }
diff --git a/libs/@guardian/source/package.json b/libs/@guardian/source/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@guardian/source",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"license": "Apache-2.0",
 	"sideEffects": false,
 	"type": "module",

diff --git a/libs/@guardian/source/react-components/package.json b/libs/@guardian/source/react-components/package.json
@@ -1,6 +1,6 @@
 {
-	"//": "sub-package to match the `exports` field in the parent package.json",
 	"private": true,
 	"type": "module",
-	"main": "../dist/react-components.js"
+	"main": "../dist/react-components.js",
+	"//": "sub-package to match the `exports` field in the parent package.json"
 }
diff --git a/libs/@guardian/source/src/react-components/checkbox/Checkbox.tsx b/libs/@guardian/source/src/react-components/checkbox/Checkbox.tsx
@@ -98,7 +98,8 @@ export const Checkbox = ({
 	theme,
 	...props
 }: CheckboxProps) => {
-	const checkboxId = id ?? useId();
+	const defaultId = useId();
+	const checkboxId = id ?? defaultId;
 	const isChecked = (): boolean => {
 		if (checked != null) {
 			return checked;

diff --git a/libs/@guardian/source/src/react-components/checkbox/CheckboxGroup.tsx b/libs/@guardian/source/src/react-components/checkbox/CheckboxGroup.tsx
@@ -74,7 +74,8 @@ export const CheckboxGroup = ({
 	theme,
 	...props
 }: CheckboxGroupProps) => {
-	const groupId = id ?? useId();
+	const defaultId = useId();
+	const groupId = id ?? defaultId;
 	const legend = label ? (
 		<Legend
 			text={label}

diff --git a/libs/@guardian/source/src/react-components/choice-card/ChoiceCardGroup.tsx b/libs/@guardian/source/src/react-components/choice-card/ChoiceCardGroup.tsx
@@ -88,7 +88,8 @@ export const ChoiceCardGroup = ({
 	theme,
 	...props
 }: ChoiceCardGroupProps) => {
-	const groupId = id ?? useId();
+	const defaultId = useId();
+	const groupId = id ?? defaultId;
 	const showLabel = !!(label && !hideLabel);
 	const topMargin =
 		(showLabel || supporting) ?? error ? containerTopMargin : '';

diff --git a/libs/@guardian/source/src/react-components/radio/Radio.tsx b/libs/@guardian/source/src/react-components/radio/Radio.tsx
@@ -82,7 +82,8 @@ export const Radio = ({
 	theme,
 	...props
 }: RadioProps) => {
-	const radioId = id ?? useId();
+	const defaultId = useId();
+	const radioId = id ?? defaultId;
 	const isChecked = (): boolean => {
 		if (checked != null) {
 			return checked;

diff --git a/libs/@guardian/source/src/react-components/radio/RadioGroup.tsx b/libs/@guardian/source/src/react-components/radio/RadioGroup.tsx
@@ -78,7 +78,8 @@ export const RadioGroup = ({
 	theme,
 	...props
 }: RadioGroupProps) => {
-	const groupId = id ?? useId();
+	const defaultId = useId();
+	const groupId = id ?? defaultId;
 	const legend = label ? (
 		<Legend
 			text={label}

diff --git a/libs/@guardian/source/src/react-components/select/Select.tsx b/libs/@guardian/source/src/react-components/select/Select.tsx
@@ -95,7 +95,8 @@ export const Select = ({
 	theme,
 	...props
 }: SelectProps) => {
-	const selectId = id ?? useId();
+	const defaultId = useId();
+	const selectId = id ?? defaultId;
 	const mergedTheme = (providerTheme: Theme['select']) =>
 		mergeThemes<ThemeSelect, Theme['select']>(
 			defaultTheme,

diff --git a/libs/@guardian/source/src/react-components/text-area/TextArea.tsx b/libs/@guardian/source/src/react-components/text-area/TextArea.tsx
@@ -105,7 +105,8 @@ export const TextArea = ({
 	theme,
 	...props
 }: TextAreaProps) => {
-	const textAreaId = id ?? useId();
+	const defaultId = useId();
+	const textAreaId = id ?? defaultId;
 	const getClassName = () => {
 		const HAS_VALUE_CLASS = 'src-has-value';
 

diff --git a/libs/@guardian/source/src/react-components/text-input/TextInput.tsx b/libs/@guardian/source/src/react-components/text-input/TextInput.tsx
@@ -122,7 +122,8 @@ export const TextInput = ({
 	cssOverrides,
 	...props
 }: TextInputProps) => {
-	const textInputId = id ?? useId();
+	const defaultId = useId();
+	const textInputId = id ?? defaultId;
 	const mergedTheme = (providerTheme: Theme) =>
 		mergeThemes<ThemeTextInput, Theme['textInput']>(
 			themeTextInput,