chore: merge main:

Author: TarunAdobe

.changeset/bold-ducks-end.md

@@ -0,0 +1,8 @@
+---
+'@spectrum-web-components/field-label': patch
+'@spectrum-web-components/help-text': patch
+---
+
+Fix missing CSS custom property overrides for field-label and help-text components
+
+Previously, these components had empty override files despite having corresponding `--system-*` tokens defined in the system theme bridge. This caused the components to not properly apply size-specific spacing tokens for top and bottom text positioning. The fix adds the missing CSS custom property mappings to ensure proper theming across all component sizes (s, m, l, xl).

.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: b88c1b90e553e4f212ad60a5d96abc4dc9ed6be0
     wireit_cache_name:
         type: string
         default: wireit
@@ -297,7 +297,9 @@ jobs:
                   command: cp 1st-gen/projects/documentation/custom-elements.json 1st-gen/storybook/
             - run:
                   name: Build documentation with path prefix
-                  command: echo "SWC_DIR=beta/docs" >> $BASH_ENV
+                  command: |
+                      echo "export SWC_DIR=beta/docs" >> $BASH_ENV
+                      source $BASH_ENV
             - run:
                   name: Build documentation
                   command: yarn workspace @spectrum-web-components/1st-gen docs:build

.stylelintignore

@@ -8,6 +8,4 @@ HEADER
 !*.css
 1st-gen/projects/example-project/dist
 1st-gen/tools/styles
-1st-gen/spectrum-*.css
-1st-gen/test/playwright-a11y/report/
-2nd-gen/test/playwright-a11y/report/
+1st-gen/spectrum-*.css

1st-gen/package.json

@@ -62,11 +62,6 @@
         "storybook:quick": "run-p build:watch storybook:run",
         "storybook:run": "web-dev-server --config wds-storybook.config.js",
         "test": "yarn test:focus unit",
-        "test:a11y": "playwright test --config=../2nd-gen/playwright.a11y.config.ts",
-        "test:a11y:1st": "playwright test --config=../2nd-gen/playwright.a11y.config.ts --project=1st-gen",
-        "test:a11y:2nd": "playwright test --config=../2nd-gen/playwright.a11y.config.ts --project=2nd-gen",
-        "test:a11y:report": "playwright show-report ../2nd-gen/test/playwright-a11y/report",
-        "test:a11y:ui": "playwright test --config=../2nd-gen/playwright.a11y.config.ts --ui",
         "test:bench": "yarn build:tests && node test/benchmark/cli.js",
         "test:changed": "node ./scripts/test-changes.js",
         "test:ci": "yarn test:start",
@@ -92,11 +87,10 @@
         "react/*"
     ],
     "devDependencies": {
-        "@axe-core/playwright": "^4.11.0",
         "@changesets/changelog-github": "0.5.1",
         "@changesets/cli": "2.29.7",
         "@commitlint/cli": "19.8.1",
-        "@commitlint/config-conventional": "^19.8.1",
+        "@commitlint/config-conventional": "19.8.1",
         "@custom-elements-manifest/analyzer": "0.10.6",
         "@geometricpanda/storybook-addon-badges": "2.0.5",
         "@lit/react": "1.0.8",
@@ -173,7 +167,7 @@
         "jsonc-eslint-parser": "2.4.1",
         "latest-version": "9.0.0",
         "lightningcss": "1.30.1",
-        "lint-staged": "^16.1.2",
+        "lint-staged": "16.2.6",
         "lit": "^2.5.0 || ^3.1.3",
         "lit-analyzer": "2.0.3",
         "lit-html": "^2.4.0 || ^3.1.3",
@@ -187,7 +181,7 @@
         "prettier-plugin-package": "1.4.0",
         "pretty-bytes": "7.1.0",
         "re-template-tag": "2.0.1",
-        "replace-in-file": "^8.3.0",
+        "replace-in-file": "8.3.0",
         "rimraf": "6.0.1",
         "rollup": "4.52.2",
         "sinon": "17.0.2",

1st-gen/packages/badge/test/badge.a11y.spec.ts

@@ -12,7 +12,7 @@
 
 import { expect, test } from '@playwright/test';
 import AxeBuilder from '@axe-core/playwright';
-import { gotoStory } from '../../../../2nd-gen/test/a11y-helpers.js';
+import { gotoStory } from '../../../test/a11y-helpers.js';
 
 /**
  * Accessibility tests for Badge component

1st-gen/packages/field-label/src/field-label-overrides.css

@@ -9,3 +9,23 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+
+:host {
+    --spectrum-field-label-top-to-text: var(--system-field-label-top-to-text);
+    --spectrum-field-label-bottom-to-text: var(--system-field-label-bottom-to-text);
+}
+
+:host([size="s"]) {
+    --spectrum-field-label-top-to-text: var(--system-field-label-top-to-text-small);
+    --spectrum-field-label-bottom-to-text: var(--system-field-label-bottom-to-text-small);
+}
+
+:host([size="l"]) {
+    --spectrum-field-label-top-to-text: var(--system-field-label-top-to-text-large);
+    --spectrum-field-label-bottom-to-text: var(--system-field-label-bottom-to-text-large);
+}
+
+:host([size="xl"]) {
+    --spectrum-field-label-top-to-text: var(--system-field-label-top-to-text-extra-large);
+    --spectrum-field-label-bottom-to-text: var(--system-field-label-bottom-to-text-extra-large);
+}

1st-gen/packages/help-text/src/help-text-overrides.css

@@ -9,3 +9,23 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+
+:host {
+    --spectrum-helptext-top-to-text: var(--system-helptext-top-to-text);
+    --spectrum-helptext-bottom-to-text: var(--system-helptext-bottom-to-text);
+}
+
+:host([size="s"]) {
+    --spectrum-helptext-top-to-text: var(--system-helptext-top-to-text-small);
+    --spectrum-helptext-bottom-to-text: var(--system-helptext-bottom-to-text-small);
+}
+
+:host([size="l"]) {
+    --spectrum-helptext-top-to-text: var(--system-helptext-top-to-text-large);
+    --spectrum-helptext-bottom-to-text: var(--system-helptext-bottom-to-text-large);
+}
+
+:host([size="xl"]) {
+    --spectrum-helptext-top-to-text: var(--system-helptext-top-to-text-extra-large);
+    --spectrum-helptext-bottom-to-text: var(--system-helptext-bottom-to-text-extra-large);
+}

1st-gen/packages/status-light/test/status-light.a11y.spec.ts

@@ -12,7 +12,7 @@
 
 import { expect, test } from '@playwright/test';
 import AxeBuilder from '@axe-core/playwright';
-import { gotoStory } from '../../../../2nd-gen/test/a11y-helpers.js';
+import { gotoStory } from '../../../test/a11y-helpers.js';
 
 /**
  * Accessibility tests for Status Light component

1st-gen/projects/documentation/scripts/component-template-parts.js

@@ -157,17 +157,21 @@ ${
     tag.members.length &&
     tag.attributes.filter((attribute) => {
         const member = tag.members.find((member) => {
-            return member.name === attribute.name;
+            const attrName = attribute.fieldName || attribute.name;
+            return member.name === attrName;
         });
-        return member?.privacy === 'public';
+        // Treat missing privacy as public; skip only explicit private
+        return member && member.privacy !== 'private';
     }).length
         ? buildTable(
               'Attributes and Properties',
               tag.attributes.filter((attribute) => {
                   const member = tag.members.find((member) => {
-                      return member.name === attribute.fieldName;
+                      const attrName = attribute.fieldName || attribute.name;
+                      return member.name === attrName;
                   });
-                  return member?.privacy === 'public';
+                  // Treat missing privacy as public; skip only explicit private
+                  return !!member && member.privacy !== 'private';
               }),
               ['Property', 'Attribute', 'Type', 'Default', 'Description'],
               [

2nd-gen/test/a11y-helpers.ts 1st-gen/test/a11y-helpers.ts2nd-gen/test/a11y-helpers.ts renamed to 1st-gen/test/a11y-helpers.ts

@@ -59,10 +59,10 @@ export async function waitForStoryReady(
     await element.waitFor({ state: 'visible' });
 
     // Step 4: Wait for Web Component to be fully upgraded (has shadow root if applicable)
-    await element.evaluate((el) => {
+    await element.evaluate(async (el) => {
         // If it's a custom element, wait for it to be fully upgraded
         if (el.tagName.includes('-')) {
-            return customElements.whenDefined(el.tagName.toLowerCase());
+            await customElements.whenDefined(el.tagName.toLowerCase());
         }
     });
 
@@ -84,7 +84,9 @@ export async function gotoStory(
     elementSelector: string
 ): Promise<Locator> {
     // Navigate to story (baseURL is set by Playwright project config)
-    await page.goto(`/iframe.html?id=${storyId}&viewMode=story`);
+    await page.goto(`/iframe.html?id=${storyId}&viewMode=story`, {
+        waitUntil: 'domcontentloaded',
+    });
 
     // Wait for story to be ready
     return waitForStoryReady(page, elementSelector);