From b7f218c336dae7a4fea80133e10bf9a6ffa303b5 Mon Sep 17 00:00:00 2001
From: Mike Perrotti <mperrotti@github.com>
Date: Thu, 7 Apr 2022 10:49:09 -0700
Subject: [PATCH 1/6] fixes spacing in TextInputWithTokens when there is a
 loading spinner

---
 src/TextInputWithTokens.tsx                   |  4 ++--
 .../TextInputWithTokens.test.tsx.snap         | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/TextInputWithTokens.tsx b/src/TextInputWithTokens.tsx
index 6d7b79997f0..8a6fee9b7b9 100644
--- a/src/TextInputWithTokens.tsx
+++ b/src/TextInputWithTokens.tsx
@@ -254,8 +254,8 @@ function TextInputWithTokensInnerComponent<TokenComponentType extends AnyReactCo
       className={className}
       contrast={contrast}
       disabled={disabled}
-      hasLeadingVisual={Boolean(LeadingVisual)}
-      hasTrailingVisual={Boolean(TrailingVisual)}
+      hasLeadingVisual={Boolean(LeadingVisual || showLeadingLoadingIndicator)}
+      hasTrailingVisual={Boolean(TrailingVisual || showTrailingLoadingIndicator)}
       width={widthProp}
       minWidth={minWidthProp}
       maxWidth={maxWidthProp}
diff --git a/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap b/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap
index b295583c0fa..03f1c8ed1fb 100644
--- a/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap
+++ b/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap
@@ -6507,7 +6507,7 @@ Array [
   background-repeat: no-repeat;
   background-position: right 8px center;
   padding-left: 0;
-  padding-right: 0;
+  padding-right: 12px;
   padding-left: 12px;
   padding-top: calc(12px / 2);
   padding-bottom: calc(12px / 2);
@@ -6556,7 +6556,7 @@ Array [
 .c0 > input,
 .c0 > select {
   padding-left: 12px;
-  padding-right: 12px;
+  padding-right: 0;
 }
 
 .c3 {
@@ -7230,7 +7230,7 @@ Array [
   padding-bottom: calc(12px / 2);
   background-repeat: no-repeat;
   background-position: right 8px center;
-  padding-left: 0;
+  padding-left: 12px;
   padding-right: 0;
   padding-left: 12px;
   padding-top: calc(12px / 2);
@@ -7279,7 +7279,7 @@ Array [
 
 .c0 > input,
 .c0 > select {
-  padding-left: 12px;
+  padding-left: 0;
   padding-right: 12px;
 }
 
@@ -7999,7 +7999,7 @@ Array [
   background-repeat: no-repeat;
   background-position: right 8px center;
   padding-left: 0;
-  padding-right: 0;
+  padding-right: 12px;
   padding-left: 12px;
   padding-top: calc(12px / 2);
   padding-bottom: calc(12px / 2);
@@ -8048,7 +8048,7 @@ Array [
 .c0 > input,
 .c0 > select {
   padding-left: 12px;
-  padding-right: 12px;
+  padding-right: 0;
 }
 
 .c3 {
@@ -10343,7 +10343,7 @@ Array [
   background-repeat: no-repeat;
   background-position: right 8px center;
   padding-left: 12px;
-  padding-right: 0;
+  padding-right: 12px;
   padding-left: 12px;
   padding-top: calc(12px / 2);
   padding-bottom: calc(12px / 2);
@@ -10392,7 +10392,7 @@ Array [
 .c0 > input,
 .c0 > select {
   padding-left: 0;
-  padding-right: 12px;
+  padding-right: 0;
 }
 
 .c6 {
@@ -11914,7 +11914,7 @@ Array [
   padding-bottom: calc(12px / 2);
   background-repeat: no-repeat;
   background-position: right 8px center;
-  padding-left: 0;
+  padding-left: 12px;
   padding-right: 12px;
   padding-left: 12px;
   padding-top: calc(12px / 2);
@@ -11963,7 +11963,7 @@ Array [
 
 .c0 > input,
 .c0 > select {
-  padding-left: 12px;
+  padding-left: 0;
   padding-right: 0;
 }
 

From 05c9bf459f50972d4d434bc62fe287c98e354b03 Mon Sep 17 00:00:00 2001
From: Mike Perrotti <mperrotti@github.com>
Date: Thu, 7 Apr 2022 10:59:21 -0700
Subject: [PATCH 2/6] bolds input validation text

---
 src/_InputValidation.tsx                                      | 1 +
 .../deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/_InputValidation.tsx b/src/_InputValidation.tsx
index 9b29e04798f..e45040ba8be 100644
--- a/src/_InputValidation.tsx
+++ b/src/_InputValidation.tsx
@@ -28,6 +28,7 @@ const InputValidation: React.FC<Props> = ({children, id, validationStatus, sx})
   return (
     <Text
       fontSize={0}
+      fontWeight="bold"
       sx={{
         alignItems: 'center',
         color: fgColor,
diff --git a/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap b/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap
index 6d04bc63ff4..ff4dcc0f71d 100644
--- a/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap
+++ b/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap
@@ -917,6 +917,7 @@ exports[`ChoiceFieldset renders with a success validation message 1`] = `
 
 .c12 {
   font-size: 12px;
+  font-weight: bold;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -1051,6 +1052,7 @@ exports[`ChoiceFieldset renders with a success validation message 1`] = `
           <span
             class="c12"
             font-size="0"
+            font-weight="bold"
           >
             <span
               aria-hidden="true"
@@ -1163,6 +1165,7 @@ exports[`ChoiceFieldset renders with an error validation message 1`] = `
 
 .c12 {
   font-size: 12px;
+  font-weight: bold;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -1297,6 +1300,7 @@ exports[`ChoiceFieldset renders with an error validation message 1`] = `
           <span
             class="c12"
             font-size="0"
+            font-weight="bold"
           >
             <span
               aria-hidden="true"

From 5cb3575fe0e16e265b7a68d6b1f2ff02bb40ecd4 Mon Sep 17 00:00:00 2001
From: Mike Perrotti <mperrotti@github.com>
Date: Thu, 7 Apr 2022 11:07:21 -0700
Subject: [PATCH 3/6] adds changeset

---
 .changeset/orange-eels-kiss.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/orange-eels-kiss.md

diff --git a/.changeset/orange-eels-kiss.md b/.changeset/orange-eels-kiss.md
new file mode 100644
index 00000000000..998a449a3a7
--- /dev/null
+++ b/.changeset/orange-eels-kiss.md
@@ -0,0 +1,6 @@
+---
+'@primer/react': patch
+---
+
+1. Fix a spacing issue with the loading spinner in a `TextInputWithTokens`
+2. Bolds form validation text to be visually balanced with the icon

From 88b82da2fa77d96c6b475d3c236cee64bc5d815c Mon Sep 17 00:00:00 2001
From: Mike Perrotti <mperrotti@github.com>
Date: Wed, 13 Apr 2022 10:51:53 -0400
Subject: [PATCH 4/6] Update src/_InputValidation.tsx

Co-authored-by: Cole Bemis <colebemis@github.com>
---
 src/_InputValidation.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/_InputValidation.tsx b/src/_InputValidation.tsx
index e45040ba8be..9c665b71e03 100644
--- a/src/_InputValidation.tsx
+++ b/src/_InputValidation.tsx
@@ -27,9 +27,9 @@ const InputValidation: React.FC<Props> = ({children, id, validationStatus, sx})
 
   return (
     <Text
-      fontSize={0}
-      fontWeight="bold"
       sx={{
+        fontSize: 0,
+        fontWeight: "bold",
         alignItems: 'center',
         color: fgColor,
         display: 'flex',

From 60f5bae77cffc1f281939bd15b47ba3875725bd9 Mon Sep 17 00:00:00 2001
From: Mike Perrotti <mperrotti@github.com>
Date: Wed, 13 Apr 2022 14:13:30 -0400
Subject: [PATCH 5/6] fixes linting issues and updates snapshots

---
 src/_InputValidation.tsx                                      | 2 +-
 .../deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap     | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/_InputValidation.tsx b/src/_InputValidation.tsx
index 9c665b71e03..c48fae62f58 100644
--- a/src/_InputValidation.tsx
+++ b/src/_InputValidation.tsx
@@ -29,7 +29,7 @@ const InputValidation: React.FC<Props> = ({children, id, validationStatus, sx})
     <Text
       sx={{
         fontSize: 0,
-        fontWeight: "bold",
+        fontWeight: 'bold',
         alignItems: 'center',
         color: fgColor,
         display: 'flex',
diff --git a/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap b/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap
index ff4dcc0f71d..5abfa4ae979 100644
--- a/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap
+++ b/src/__tests__/deprecated/__snapshots__/ChoiceFieldset.test.tsx.snap
@@ -1051,8 +1051,6 @@ exports[`ChoiceFieldset renders with a success validation message 1`] = `
         >
           <span
             class="c12"
-            font-size="0"
-            font-weight="bold"
           >
             <span
               aria-hidden="true"
@@ -1299,8 +1297,6 @@ exports[`ChoiceFieldset renders with an error validation message 1`] = `
         >
           <span
             class="c12"
-            font-size="0"
-            font-weight="bold"
           >
             <span
               aria-hidden="true"

From d84a58f510da40a888472d769153c9cba80cb58d Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Tue, 19 Apr 2022 12:12:23 +0200
Subject: [PATCH 6/6] new branch from mike's branch

---
 src/TextInputWithTokens.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/TextInputWithTokens.tsx b/src/TextInputWithTokens.tsx
index 8a6fee9b7b9..0f6a596211b 100644
--- a/src/TextInputWithTokens.tsx
+++ b/src/TextInputWithTokens.tsx
@@ -1,3 +1,5 @@
+// i dont understand what's wrong
+
 import {FocusKeys} from '@primer/behaviors'
 import {isFocusable} from '@primer/behaviors/utils'
 import {omit} from '@styled-system/props'