From 28e83ee39c03b5fbc1c6ff251a51c45d3f587037 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Mon, 22 Nov 2021 08:52:43 +0000
Subject: [PATCH] Checkbox Component Styling Fix (#5164)

* Wrap label in div to prevent clickable area growing too large

* Prevent pointer events on svg

* Double gap in editor
---
 .../checkout-terms-block/editor.scss          |  4 --
 .../components/checkbox-control/index.tsx     | 51 ++++++++++---------
 .../components/checkbox-control/style.scss    | 12 +++--
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/assets/js/blocks/cart-checkout/checkout/inner-blocks/checkout-terms-block/editor.scss b/assets/js/blocks/cart-checkout/checkout/inner-blocks/checkout-terms-block/editor.scss
index 5670ae6c742..8b4c077027a 100644
--- a/assets/js/blocks/cart-checkout/checkout/inner-blocks/checkout-terms-block/editor.scss
+++ b/assets/js/blocks/cart-checkout/checkout/inner-blocks/checkout-terms-block/editor.scss
@@ -12,10 +12,6 @@
 	}
 }
 
-.wc-block-components-checkbox {
-	margin-right: $gap;
-}
-
 .wc-block-checkout__terms_notice .components-notice__action {
 	margin-left: 0;
 }
diff --git a/packages/checkout/components/checkbox-control/index.tsx b/packages/checkout/components/checkbox-control/index.tsx
index 1f181939cef..fe4bf825e82 100644
--- a/packages/checkout/components/checkbox-control/index.tsx
+++ b/packages/checkout/components/checkbox-control/index.tsx
@@ -35,7 +35,7 @@ const CheckboxControl = ( {
 	const checkboxId = id || `checkbox-control-${ instanceId }`;
 
 	return (
-		<label
+		<div
 			className={ classNames(
 				'wc-block-components-checkbox',
 				{
@@ -43,31 +43,32 @@ const CheckboxControl = ( {
 				},
 				className
 			) }
-			htmlFor={ checkboxId }
 		>
-			<input
-				id={ checkboxId }
-				className="wc-block-components-checkbox__input"
-				type="checkbox"
-				onChange={ ( event ) => onChange( event.target.checked ) }
-				aria-invalid={ hasError === true }
-				{ ...rest }
-			/>
-			<svg
-				className="wc-block-components-checkbox__mark"
-				aria-hidden="true"
-				xmlns="http://www.w3.org/2000/svg"
-				viewBox="0 0 24 20"
-			>
-				<path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
-			</svg>
-			{ label && (
-				<span className="wc-block-components-checkbox__label">
-					{ label }
-				</span>
-			) }
-			{ children }
-		</label>
+			<label htmlFor={ checkboxId }>
+				<input
+					id={ checkboxId }
+					className="wc-block-components-checkbox__input"
+					type="checkbox"
+					onChange={ ( event ) => onChange( event.target.checked ) }
+					aria-invalid={ hasError === true }
+					{ ...rest }
+				/>
+				<svg
+					className="wc-block-components-checkbox__mark"
+					aria-hidden="true"
+					xmlns="http://www.w3.org/2000/svg"
+					viewBox="0 0 24 20"
+				>
+					<path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+				</svg>
+				{ label && (
+					<span className="wc-block-components-checkbox__label">
+						{ label }
+					</span>
+				) }
+				{ children }
+			</label>
+		</div>
 	);
 };
 
diff --git a/packages/checkout/components/checkbox-control/style.scss b/packages/checkout/components/checkbox-control/style.scss
index 164f15730af..2e59624499c 100644
--- a/packages/checkout/components/checkbox-control/style.scss
+++ b/packages/checkout/components/checkbox-control/style.scss
@@ -1,10 +1,13 @@
 .wc-block-components-checkbox {
 	@include reset-typography();
-	align-items: flex-start;
-	display: flex;
-	position: relative;
 	margin-top: em($gap-large);
 
+	label {
+		align-items: flex-start;
+		display: flex;
+		position: relative;
+	}
+
 	.wc-block-components-checkbox__input[type="checkbox"] {
 		font-size: 1em;
 		appearance: none;
@@ -14,6 +17,7 @@
 		height: em(24px);
 		width: em(24px);
 		margin: 0;
+		margin-right: $gap;
 		min-height: 24px;
 		min-width: 24px;
 		overflow: hidden;
@@ -83,6 +87,7 @@
 		margin-top: em(1px);
 		width: em(18px);
 		height: em(18px);
+		pointer-events: none;
 
 		.has-dark-controls & {
 			fill: #fff;
@@ -91,7 +96,6 @@
 
 	> span,
 	.wc-block-components-checkbox__label {
-		padding-left: $gap;
 		vertical-align: middle;
 		line-height: em(24px);
 	}