From 1dc38bd20d18accc14decf5ef318736ffd89bf0d Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cdransfeldt@adobe.com>
Date: Wed, 5 Nov 2025 15:22:26 -0800
Subject: [PATCH 1/6] fix(field-label): prevent the asterisk on required field
 labels from wrapping

---
 1st-gen/packages/field-label/src/FieldLabel.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/1st-gen/packages/field-label/src/FieldLabel.ts b/1st-gen/packages/field-label/src/FieldLabel.ts
index 763c272caab..e43745758ff 100644
--- a/1st-gen/packages/field-label/src/FieldLabel.ts
+++ b/1st-gen/packages/field-label/src/FieldLabel.ts
@@ -153,9 +153,12 @@ export class FieldLabel extends SizedMixin(SpectrumElement, {
                 <slot></slot>
                 ${this.required
                     ? html`
-                          <sp-icon-asterisk100
-                              class="required-icon spectrum-UIIcon-Asterisk100"
-                          ></sp-icon-asterisk100>
+                          <span>
+                              &nbsp;
+                              <sp-icon-asterisk100
+                                  class="required-icon spectrum-UIIcon-Asterisk100"
+                              ></sp-icon-asterisk100>
+                          </span>
                       `
                     : nothing}
             </label>

From ddc2ae08bd6a79e0eba2e0c4665b65a8a498e5a5 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cdransfeldt@adobe.com>
Date: Wed, 5 Nov 2025 15:44:37 -0800
Subject: [PATCH 2/6] fix(field-label): remove margin from required asterisk

---
 1st-gen/packages/field-label/src/spectrum-field-label.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/1st-gen/packages/field-label/src/spectrum-field-label.css b/1st-gen/packages/field-label/src/spectrum-field-label.css
index efea42e1139..c3ec8d4a0ea 100644
--- a/1st-gen/packages/field-label/src/spectrum-field-label.css
+++ b/1st-gen/packages/field-label/src/spectrum-field-label.css
@@ -86,7 +86,6 @@
 .required-icon {
     color: inherit;
     margin-block: 0;
-    margin-inline: var(--mod-field-label-text-to-asterisk, var(--spectrum-field-label-text-to-asterisk)) 0;
     vertical-align: initial;
     vertical-align: var(--mod-field-label-asterisk-vertical-align, baseline);
 }

From 40560f9e94c7070016f425b3216284e83b6418fd Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cdransfeldt@adobe.com>
Date: Thu, 6 Nov 2025 10:20:34 -0800
Subject: [PATCH 3/6] fix(field-label): apply narrower space to component

---
 1st-gen/packages/field-label/src/FieldLabel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1st-gen/packages/field-label/src/FieldLabel.ts b/1st-gen/packages/field-label/src/FieldLabel.ts
index e43745758ff..ba017a5ce27 100644
--- a/1st-gen/packages/field-label/src/FieldLabel.ts
+++ b/1st-gen/packages/field-label/src/FieldLabel.ts
@@ -154,7 +154,7 @@ export class FieldLabel extends SizedMixin(SpectrumElement, {
                 ${this.required
                     ? html`
                           <span>
-                              &nbsp;
+                              &hairsp;
                               <sp-icon-asterisk100
                                   class="required-icon spectrum-UIIcon-Asterisk100"
                               ></sp-icon-asterisk100>

From a529c82b8c2028d1ddc13625237c92b774d92a7e Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cdransfeldt@adobe.com>
Date: Thu, 6 Nov 2025 10:42:40 -0800
Subject: [PATCH 4/6] fix(field-label): conditionally apply thin non breaking
 space

---
 1st-gen/packages/field-label/src/FieldLabel.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/1st-gen/packages/field-label/src/FieldLabel.ts b/1st-gen/packages/field-label/src/FieldLabel.ts
index ba017a5ce27..3ee072b5b33 100644
--- a/1st-gen/packages/field-label/src/FieldLabel.ts
+++ b/1st-gen/packages/field-label/src/FieldLabel.ts
@@ -148,16 +148,26 @@ export class FieldLabel extends SizedMixin(SpectrumElement, {
     }
 
     protected override render(): TemplateResult {
+        const isRtl = this.dir === 'rtl';
         return html`
             <label>
                 <slot></slot>
                 ${this.required
                     ? html`
                           <span>
-                              &hairsp;
+                              ${isRtl
+                                  ? nothing
+                                  : html`
+                                        &hairsp;
+                                    `}
                               <sp-icon-asterisk100
                                   class="required-icon spectrum-UIIcon-Asterisk100"
                               ></sp-icon-asterisk100>
+                              ${isRtl
+                                  ? html`
+                                        &hairsp;
+                                    `
+                                  : nothing}
                           </span>
                       `
                     : nothing}

From 879f8f33016a7f96b357644f9b60e146345bf897 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cdransfeldt@adobe.com>
Date: Thu, 6 Nov 2025 10:46:15 -0800
Subject: [PATCH 5/6] fix(field-label): use narrow non breaking space

---
 1st-gen/packages/field-label/src/FieldLabel.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/1st-gen/packages/field-label/src/FieldLabel.ts b/1st-gen/packages/field-label/src/FieldLabel.ts
index 3ee072b5b33..f5d2eb79829 100644
--- a/1st-gen/packages/field-label/src/FieldLabel.ts
+++ b/1st-gen/packages/field-label/src/FieldLabel.ts
@@ -154,18 +154,18 @@ export class FieldLabel extends SizedMixin(SpectrumElement, {
                 <slot></slot>
                 ${this.required
                     ? html`
-                          <span>
+                          <span style="white-space: nowrap;">
                               ${isRtl
                                   ? nothing
                                   : html`
-                                        &hairsp;
+                                        &#8239;
                                     `}
                               <sp-icon-asterisk100
                                   class="required-icon spectrum-UIIcon-Asterisk100"
                               ></sp-icon-asterisk100>
                               ${isRtl
                                   ? html`
-                                        &hairsp;
+                                        &#8239;
                                     `
                                   : nothing}
                           </span>

From d8867eb3e211aa34415ca036a949d458c82d53b5 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <cdransfeldt@adobe.com>
Date: Thu, 6 Nov 2025 11:02:27 -0800
Subject: [PATCH 6/6] fix(field-label): update golden hash

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be2d7750c9a..de0f7b823a7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,7 +22,7 @@ parameters:
     # 3. Commit this change to the PR branch where the changes exist.
     current_golden_images_hash:
         type: string
-        default: 89cb380330cef18d34c0d4cf893790d9c7167b08
+        default: 879f8f33016a7f96b357644f9b60e146345bf897
     wireit_cache_name:
         type: string
         default: wireit