@primer/react 38.42.0-rc.c4a4f80b3 → 38.42.0-rc.ebd425836

package/CHANGELOG.md

@@ -8,6 +8,10 @@
 
 - [#8415](https://github.com/primer/react/pull/8415) [`66a9f31`](https://github.com/primer/react/commit/66a9f31611c642209f66ed68b7d43712b09dbd88) Thanks [@rickyzhangca](https://github.com/rickyzhangca)! - DataTable: Add controlled and uncontrolled row selection.
 
+### Patch Changes
+
+- [#8508](https://github.com/primer/react/pull/8508) [`f71dce4`](https://github.com/primer/react/commit/f71dce4869dedf4cb8460ed2fa8e18edc0604198) Thanks [@namangoyal176-10](https://github.com/namangoyal176-10)! - FormControl: Prevent duplicate input rendering when layout is horizontal with non-choice inputs
+
 ## 38.41.0
 
 ### Minor Changes

package/dist/FormControl/FormControl.js

@@ -24,7 +24,7 @@ import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { clsx } from "clsx";
 var FormControl_default = Object.assign(/* @__PURE__ */ React.forwardRef((t0, ref) => {
 	var _slots$validation, _slots$label;
-	const $ = c(32);
+	const $ = c(23);
 	const { children, disabled: disabledProp, layout: t1, id: idProp, required, className, style } = t0;
 	const layout = t1 === void 0 ? "vertical" : t1;
 	let t2;
@@ -78,87 +78,65 @@ var FormControl_default = Object.assign(/* @__PURE__ */ React.forwardRef((t0, re
 		warning(isRadioInput && childrenWithoutSlots.find(_temp), "An individual radio cannot be a required field.");
 	} else warning(!!slots.leadingVisual, "A leading visual is only rendered for a checkbox or radio form control. If you want to render a leading visual inside of your input, check if your input supports a leading visual.");
 	const isLabelHidden = (_slots$label = slots.label) === null || _slots$label === void 0 ? void 0 : _slots$label.props.visuallyHidden;
-	const t4 = /*#__PURE__*/ React.isValidElement(InputComponent) ? /*#__PURE__*/ React.cloneElement(InputComponent, {
-		id,
-		disabled,
-		required: required && !isRadioInput,
-		"aria-describedby": captionId
-	}) : null;
-	let t5;
-	if ($[4] !== childrenWithoutSlots) {
-		t5 = childrenWithoutSlots.filter(_temp2);
-		$[4] = childrenWithoutSlots;
-		$[5] = t5;
-	} else t5 = $[5];
-	let t6;
-	if ($[6] !== t4 || $[7] !== t5) {
-		t6 = /* @__PURE__ */ jsxs("div", {
-			className: FormControl_module_css_default.ControlChoiceInputs,
-			children: [t4, t5]
-		});
-		$[6] = t4;
-		$[7] = t5;
-		$[8] = t6;
-	} else t6 = $[8];
-	let t7;
-	if ($[9] !== disabled || $[10] !== slots.caption || $[11] !== slots.leadingVisual) {
-		t7 = slots.leadingVisual ? /* @__PURE__ */ jsx("div", {
+	let t4;
+	if ($[4] !== disabled || $[5] !== slots.caption || $[6] !== slots.leadingVisual) {
+		t4 = slots.leadingVisual ? /* @__PURE__ */ jsx("div", {
 			className: FormControl_module_css_default.LeadingVisual,
 			"data-disabled": disabled ? "" : void 0,
 			"data-has-caption": slots.caption ? "" : void 0,
 			children: slots.leadingVisual
 		}) : null;
-		$[9] = disabled;
-		$[10] = slots.caption;
-		$[11] = slots.leadingVisual;
-		$[12] = t7;
-	} else t7 = $[12];
-	let t8;
-	if ($[13] !== slots.caption || $[14] !== slots.label) {
-		t8 = /* @__PURE__ */ jsxs("div", {
+		$[4] = disabled;
+		$[5] = slots.caption;
+		$[6] = slots.leadingVisual;
+		$[7] = t4;
+	} else t4 = $[7];
+	let t5;
+	if ($[8] !== slots.caption || $[9] !== slots.label) {
+		t5 = /* @__PURE__ */ jsxs("div", {
 			className: FormControl_module_css_default.LabelContainer,
 			children: [slots.label, slots.caption]
 		});
-		$[13] = slots.caption;
-		$[14] = slots.label;
-		$[15] = t8;
-	} else t8 = $[15];
-	let t9;
-	if ($[16] !== t6 || $[17] !== t7 || $[18] !== t8) {
-		t9 = /* @__PURE__ */ jsxs(Fragment$1, { children: [
-			t6,
-			t7,
-			t8
-		] });
-		$[16] = t6;
-		$[17] = t7;
-		$[18] = t8;
-		$[19] = t9;
-	} else t9 = $[19];
-	const InputChildren = t9;
+		$[8] = slots.caption;
+		$[9] = slots.label;
+		$[10] = t5;
+	} else t5 = $[10];
+	const InputChildren = /* @__PURE__ */ jsxs(Fragment$1, { children: [
+		/* @__PURE__ */ jsxs("div", {
+			className: FormControl_module_css_default.ControlChoiceInputs,
+			children: [/*#__PURE__*/ React.isValidElement(InputComponent) ? /*#__PURE__*/ React.cloneElement(InputComponent, {
+				id,
+				disabled,
+				required: required && !isRadioInput,
+				"aria-describedby": captionId
+			}) : null, childrenWithoutSlots.filter((child_1) => /*#__PURE__*/ React.isValidElement(child_1) && !expectedInputComponents.some((inputComponent_0) => child_1.type === inputComponent_0 || isSlot(child_1, inputComponent_0)))]
+		}),
+		t4,
+		t5
+	] });
 	const T0 = FormControlContextProvider;
-	const t10 = !isSelectPanelInput;
-	let t11;
-	if ($[20] !== captionId || $[21] !== disabled || $[22] !== id || $[23] !== labelId || $[24] !== required || $[25] !== t10 || $[26] !== validationMessageId) {
-		t11 = {
+	const t6 = !isSelectPanelInput;
+	let t7;
+	if ($[11] !== captionId || $[12] !== disabled || $[13] !== id || $[14] !== labelId || $[15] !== required || $[16] !== t6 || $[17] !== validationMessageId) {
+		t7 = {
 			captionId,
 			disabled,
 			id,
 			required,
 			validationMessageId,
-			isReferenced: t10,
+			isReferenced: t6,
 			labelId
 		};
-		$[20] = captionId;
-		$[21] = disabled;
-		$[22] = id;
-		$[23] = labelId;
-		$[24] = required;
-		$[25] = t10;
-		$[26] = validationMessageId;
-		$[27] = t11;
-	} else t11 = $[27];
-	const t12 = isChoiceInput || layout === "horizontal" ? /* @__PURE__ */ jsx("div", {
+		$[11] = captionId;
+		$[12] = disabled;
+		$[13] = id;
+		$[14] = labelId;
+		$[15] = required;
+		$[16] = t6;
+		$[17] = validationMessageId;
+		$[18] = t7;
+	} else t7 = $[18];
+	const t8 = isChoiceInput || layout === "horizontal" ? /* @__PURE__ */ jsx("div", {
 		ref,
 		"data-has-leading-visual": slots.leadingVisual ? "" : void 0,
 		className: clsx(className, FormControl_module_css_default.ControlHorizontalLayout),
@@ -188,18 +166,18 @@ var FormControl_default = Object.assign(/* @__PURE__ */ React.forwardRef((t0, re
 			slots.caption
 		]
 	});
-	let t13;
-	if ($[28] !== T0 || $[29] !== t11 || $[30] !== t12) {
-		t13 = /* @__PURE__ */ jsx(T0, {
-			value: t11,
-			children: t12
+	let t9;
+	if ($[19] !== T0 || $[20] !== t7 || $[21] !== t8) {
+		t9 = /* @__PURE__ */ jsx(T0, {
+			value: t7,
+			children: t8
 		});
-		$[28] = T0;
-		$[29] = t11;
-		$[30] = t12;
-		$[31] = t13;
-	} else t13 = $[31];
-	return t13;
+		$[19] = T0;
+		$[20] = t7;
+		$[21] = t8;
+		$[22] = t9;
+	} else t9 = $[22];
+	return t9;
 }), {
 	__SLOT__: Symbol("FormControl"),
 	Caption: FormControlCaption,
@@ -211,8 +189,5 @@ function _temp(child_0) {
 	var _child_0$props;
 	return /*#__PURE__*/ React.isValidElement(child_0) && ((_child_0$props = child_0.props) === null || _child_0$props === void 0 ? void 0 : _child_0$props.required);
 }
-function _temp2(child_1) {
-	return /*#__PURE__*/ React.isValidElement(child_1) && ![Checkbox, Radio].some((inputComponent_0) => child_1.type === inputComponent_0 || isSlot(child_1, inputComponent_0));
-}
 //#endregion
 export { FormControl_default as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@primer/react",
   "type": "module",
-  "version": "38.42.0-rc.c4a4f80b3",
+  "version": "38.42.0-rc.ebd425836",
   "description": "An implementation of GitHub's Primer Design System using React",
   "main": "./dist/index.js",
   "module": "./dist/index.js",