From 93b846c43fccb8e0817c978c85b6d68991f4685e Mon Sep 17 00:00:00 2001
From: Rares Munteanu
Date: Mon, 9 Dec 2024 10:58:31 +0100
Subject: [PATCH 04/86] [MWPW-163539] Update RCP workflow (#3296)
---
.github/workflows/helpers.js | 11 +++++++++--
.github/workflows/merge-to-main.js | 3 ++-
.github/workflows/merge-to-main.yaml | 1 +
.github/workflows/merge-to-stage.js | 2 +-
.github/workflows/rcp-notifier.js | 12 ++++++++----
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/helpers.js b/.github/workflows/helpers.js
index dcc7b0025d2..b8b733eb0c2 100644
--- a/.github/workflows/helpers.js
+++ b/.github/workflows/helpers.js
@@ -43,7 +43,11 @@ const RCPDates = [
},
];
-const isWithinRCP = (offset = 0) => {
+const isShortRCP = (start, end) => {
+ return ((end - start) / (1000 * 60 * 60)) < 24;
+};
+
+const isWithinRCP = ({ offset = 0, excludeShortRCP = false } = {}) => {
const now = new Date();
if (now.getFullYear() !== CURRENT_YEAR) {
console.log(`ADD NEW RCPs for ${CURRENT_YEAR + 1}`);
@@ -53,7 +57,9 @@ const isWithinRCP = (offset = 0) => {
if (RCPDates.some(({ start, end }) => {
const adjustedStart = new Date(start);
adjustedStart.setDate(adjustedStart.getDate() - offset);
- return start <= now && now <= end
+ const match = adjustedStart <= now && now <= end;
+ if (!match || (excludeShortRCP && isShortRCP(start, end))) return false;
+ return true;
})) {
console.log(
'Current date is within a RCP (2 days earlier for stage, to keep stage clean & make CSO contributions during an RCP easier). Stopping execution.'
@@ -148,6 +154,7 @@ module.exports = {
getLocalConfigs,
slackNotification,
pulls: { addLabels, addFiles, getChecks, getReviews },
+ isShortRCP,
isWithinRCP,
RCPDates,
};
diff --git a/.github/workflows/merge-to-main.js b/.github/workflows/merge-to-main.js
index efbc9e55bc1..286ddaff196 100644
--- a/.github/workflows/merge-to-main.js
+++ b/.github/workflows/merge-to-main.js
@@ -9,6 +9,7 @@ const {
const PR_TITLE = '[Release] Stage to Main';
const STAGE = 'stage';
const PROD = 'main';
+const MIN_SOT_APPROVALS = process.env.MIN_SOT_APPROVALS ? Number(process.env.MIN_SOT_APPROVALS) : 4;
let github, owner, repo;
@@ -40,7 +41,7 @@ const main = async (params) => {
const stageToMainPR = await getStageToMainPR();
const signOffs = stageToMainPR?.labels.filter((l) => l.includes('SOT'));
console.log(`${signOffs.length} SOT labels on PR ${stageToMainPR.number}`);
- if (signOffs.length >= 4) {
+ if (signOffs.length >= MIN_SOT_APPROVALS) {
console.log('Stage to Main PR has all required labels. Merging...');
await github.rest.pulls.merge({
owner,
diff --git a/.github/workflows/merge-to-main.yaml b/.github/workflows/merge-to-main.yaml
index ada833d19fa..9800b0435a7 100644
--- a/.github/workflows/merge-to-main.yaml
+++ b/.github/workflows/merge-to-main.yaml
@@ -9,6 +9,7 @@ on:
env:
MILO_RELEASE_SLACK_WH: ${{ secrets.MILO_RELEASE_SLACK_WH }}
+ MIN_SOT_APPROVALS: ${{ secrets.MIN_SOT_APPROVALS }}
jobs:
merge-to-main:
diff --git a/.github/workflows/merge-to-stage.js b/.github/workflows/merge-to-stage.js
index 7c85415da1d..c48c4789334 100644
--- a/.github/workflows/merge-to-stage.js
+++ b/.github/workflows/merge-to-stage.js
@@ -231,7 +231,7 @@ const main = async (params) => {
github = params.github;
owner = params.context.repo.owner;
repo = params.context.repo.repo;
- if (isWithinRCP(process.env.STAGE_RCP_OFFSET_DAYS || 2)) return console.log('Stopped, within RCP period.');
+ if (isWithinRCP({ offset: process.env.STAGE_RCP_OFFSET_DAYS || 2, excludeShortRCP: true })) return console.log('Stopped, within RCP period.');
try {
const stageToMainPR = await getStageToMainPR();
diff --git a/.github/workflows/rcp-notifier.js b/.github/workflows/rcp-notifier.js
index ad5bdd2cde2..11793238a60 100644
--- a/.github/workflows/rcp-notifier.js
+++ b/.github/workflows/rcp-notifier.js
@@ -2,10 +2,13 @@ const {
slackNotification,
getLocalConfigs,
RCPDates,
+ isShortRCP,
} = require('./helpers.js');
-const isWithin24Hours = (targetDate) =>
- Math.abs(new Date() - targetDate) <= 24 * 60 * 60 * 1000;
+const isWithin24Hours = (targetDate) => {
+ const now = new Date();
+ return now < targetDate && new Date(now.getTime() + 24 * 60 * 60 * 1000) > targetDate;
+};
const calculateDateOffset = (date, offset) => {
const newDate = new Date(date);
@@ -19,17 +22,18 @@ const main = async () => {
for (const rcp of RCPDates) {
const start = new Date(rcp.start);
const end = new Date(rcp.end);
+ const isShort = isShortRCP(start, end);
const tenDaysBefore = calculateDateOffset(start, 10);
const fourDaysBefore = calculateDateOffset(start, 4);
const stageOffset = Number(process.env.STAGE_RCP_OFFSET_DAYS) || 2;
const slackText = (days) =>
`Reminder RCP starts in ${days} days: from ${start.toUTCString()} to ${end.toUTCString()}. Merges to stage will be disabled beginning ${calculateDateOffset(start, stageOffset).toUTCString()}.`;
- if (isWithin24Hours(tenDaysBefore)) {
+ if (isWithin24Hours(tenDaysBefore) && !isShort) {
console.log('Is within 24 hours of 10 days before RCP');
await slackNotification(slackText(10), process.env.MILO_DEV_HOOK);
}
- if (isWithin24Hours(fourDaysBefore)) {
+ if (isWithin24Hours(fourDaysBefore) && !isShort) {
console.log('Is within 24 hours of 4 days before RCP');
await slackNotification(slackText(4), process.env.MILO_DEV_HOOK);
}
From 7483f29e5a54a55219bc9c7efe519038c2788289 Mon Sep 17 00:00:00 2001
From: Nicolas Peltier <1032754+npeltier@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:09:50 +0100
Subject: [PATCH 05/86] MWPW-156157 use OST v1.19.1 (#3290)
will use www.adobe.com cached calls of WCS
---
libs/blocks/ost/ost.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/blocks/ost/ost.js b/libs/blocks/ost/ost.js
index 9e115ab2eec..c397a4172a7 100644
--- a/libs/blocks/ost/ost.js
+++ b/libs/blocks/ost/ost.js
@@ -8,7 +8,7 @@ const IMS_COMMERCE_CLIENT_ID = 'aos_milo_commerce';
const IMS_SCOPE = 'AdobeID,openid';
const IMS_ENV = 'prod';
const IMS_PROD_URL = 'https://auth.services.adobe.com/imslib/imslib.min.js';
-const OST_VERSION = '1.18.4';
+const OST_VERSION = '1.19.1';
const OST_BASE = `https://www.stage.adobe.com/special/tacocat/ost/lib/${OST_VERSION}`;
const OST_SCRIPT_URL = `${OST_BASE}/index.js`;
const OST_STYLE_URL = `${OST_BASE}/index.css`;
From 57d66cf3446564dc57be8c9b61b3f0de89f35ee5 Mon Sep 17 00:00:00 2001
From: Santoshkumar Nateekar
Date: Mon, 9 Dec 2024 04:11:41 -0800
Subject: [PATCH 06/86] [MWPW-163723] [NALA] Update Nala CircleCI Job to Manual
Trigger (#3317)
updating the job to manual trigger
Co-authored-by: Santoshkumar Sharanappa Nateekar
---
.github/workflows/run-nala-circleci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/run-nala-circleci.yml b/.github/workflows/run-nala-circleci.yml
index a2a7e963bff..d7b115959d0 100644
--- a/.github/workflows/run-nala-circleci.yml
+++ b/.github/workflows/run-nala-circleci.yml
@@ -1,9 +1,7 @@
name: Nala Tests on CircleCI
on:
- push:
- branches:
- - stage
+ workflow_dispatch:
jobs:
trigger-circleci:
@@ -15,4 +13,4 @@ jobs:
curl -X POST 'https://circle.ci.adobe.com/api/v2/project/gh/wcms/nala/pipeline' \
-H 'Circle-Token: ${{ secrets.CCI_TOKEN }}' \
-H 'content-type: application/json' \
- -d "{\"branch\":\"main\"}"
\ No newline at end of file
+ -d "{\"branch\":\"main\"}"
From 988468198cdcbad58064f8303abfb14d02f7ed6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sonja=20Popovi=C4=87?=
<32739655+SonjaPopovic@users.noreply.github.com>
Date: Mon, 9 Dec 2024 17:14:45 +0100
Subject: [PATCH 07/86] MWPW-154147: add spectrum switch component (#3264)
* MWPW-154147-spectrum switch
* MWPW-154147-spectrum switch
* MWPW-154147-spectrum switch test
* MWPW-154147-spectrum switch test
---------
Co-authored-by: Sonja Popovic
---
.../spectrum-web-components/dist/checkbox.js | 18 ++++-----
.../spectrum-web-components/dist/switch.js | 12 ++++++
.../spectrum-web-components/package.json | 1 +
.../spectrum-web-components/src/checkbox.js | 1 +
.../spectrum-web-components/src/switch.js | 3 ++
.../spectrum-web-components/switch.test.html | 39 +++++++++++++++++++
6 files changed, 65 insertions(+), 9 deletions(-)
create mode 100644 libs/features/spectrum-web-components/dist/switch.js
create mode 100644 libs/features/spectrum-web-components/src/switch.js
create mode 100644 test/features/spectrum-web-components/switch.test.html
diff --git a/libs/features/spectrum-web-components/dist/checkbox.js b/libs/features/spectrum-web-components/dist/checkbox.js
index aa3bf04a86d..7bc9bcc9579 100644
--- a/libs/features/spectrum-web-components/dist/checkbox.js
+++ b/libs/features/spectrum-web-components/dist/checkbox.js
@@ -1,18 +1,18 @@
/* eslint-disable */
/* Generated by Milo */
-import{html as r,SizedMixin as C,SpectrumElement as p}from"./base.js";import{property as l}from"./base.js";import{html as x}from"./base.js";import{property as b,query as f}from"./base.js";import{ifDefined as g}from"./base.js";var v=Object.defineProperty,k=Object.getOwnPropertyDescriptor,d=(a,o,i,c)=>{for(var e=c>1?void 0:c?k(o,i):o,h=a.length-1,s;h>=0;h--)(s=a[h])&&(e=(c?s(o,i,e):s(e))||e);return c&&e&&v(o,i,e),e};function u(a){class o extends a{constructor(){super(...arguments),this.checked=!1,this.readonly=!1}handleChange(){if(this.readonly){this.inputElement.checked=this.checked;return}this.checked=this.inputElement.checked;let c=new CustomEvent("change",{bubbles:!0,cancelable:!0,composed:!0});this.dispatchEvent(c)||(this.checked=!this.inputElement.checked,this.inputElement.checked=this.checked)}render(){return x`
+import{html as r,SizedMixin as E,SpectrumElement as p}from"./base.js";import{property as l}from"./base.js";import{html as f}from"./base.js";import{property as u,query as g}from"./base.js";import{ifDefined as z}from"./base.js";var k=Object.defineProperty,x=Object.getOwnPropertyDescriptor,d=(a,o,i,c)=>{for(var e=c>1?void 0:c?x(o,i):o,h=a.length-1,s;h>=0;h--)(s=a[h])&&(e=(c?s(o,i,e):s(e))||e);return c&&e&&k(o,i,e),e};function b(a){class o extends a{constructor(){super(...arguments),this.checked=!1,this.readonly=!1}handleChange(){if(this.readonly){this.inputElement.checked=this.checked;return}this.checked=this.inputElement.checked;let c=new CustomEvent("change",{bubbles:!0,cancelable:!0,composed:!0});this.dispatchEvent(c)||(this.checked=!this.inputElement.checked,this.inputElement.checked=this.checked)}render(){return f`
- `}}return d([b({type:Boolean,reflect:!0})],o.prototype,"checked",2),d([b({type:String,reflect:!0})],o.prototype,"name",2),d([b({type:Boolean,reflect:!0})],o.prototype,"readonly",2),d([f("#input")],o.prototype,"inputElement",2),o}import{css as z}from"./base.js";var y=z`
+ `}}return d([u({type:Boolean,reflect:!0})],o.prototype,"checked",2),d([u({type:String,reflect:!0})],o.prototype,"name",2),d([u({type:Boolean,reflect:!0})],o.prototype,"readonly",2),d([g("#input")],o.prototype,"inputElement",2),o}import{css as y}from"./base.js";var w=y`
:host{--spectrum-checkbox-content-color-default:var(--spectrum-neutral-content-color-default);--spectrum-checkbox-content-color-hover:var(--spectrum-neutral-content-color-hover);--spectrum-checkbox-content-color-down:var(--spectrum-neutral-content-color-down);--spectrum-checkbox-content-color-focus:var(--spectrum-neutral-content-color-key-focus);--spectrum-checkbox-focus-indicator-color:var(--spectrum-focus-indicator-color);--spectrum-checkbox-content-color-disabled:var(--spectrum-disabled-content-color);--spectrum-checkbox-control-color-disabled:var(--spectrum-disabled-content-color);--spectrum-checkbox-checkmark-color:var(--spectrum-gray-75);--spectrum-checkbox-invalid-color-default:var(--spectrum-negative-color-900);--spectrum-checkbox-invalid-color-hover:var(--spectrum-negative-color-1000);--spectrum-checkbox-invalid-color-down:var(--spectrum-negative-color-1100);--spectrum-checkbox-invalid-color-focus:var(--spectrum-negative-color-1000);--spectrum-checkbox-emphasized-color-default:var(--spectrum-accent-color-900);--spectrum-checkbox-emphasized-color-hover:var(--spectrum-accent-color-1000);--spectrum-checkbox-emphasized-color-down:var(--spectrum-accent-color-1100);--spectrum-checkbox-emphasized-color-focus:var(--spectrum-accent-color-1000);--spectrum-checkbox-control-selected-color-default:var(--spectrum-neutral-background-color-selected-default);--spectrum-checkbox-control-selected-color-hover:var(--spectrum-neutral-background-color-selected-hover);--spectrum-checkbox-control-selected-color-down:var(--spectrum-neutral-background-color-selected-down);--spectrum-checkbox-control-selected-color-focus:var(--spectrum-neutral-background-color-selected-key-focus);--spectrum-checkbox-font-size:var(--spectrum-font-size-100);--spectrum-checkbox-line-height:var(--spectrum-line-height-100);--spectrum-checkbox-line-height-cjk:var(--spectrum-cjk-line-height-100);--spectrum-checkbox-height:var(--spectrum-component-height-100);--spectrum-checkbox-control-size:var(--spectrum-checkbox-control-size-medium);--spectrum-checkbox-control-corner-radius:var(--spectrum-corner-radius-75);--spectrum-checkbox-focus-indicator-gap:var(--spectrum-focus-indicator-gap);--spectrum-checkbox-focus-indicator-thickness:var(--spectrum-focus-indicator-thickness);--spectrum-checkbox-border-width:var(--spectrum-border-width-200);--spectrum-checkbox-selected-border-width:calc(var(--spectrum-checkbox-control-size)/2);--spectrum-checkbox-top-to-text:var(--spectrum-component-top-to-text-100);--spectrum-checkbox-text-to-control:var(--spectrum-text-to-control-100);--spectrum-checkbox-animation-duration:var(--spectrum-animation-duration-100)}:host([size=s]){--spectrum-checkbox-font-size:var(--spectrum-font-size-75);--spectrum-checkbox-height:var(--spectrum-component-height-75);--spectrum-checkbox-control-size:var(--spectrum-checkbox-control-size-small);--spectrum-checkbox-top-to-text:var(--spectrum-component-top-to-text-75);--spectrum-checkbox-text-to-control:var(--spectrum-text-to-control-75)}:host{--spectrum-checkbox-font-size:var(--spectrum-font-size-100);--spectrum-checkbox-height:var(--spectrum-component-height-100);--spectrum-checkbox-control-size:var(--spectrum-checkbox-control-size-medium);--spectrum-checkbox-top-to-text:var(--spectrum-component-top-to-text-100);--spectrum-checkbox-text-to-control:var(--spectrum-text-to-control-100)}:host([size=l]){--spectrum-checkbox-font-size:var(--spectrum-font-size-200);--spectrum-checkbox-height:var(--spectrum-component-height-200);--spectrum-checkbox-control-size:var(--spectrum-checkbox-control-size-large);--spectrum-checkbox-top-to-text:var(--spectrum-component-top-to-text-200);--spectrum-checkbox-text-to-control:var(--spectrum-text-to-control-200)}:host([size=xl]){--spectrum-checkbox-font-size:var(--spectrum-font-size-300);--spectrum-checkbox-height:var(--spectrum-component-height-300);--spectrum-checkbox-control-size:var(--spectrum-checkbox-control-size-extra-large);--spectrum-checkbox-top-to-text:var(--spectrum-component-top-to-text-300);--spectrum-checkbox-text-to-control:var(--spectrum-text-to-control-300)}:host{color:var(--highcontrast-checkbox-content-color-default,var(--mod-checkbox-content-color-default,var(--spectrum-checkbox-content-color-default)));min-block-size:var(--mod-checkbox-height,var(--spectrum-checkbox-height));max-inline-size:100%;vertical-align:top;align-items:flex-start;display:inline-flex;position:relative}:host(:is(:active,[active])) #box:before{border-color:var(--highcontrast-checkbox-highlight-color-down,var(--mod-checkbox-control-color-down,var(--spectrum-checkbox-control-color-down)))}:host(:is(:active,[active])) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-down,var(--mod-checkbox-control-selected-color-down,var(--spectrum-checkbox-control-selected-color-down)))}:host(:is(:active,[active])) #label{color:var(--highcontrast-checkbox-content-color-down,var(--mod-checkbox-content-color-down,var(--spectrum-checkbox-content-color-down)))}:host([invalid][invalid]) #box:before,:host([invalid][invalid]) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-invalid-color-default,var(--spectrum-checkbox-invalid-color-default)))}:host([invalid][invalid]) #input:focus-visible+#box:before,:host([invalid][invalid][indeterminate]) #input:focus-visible+#box:before{border-color:var(--highcontrast-checkbox-color-hover,var(--mod-checkbox-invalid-color-hover,var(--spectrum-checkbox-invalid-color-hover)))}:host([readonly]){border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-control-selected-color-default,var(--spectrum-checkbox-control-selected-color-default)))}:host([readonly]:is(:active,[active])) #box:before{border-color:var(--highcontrast-checkbox-selected-color-default,var(--mod-checkbox-control-selected-color-default,var(--spectrum-checkbox-control-selected-color-default)))}:host([readonly]) #input:checked:disabled+#box:before,:host([readonly]) #input:disabled+#box:before{border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-control-selected-color-default,var(--spectrum-checkbox-control-selected-color-default)));background-color:var(--highcontrast-checkbox-background-color-default,var(--mod-checkbox-checkmark-color,var(--spectrum-checkbox-checkmark-color)))}:host([readonly]) #input:checked:disabled~#label,:host([readonly]) #input:disabled~#label{forced-color-adjust:none;color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-content-color-default,var(--spectrum-checkbox-content-color-default)))}:host([indeterminate]) #box:before,:host([indeterminate]) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-default,var(--mod-checkbox-control-selected-color-default,var(--spectrum-checkbox-control-selected-color-default)));border-width:var(--mod-checkbox-selected-border-width,var(--spectrum-checkbox-selected-border-width))}:host([indeterminate]) #box #checkmark,:host([indeterminate]) #input:checked+#box #checkmark{display:none}:host([indeterminate]) #box #partialCheckmark,:host([indeterminate]) #input:checked+#box #partialCheckmark{opacity:1;display:block;transform:scale(1)}:host([indeterminate]) #input:focus-visible+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-focus,var(--mod-checkbox-control-selected-color-focus,var(--spectrum-checkbox-control-selected-color-focus)))}:host([invalid][invalid][indeterminate]) #box:before,:host([invalid][invalid][indeterminate]) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-invalid-color-default,var(--spectrum-checkbox-invalid-color-default)));border-width:var(--mod-checkbox-selected-border-width,var(--spectrum-checkbox-selected-border-width))}:host([emphasized]) #input:checked+#box:before,:host([emphasized][indeterminate]) #box:before,:host([emphasized][indeterminate]) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-default,var(--mod-checkbox-emphasized-color-default,var(--spectrum-checkbox-emphasized-color-default)))}:host([emphasized]) #input:focus-visible:checked+#box:before,:host([emphasized][indeterminate]) #input:focus-visible+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-focus,var(--mod-checkbox-emphasized-color-focus,var(--spectrum-checkbox-emphasized-color-focus)))}:host([emphasized][invalid][invalid]) #input:focus-visible:checked+#box:before{border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-invalid-color-focus,var(--spectrum-checkbox-invalid-color-focus)))}@media (hover:hover){:host(:hover) #box:before{border-color:var(--highcontrast-checkbox-highlight-color-hover,var(--mod-checkbox-control-color-hover,var(--spectrum-checkbox-control-color-hover)))}:host(:hover) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-hover,var(--mod-checkbox-control-selected-color-hover,var(--spectrum-checkbox-control-selected-color-hover)))}:host(:hover) #label{color:var(--highcontrast-checkbox-content-color-hover,var(--mod-checkbox-content-color-hover,var(--spectrum-checkbox-content-color-hover)))}:host([invalid][invalid]:hover) #box:before,:host([invalid][invalid]:hover) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-color-hover,var(--mod-checkbox-invalid-color-hover,var(--spectrum-checkbox-invalid-color-hover)))}:host([readonly]:hover) #box:before{border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-control-selected-color-default,var(--spectrum-checkbox-control-selected-color-default)))}:host([indeterminate]:hover) #box:before,:host([indeterminate]:hover) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-hover,var(--mod-checkbox-control-selected-color-hover,var(--spectrum-checkbox-control-selected-color-hover)))}:host([invalid][invalid][indeterminate]:hover) #box:before,:host([invalid][invalid][indeterminate]:hover) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-invalid-color-hover,var(--spectrum-checkbox-invalid-color-hover)))}:host([invalid][invalid][indeterminate]:hover) #label{color:var(--highcontrast-checkbox-content-color-hover,var(--mod-checkbox-content-color-hover,var(--spectrum-checkbox-content-color-hover)))}:host([emphasized][indeterminate]:hover) #box:before,:host([emphasized][indeterminate]:hover) #input:checked+#box:before,:host([emphasized]:hover) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-color-hover,var(--mod-checkbox-emphasized-color-hover,var(--spectrum-checkbox-emphasized-color-hover)))}:host([emphasized][invalid][invalid][indeterminate]:hover) #box:before,:host([emphasized][invalid][invalid][indeterminate]:hover) #input:checked+#box:before,:host([emphasized][invalid][invalid]:hover) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-color-hover,var(--mod-checkbox-invalid-color-hover,var(--spectrum-checkbox-invalid-color-hover)))}:host([emphasized][indeterminate]:hover) #box:before,:host([emphasized][indeterminate]:hover) #input:checked+#box:before,:host([emphasized]:hover) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-hover,var(--mod-checkbox-emphasized-color-hover,var(--spectrum-checkbox-emphasized-color-hover)))}}:host([emphasized][indeterminate]:is(:active,[active])) #box:before,:host([emphasized][indeterminate]:is(:active,[active])) #input:checked+#box:before,:host([emphasized]:is(:active,[active])) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-default,var(--mod-checkbox-emphasized-color-down,var(--spectrum-checkbox-emphasized-color-down)))}:host([emphasized][invalid][invalid]:is(:active,[active])) #box:before,:host([emphasized][invalid][invalid]:is(:active,[active])) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-default,var(--mod-checkbox-control-invalid-color-down,var(--spectrum-checkbox-invalid-color-down)))}:host([emphasized]:focus-visible) #box:before,:host([emphasized]:focus-visible) #input:checked+#box:before{border-color:var(--highcontrast-checkbox-color-focus,var(--mod-checkbox-control-color-focus,var(--spectrum-checkbox-control-color-focus)))}#label{text-align:start;font-size:var(--mod-checkbox-font-size,var(--spectrum-checkbox-font-size));transition:color var(--mod-checkbox-animation-duration,var(--spectrum-checkbox-animation-duration))ease-in-out;line-height:var(--mod-checkbox-line-height,var(--spectrum-checkbox-line-height));margin-block-start:var(--mod-checkbox-top-to-text,var(--spectrum-checkbox-top-to-text));margin-inline-start:var(--mod-checkbox-text-to-control,var(--spectrum-checkbox-text-to-control))}#label:lang(ja),#label:lang(ko),#label:lang(zh){line-height:var(--mod-checkbox-line-height-cjk,var(--spectrum-checkbox-line-height-cjk))}#input{color:var(--mod-checkbox-control-color-default,var(--spectrum-checkbox-control-color-default));box-sizing:border-box;inline-size:100%;block-size:100%;opacity:.0001;z-index:1;cursor:pointer;margin:0;padding:0;font-family:inherit;font-size:100%;line-height:1.15;position:absolute;overflow:visible}#input:disabled{cursor:default}#input:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-default,var(--mod-checkbox-control-selected-color-default,var(--spectrum-checkbox-control-selected-color-default)));background-color:var(--mod-checkbox-checkmark-color,var(--spectrum-checkbox-checkmark-color));border-width:var(--mod-checkbox-selected-border-width,var(--spectrum-checkbox-selected-border-width))}#input:checked+#box #checkmark{opacity:1;transform:scale(1)}#input:focus-visible+#box:before{border-color:var(--highcontrast-checkbox-color-focus,var(--mod-checkbox-control-color-focus,var(--spectrum-checkbox-control-color-focus)))}#input:focus-visible+#box:after{forced-color-adjust:none;box-shadow:0 0 0 var(--mod-checkbox-focus-indicator-thinkness,var(--spectrum-checkbox-focus-indicator-thickness))var(--highcontrast-checkbox-focus-indicator-color,var(--mod-checkbox-focus-indicator-color,var(--spectrum-checkbox-focus-indicator-color)));margin:calc(var(--mod-checkbox-focus-indicator-gap,var(--spectrum-checkbox-focus-indicator-gap))*-1)}#input:focus-visible+#label{color:var(--highcontrast-checkbox-content-color-focus,var(--mod-checkbox-content-color-focus,var(--spectrum-checkbox-content-color-focus)))}#input:focus-visible:checked+#box:before{border-color:var(--highcontrast-checkbox-highlight-color-focus,var(--mod-checkbox-control-selected-color-focus,var(--spectrum-checkbox-control-selected-color-focus)))}#box{--spectrum-checkbox-spacing:calc(var(--mod-checkbox-height,var(--spectrum-checkbox-height)) - var(--mod-checkbox-control-size,var(--spectrum-checkbox-control-size)));margin:calc(var(--mod-checkbox-spacing,var(--spectrum-checkbox-spacing))/2)0;flex-grow:0;flex-shrink:0;justify-content:center;align-items:center;display:flex;position:relative}#box,#box:before{box-sizing:border-box;inline-size:var(--mod-checkbox-control-size,var(--spectrum-checkbox-control-size));block-size:var(--mod-checkbox-control-size,var(--spectrum-checkbox-control-size))}#box:before{forced-color-adjust:none;border-color:var(--highcontrast-checkbox-color-default,var(--mod-checkbox-control-color-default,var(--spectrum-checkbox-control-color-default)));z-index:0;content:"";border-radius:var(--mod-checkbox-control-corner-radius,var(--spectrum-checkbox-control-corner-radius));border-width:var(--mod-checkbox-border-width,var(--spectrum-checkbox-border-width));transition:border var(--mod-checkbox-animation-duration,var(--spectrum-checkbox-animation-duration))ease-in-out,box-shadow var(--mod-checkbox-animation-duration,var(--spectrum-checkbox-animation-duration))ease-in-out;border-style:solid;display:block;position:absolute}#box:after{border-radius:calc(var(--mod-checkbox-control-corner-radius,var(--spectrum-checkbox-control-corner-radius)) + var(--mod-checkbox-focus-indicator-gap,var(--spectrum-checkbox-focus-indicator-gap)));content:"";margin:var(--mod-checkbox-focus-indicator-gap,var(--spectrum-checkbox-focus-indicator-gap));transition:box-shadow var(--mod-checkbox-animation-duration,var(--spectrum-checkbox-animation-duration))ease-out,margin var(--mod-checkbox-animation-duration,var(--spectrum-checkbox-animation-duration))ease-out;display:block;position:absolute;inset-block:0;inset-inline:0;transform:translate(0)}#checkmark,#partialCheckmark{color:var(--highcontrast-checkbox-background-color-default,var(--mod-checkbox-checkmark-color,var(--spectrum-checkbox-checkmark-color)));opacity:0;transition:opacity var(--mod-checkbox-animation-duration,var(--spectrum-checkbox-animation-duration))ease-in-out,transform var(--mod-checkbox-animation-duration,var(--spectrum-checkbox-animation-duration))ease-in-out;transform:scale(0)}#partialCheckmark{display:none}#input:checked:disabled+#box:before,#input:disabled+#box:before{border-color:var(--highcontrast-checkbox-disabled-color-default,var(--mod-checkbox-control-color-disabled,var(--spectrum-checkbox-control-color-disabled)));background-color:var(--highcontrast-checkbox-background-color-default,var(--mod-checkbox-checkmark-color,var(--spectrum-checkbox-checkmark-color)))}#input:checked:disabled~#label,#input:disabled~#label{forced-color-adjust:none;color:var(--highcontrast-checkbox-disabled-color-default,var(--mod-checkbox-content-color-disabled,var(--spectrum-checkbox-content-color-disabled)))}@media (forced-colors:active){#input:focus-visible+#box{forced-color-adjust:none;outline-color:var(--highcontrast-checkbox-focus-indicator-color,var(--mod-checkbox-focus-indicator-color,var(--spectrum-checkbox-focus-indicator-color)));outline-offset:var(--highcontrast-checkbox-focus-indicator-gap,var(--mod-checkbox-focus-indicator-gap,var(--spectrum-checkbox-focus-indicator-gap)));outline-style:auto;outline-width:var(--mod-focus-indicator-thickness,var(--spectrum-focus-indicator-thickness))}#input:focus-visible+#box:after{box-shadow:0 0 0 0 var(--highcontrast-checkbox-focus-indicator-color,var(--mod-checkbox-focus-indicator-color,var(--spectrum-checkbox-focus-indicator-color)))}:host{--highcontrast-checkbox-content-color-default:CanvasText;--highcontrast-checkbox-content-color-hover:CanvasText;--highcontrast-checkbox-content-color-down:CanvasText;--highcontrast-checkbox-content-color-focus:CanvasText;--highcontrast-checkbox-background-color-default:Canvas;--highcontrast-checkbox-color-default:ButtonText;--highcontrast-checkbox-color-hover:ButtonText;--highcontrast-checkbox-color-focus:Highlight;--highcontrast-checkbox-highlight-color-default:Highlight;--highcontrast-checkbox-highlight-color-hover:Highlight;--highcontrast-checkbox-highlight-color-down:Highlight;--highcontrast-checkbox-highlight-color-focus:Highlight;--highcontrast-checkbox-disabled-color-default:GrayText;--highcontrast-checkbox-focus-indicator-color:CanvasText}}:host{--spectrum-checkbox-control-color-default:var(--system-spectrum-checkbox-control-color-default);--spectrum-checkbox-control-color-hover:var(--system-spectrum-checkbox-control-color-hover);--spectrum-checkbox-control-color-down:var(--system-spectrum-checkbox-control-color-down);--spectrum-checkbox-control-color-focus:var(--system-spectrum-checkbox-control-color-focus)}:host{vertical-align:top;display:inline-flex}:host(:focus){outline:none}:host([disabled]){pointer-events:none}:host(:empty) label{display:none}
-`,m=y;import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import E from"./icons/checkmark.js";import j from"./icons/dash.js";var w=Object.defineProperty,I=Object.getOwnPropertyDescriptor,n=(a,o,i,c)=>{for(var e=c>1?void 0:c?I(o,i):o,h=a.length-1,s;h>=0;h--)(s=a[h])&&(e=(c?s(o,i,e):s(e))||e);return c&&e&&w(o,i,e),e},B={s:()=>r`
+`,m=w;import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import"./icons-ui.js";import j from"./icons/checkmark.js";import D from"./icons/dash.js";var I=Object.defineProperty,C=Object.getOwnPropertyDescriptor,n=(a,o,i,c)=>{for(var e=c>1?void 0:c?C(o,i):o,h=a.length-1,s;h>=0;h--)(s=a[h])&&(e=(c?s(o,i,e):s(e))||e);return c&&e&&I(o,i,e),e},O={s:()=>r`
- `},D={s:()=>r`
+ `},T={s:()=>r`
- `},t=class extends C(u(p),{noDefaultSize:!0}){constructor(){super(...arguments),this.disabled=!1,this.indeterminate=!1,this.invalid=!1,this.emphasized=!1,this.tabIndex=0}connectedCallback(){super.connectedCallback(),this.hasAttribute("autofocus")&&this.updateComplete.then(()=>{this.focus()})}static get styles(){return[m,E,j]}click(){var o;this.disabled||(o=this.inputElement)==null||o.click()}handleChange(){this.indeterminate=!1,super.handleChange()}render(){return r`
+ `},t=class extends E(b(p),{noDefaultSize:!0}){constructor(){super(...arguments),this.disabled=!1,this.indeterminate=!1,this.invalid=!1,this.emphasized=!1,this.tabIndex=0}connectedCallback(){super.connectedCallback(),this.hasAttribute("autofocus")&&this.updateComplete.then(()=>{this.focus()})}static get styles(){return[m,j,D]}click(){var o;this.disabled||(o=this.inputElement)==null||o.click()}handleChange(){this.indeterminate=!1,super.handleChange()}render(){return r`
${super.render()}
- ${this.checked?B[this.size]():r``}
- ${this.indeterminate?D[this.size]():r``}
+ ${this.checked?O[this.size]():r``}
+ ${this.indeterminate?T[this.size]():r``}
- `}updated(o){super.updated(o),o.has("disabled")&&(typeof o.get("disabled")<"u"||this.disabled)&&(this.disabled?(this.inputElement.tabIndex=this.tabIndex,this.tabIndex=-1):(this.tabIndex=this.inputElement.tabIndex,this.inputElement.removeAttribute("tabindex")),this.inputElement.disabled=this.disabled),o.has("indeterminate")&&(this.inputElement.indeterminate=this.indeterminate),o.has("invalid")&&(this.invalid?this.inputElement.setAttribute("aria-invalid","true"):this.inputElement.removeAttribute("aria-invalid"))}};t.shadowRootOptions={...p.shadowRootOptions,delegatesFocus:!0},n([l({type:Boolean,reflect:!0})],t.prototype,"disabled",2),n([l({type:Boolean,reflect:!0})],t.prototype,"indeterminate",2),n([l({type:Boolean,reflect:!0})],t.prototype,"invalid",2),n([l({type:Boolean,reflect:!0})],t.prototype,"emphasized",2),n([l({reflect:!0,type:Number,attribute:"tabindex"})],t.prototype,"tabIndex",2);import{defineElement as O}from"./base.js";O("sp-checkbox",t);
+ `}updated(o){super.updated(o),o.has("disabled")&&(typeof o.get("disabled")<"u"||this.disabled)&&(this.disabled?(this.inputElement.tabIndex=this.tabIndex,this.tabIndex=-1):(this.tabIndex=this.inputElement.tabIndex,this.inputElement.removeAttribute("tabindex")),this.inputElement.disabled=this.disabled),o.has("indeterminate")&&(this.inputElement.indeterminate=this.indeterminate),o.has("invalid")&&(this.invalid?this.inputElement.setAttribute("aria-invalid","true"):this.inputElement.removeAttribute("aria-invalid"))}};t.shadowRootOptions={...p.shadowRootOptions,delegatesFocus:!0},n([l({type:Boolean,reflect:!0})],t.prototype,"disabled",2),n([l({type:Boolean,reflect:!0})],t.prototype,"indeterminate",2),n([l({type:Boolean,reflect:!0})],t.prototype,"invalid",2),n([l({type:Boolean,reflect:!0})],t.prototype,"emphasized",2),n([l({reflect:!0,type:Number,attribute:"tabindex"})],t.prototype,"tabIndex",2);import{defineElement as U}from"./base.js";U("sp-checkbox",t);import{Focusable as B}from"./shared.js";var v=class extends b(B){get focusElement(){return this.inputElement}};export{v as CheckboxBase};
diff --git a/libs/features/spectrum-web-components/dist/switch.js b/libs/features/spectrum-web-components/dist/switch.js
new file mode 100644
index 00000000000..a9191914b76
--- /dev/null
+++ b/libs/features/spectrum-web-components/dist/switch.js
@@ -0,0 +1,12 @@
+/* eslint-disable */
+/* Generated by Milo */
+
+import{html as v,SizedMixin as g}from"./base.js";import{property as f}from"./base.js";import{CheckboxBase as k}from"./checkbox.js";import{css as d}from"./base.js";var n=d`
+ :host{--spectrum-switch-label-color-default:var(--spectrum-neutral-content-color-default);--spectrum-switch-label-color-hover:var(--spectrum-neutral-content-color-hover);--spectrum-switch-label-color-down:var(--spectrum-neutral-content-color-down);--spectrum-switch-label-color-focus:var(--spectrum-neutral-content-color-key-focus);--spectrum-switch-label-color-disabled:var(--spectrum-disabled-content-color);--spectrum-switch-background-color:var(--spectrum-gray-300);--spectrum-switch-background-color-disabled:var(--spectrum-gray-300);--spectrum-switch-background-color-selected-disabled:var(--spectrum-disabled-content-color);--spectrum-switch-background-color-selected-default:var(--spectrum-neutral-background-color-selected-default);--spectrum-switch-background-color-selected-hover:var(--spectrum-neutral-background-color-selected-hover);--spectrum-switch-background-color-selected-down:var(--spectrum-neutral-background-color-selected-down);--spectrum-switch-background-color-selected-focus:var(--spectrum-neutral-background-color-selected-key-focus);--spectrum-switch-focus-indicator-thickness:var(--mod-focus-indicator-thickness,var(--spectrum-focus-indicator-thickness));--spectrum-switch-focus-indicator-color:var(--spectrum-focus-indicator-color);--spectrum-switch-handle-background-color:var(--spectrum-gray-75);--spectrum-switch-handle-border-color-disabled:var(--spectrum-disabled-content-color)}:host([disabled]){--spectrum-switch-label-color-default:var(--spectrum-disabled-content-color)}:host([emphasized]){--spectrum-switch-background-color-selected-default:var(--spectrum-accent-color-900);--spectrum-switch-background-color-selected-hover:var(--spectrum-accent-color-1000);--spectrum-switch-background-color-selected-down:var(--spectrum-accent-color-1100);--spectrum-switch-background-color-selected-focus:var(--spectrum-accent-color-1000);--spectrum-switch-handle-border-color-selected-default:var(--spectrum-accent-color-900);--spectrum-switch-handle-border-color-selected-hover:var(--spectrum-accent-color-1000);--spectrum-switch-handle-border-color-selected-down:var(--spectrum-accent-color-1100);--spectrum-switch-handle-border-color-selected-focus:var(--spectrum-accent-color-1000)}:host([size=s]){--spectrum-switch-min-height:var(--spectrum-component-height-75);--spectrum-switch-control-width:var(--spectrum-switch-control-width-small);--spectrum-switch-control-height:var(--spectrum-switch-control-height-small);--spectrum-switch-control-label-spacing:var(--spectrum-text-to-control-75);--spectrum-switch-spacing-top-to-control:var(--spectrum-switch-top-to-control-small);--spectrum-switch-spacing-top-to-label:var(--spectrum-component-top-to-text-75);--spectrum-switch-font-size:var(--spectrum-font-size-75)}:host{--spectrum-switch-min-height:var(--spectrum-component-height-100);--spectrum-switch-control-width:var(--spectrum-switch-control-width-medium);--spectrum-switch-control-height:var(--spectrum-switch-control-height-medium);--spectrum-switch-control-label-spacing:var(--spectrum-text-to-control-100);--spectrum-switch-spacing-top-to-control:var(--spectrum-switch-top-to-control-medium);--spectrum-switch-spacing-top-to-label:var(--spectrum-component-top-to-text-100);--spectrum-switch-font-size:var(--spectrum-font-size-100)}:host([size=l]){--spectrum-switch-min-height:var(--spectrum-component-height-200);--spectrum-switch-control-width:var(--spectrum-switch-control-width-large);--spectrum-switch-control-height:var(--spectrum-switch-control-height-large);--spectrum-switch-control-label-spacing:var(--spectrum-text-to-control-200);--spectrum-switch-spacing-top-to-control:var(--spectrum-switch-top-to-control-large);--spectrum-switch-spacing-top-to-label:var(--spectrum-component-top-to-text-200);--spectrum-switch-font-size:var(--spectrum-font-size-200)}:host([size=xl]){--spectrum-switch-min-height:var(--spectrum-component-height-300);--spectrum-switch-control-width:var(--spectrum-switch-control-width-extra-large);--spectrum-switch-control-height:var(--spectrum-switch-control-height-extra-large);--spectrum-switch-control-label-spacing:var(--spectrum-text-to-control-300);--spectrum-switch-spacing-top-to-control:var(--spectrum-switch-top-to-control-extra-large);--spectrum-switch-spacing-top-to-label:var(--spectrum-component-top-to-text-300);--spectrum-switch-font-size:var(--spectrum-font-size-300)}:host{min-block-size:var(--mod-switch-height,var(--spectrum-switch-min-height));max-inline-size:100%;vertical-align:top;align-items:flex-start;display:inline-flex;position:relative}#input{box-sizing:border-box;inline-size:100%;block-size:100%;opacity:0;z-index:1;cursor:pointer;margin:0;padding:0;position:absolute;inset-block-start:0;inset-inline-start:0}:host([checked]) #input+#switch:before{transform:translateX(calc(var(--mod-switch-control-width,var(--spectrum-switch-control-width)) - 100%))}:host([checked]) #input+#switch:dir(rtl):before,:host([dir=rtl][checked]) #input+#switch:before{transform:translateX(calc(( var(--mod-switch-control-width,var(--spectrum-switch-control-width)) - 100% )*-1))}:host([disabled]) #input,:host([disabled]) #input{cursor:default}#input:focus-visible+#switch:after{margin:calc(var(--mod-focus-indicator-gap,var(--spectrum-focus-indicator-gap))*-1)}#label{color:var(--highcontrast-switch-label-color-default,var(--mod-switch-label-color-default,var(--spectrum-switch-label-color-default)));margin-inline:var(--mod-switch-control-label-spacing,var(--spectrum-switch-control-label-spacing));font-size:var(--mod-switch-font-size,var(--spectrum-switch-font-size));line-height:var(--mod-line-height-100,var(--spectrum-line-height-100));transition:color var(--mod-animation-duration-200,var(--spectrum-animation-duration-200))ease-in-out;margin-block-start:var(--mod-switch-spacing-top-to-label,var(--spectrum-switch-spacing-top-to-label));margin-block-end:0}#switch{box-sizing:border-box;inline-size:var(--mod-switch-control-width,var(--spectrum-switch-control-width));margin-block:calc(var(--mod-switch-height,var(--spectrum-switch-min-height)) - var(--mod-switch-control-height,var(--spectrum-switch-control-height)) - var(--mod-switch-spacing-top-to-control,var(--spectrum-switch-spacing-top-to-control)));vertical-align:middle;transition:background var(--mod-animation-duration-100,var(--spectrum-animation-duration-100))ease-in-out,border var(--mod-animation-duration-100,var(--spectrum-animation-duration-100))ease-in-out;block-size:var(--mod-switch-control-height,var(--spectrum-switch-control-height));border-radius:calc(var(--mod-switch-control-height,var(--spectrum-switch-control-height))/2);flex-grow:0;flex-shrink:0;margin-inline:0;display:inline-block;position:relative;inset-inline:0}#switch:before{box-sizing:border-box;transition:background var(--mod-animation-duration-100,var(--spectrum-animation-duration-100))ease-in-out,border var(--mod-animation-duration-100,var(--spectrum-animation-duration-100))ease-in-out,transform var(--mod-animation-duration-100,var(--spectrum-animation-duration-100))ease-in-out,box-shadow var(--mod-animation-duration-100,var(--spectrum-animation-duration-100))ease-in-out;inline-size:var(--mod-switch-control-height,var(--spectrum-switch-control-height));block-size:var(--mod-switch-control-height,var(--spectrum-switch-control-height));border-width:var(--mod-border-width-200,var(--spectrum-border-width-200));border-radius:calc(var(--mod-switch-control-height,var(--spectrum-switch-control-height))/2);border-style:solid}#switch:after,#switch:before{content:"";display:block;position:absolute;inset-block-start:0;inset-inline-start:0}#switch:after{border-radius:calc(var(--mod-switch-control-height,var(--spectrum-switch-control-height))/2 + var(--mod-focus-indicator-gap,var(--spectrum-focus-indicator-gap))*2);transition:opacity var(--mod-animation-duration-100,var(--spectrum-animation-duration-100))ease-out,margin var(--spectrum-animation-duration-100,var(--spectrum-animation-duration-100))ease-out;margin:0;inset-block-end:0;inset-inline-end:0}#switch{background-color:var(--highcontrast-switch-background-color,var(--mod-switch-background-color,var(--spectrum-switch-background-color)))}#switch:before{background-color:var(--highcontrast-switch-handle-background-color,var(--mod-switch-handle-background-color,var(--spectrum-switch-handle-background-color)));border-color:var(--highcontrast-switch-handle-border-color-default,var(--mod-switch-handle-border-color-default,var(--spectrum-switch-handle-border-color-default)))}:host(:active) #input+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-down,var(--mod-switch-handle-border-color-down,var(--spectrum-switch-handle-border-color-down)))}:host(:active) #input~#label{color:var(--highcontrast-switch-label-color-down,var(--mod-switch-label-color-down,var(--spectrum-switch-label-color-down)))}:host(:active[checked]) #input:enabled+#switch{background-color:var(--highcontrast-switch-background-color-selected-down,var(--mod-switch-background-color-selected-down,var(--spectrum-switch-background-color-selected-down)))}:host(:active[checked]) #input:enabled+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-selected-down,var(--mod-switch-handle-border-color-selected-down,var(--spectrum-switch-handle-border-color-selected-down)))}#input:focus-visible+#switch:after{box-shadow:0 0 0 var(--mod-switch-focus-indicator-thickness,var(--spectrum-switch-focus-indicator-thickness))var(--highcontrast-switch-focus-indicator-color,var(--mod-switch-focus-indicator-color,var(--spectrum-switch-focus-indicator-color)))}#input:focus-visible+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-focus,var(--mod-switch-handle-border-color-focus,var(--spectrum-switch-handle-border-color-focus)))}:host([checked]) #input:focus-visible+#switch{background-color:var(--highcontrast-switch-background-color-selected-focus,var(--mod-switch-background-color-selected-focus,var(--spectrum-switch-background-color-selected-focus)))}:host([checked]) #input:focus-visible+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-selected-focus,var(--mod-switch-handle-border-color-selected-focus,var(--spectrum-switch-handle-border-color-selected-focus)))}#input:focus-visible~#label{color:var(--highcontrast-switch-label-color-focus,var(--mod-switch-label-color-focus,var(--spectrum-switch-label-color-focus)))}@media (hover:hover){:host(:hover) #input+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-hover,var(--mod-switch-handle-border-color-hover,var(--spectrum-switch-handle-border-color-hover)));box-shadow:none}:host(:hover) #input~#label{color:var(--highcontrast-switch-label-color-hover,var(--mod-switch-label-color-hover,var(--spectrum-switch-label-color-hover)))}:host([checked]:hover) #input:enabled+#switch{background-color:var(--highcontrast-switch-background-color-selected-hover,var(--mod-switch-background-color-selected-hover,var(--spectrum-switch-background-color-selected-hover)))}:host([checked]:hover) #input:enabled+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-selected-hover,var(--mod-switch-handle-border-color-selected-hover,var(--spectrum-switch-handle-border-color-selected-hover)))}:host([disabled]:hover) #input+#switch,:host([disabled]:hover) #input+#switch{background-color:var(--highcontrast-switch-background-color-disabled,var(--mod-switch-background-color-disabled,var(--spectrum-switch-background-color-disabled)))}:host([disabled]:hover) #input+#switch:before,:host([disabled]:hover) #input+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-disabled,var(--mod-switch-handle-border-color-disabled,var(--spectrum-switch-handle-border-color-disabled)))}:host([disabled]:hover) #input~#label,:host([disabled]:hover) #input~#label{color:var(--highcontrast-switch-label-color-disabled,var(--mod-switch-label-color-disabled,var(--spectrum-switch-label-color-disabled)))}:host([disabled][checked]:hover) #input+#switch,:host([disabled][checked]:hover) #input+#switch{background-color:var(--highcontrast-switch-background-color-selected-disabled,var(--mod-switch-background-color-selected-disabled,var(--spectrum-switch-background-color-selected-disabled)))}:host([disabled][checked]:hover) #input+#switch:before,:host([disabled][checked]:hover) #input+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-disabled,var(--mod-switch-handle-border-color-disabled,var(--spectrum-switch-handle-border-color-disabled)))}:host([disabled][checked]:hover) #input~#label,:host([disabled][checked]:hover) #input~#label{color:var(--highcontrast-switch-label-color-disabled,var(--mod-switch-label-color-disabled,var(--spectrum-switch-label-color-disabled)))}:host(:hover) #input:focus-visible+#switch:after{box-shadow:0 0 0 var(--mod-switch-focus-indicator-thickness,var(--spectrum-switch-focus-indicator-thickness))var(--highcontrast-switch-focus-indicator-color,var(--mod-switch-focus-indicator-color,var(--spectrum-switch-focus-indicator-color)))}:host(:hover) #input:focus-visible+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-focus,var(--mod-switch-handle-border-color-focus,var(--spectrum-switch-handle-border-color-focus)))}:host([checked]:hover) #input:focus-visible+#switch{background-color:var(--highcontrast-switch-background-color-selected-focus,var(--mod-switch-background-color-selected-focus,var(--spectrum-switch-background-color-selected-focus)))}:host([checked]:hover) #input:focus-visible+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-selected-focus,var(--mod-switch-handle-border-color-selected-focus,var(--spectrum-switch-handle-border-color-selected-focus)))}:host(:hover) #input:focus-visible~#label{color:var(--highcontrast-switch-label-color-focus,var(--mod-switch-label-color-focus,var(--spectrum-switch-label-color-focus)))}}:host([checked]) #input+#switch{background-color:var(--highcontrast-switch-background-color-selected-default,var(--mod-switch-background-color-selected-default,var(--spectrum-switch-background-color-selected-default)))}:host([checked]) #input+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-selected-default,var(--mod-switch-handle-border-color-selected-default,var(--spectrum-switch-handle-border-color-selected-default)))}:host([disabled]) #input+#switch,:host([disabled]) #input+#switch{background-color:var(--highcontrast-switch-background-color-disabled,var(--mod-switch-background-color-disabled,var(--spectrum-switch-background-color-disabled)))}:host([disabled]) #input+#switch:before,:host([disabled]) #input+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-disabled,var(--mod-switch-handle-border-color-disabled,var(--spectrum-switch-handle-border-color-disabled)))}:host([disabled][checked]) #input+#switch,:host([disabled][checked]) #input+#switch{background-color:var(--highcontrast-switch-background-color-selected-disabled,var(--mod-switch-background-color-selected-disabled,var(--spectrum-switch-background-color-selected-disabled)))}:host([disabled][checked]) #input+#switch:before,:host([disabled][checked]) #input+#switch:before{border-color:var(--highcontrast-switch-handle-border-color-disabled,var(--mod-switch-handle-border-color-disabled,var(--spectrum-switch-handle-border-color-disabled)))}:host([disabled]) #input~#label,:host([disabled]) #input~#label{color:var(--highcontrast-switch-label-color-disabled,var(--mod-switch-label-color-disabled,var(--spectrum-switch-label-color-disabled)))}@media (forced-colors:active){:host{forced-color-adjust:none;--highcontrast-switch-label-color-default:ButtonText;--highcontrast-switch-label-color-hover:ButtonText;--highcontrast-switch-label-color-down:ButtonText;--highcontrast-switch-label-color-focus:ButtonText;--highcontrast-switch-label-color-disabled:GrayText;--highcontrast-switch-handle-background-color:ButtonFace;--highcontrast-switch-handle-border-color-default:ButtonText;--highcontrast-switch-handle-border-color-hover:Highlight;--highcontrast-switch-handle-border-color-down:Highlight;--highcontrast-switch-handle-border-color-focus:Highlight;--highcontrast-switch-handle-border-color-disabled:Highlight;--highcontrast-switch-handle-border-color-selected-default:Highlight;--highcontrast-switch-handle-border-color-selected-hover:Highlight;--highcontrast-switch-handle-border-color-selected-down:Highlight;--highcontrast-switch-handle-border-color-selected-focus:Highlight;--highcontrast-switch-background-color:ButtonFace;--highcontrast-switch-background-color-selected-default:Highlight;--highcontrast-switch-background-color-selected-hover:Highlight;--highcontrast-switch-background-color-selected-down:Highlight;--highcontrast-switch-background-color-selected-focus:Highlight;--highcontrast-switch-background-color-selected-disabled:Highlight;--highcontrast-switch-focus-indicator-color:ButtonText}#input:not(:checked)+#switch{box-shadow:inset 0 0 0 1px ButtonText}@media (hover:hover){:host(:hover) #input:not(:checked)+#switch{box-shadow:inset 0 0 0 1px Highlight}:host([disabled][checked]:hover) #input+#switch,:host([disabled][checked]:hover) #input+#switch{box-shadow:inset 0 0 0 1px GrayText;background-color:GrayText}:host([disabled][checked]:hover) #input+#switch:before,:host([disabled][checked]:hover) #input+#switch:before{border-color:GrayText;background-color:ButtonFace}}:host([disabled]) #input:not(:checked)+#switch,:host([disabled]) #input:not(:checked)+#switch{box-shadow:inset 0 0 0 1px GrayText;background-color:ButtonFace}:host([disabled]) #input:not(:checked)+#switch:before,:host([disabled]) #input:not(:checked)+#switch:before{border-color:GrayText;background-color:ButtonFace}:host([disabled][checked]) #input+#switch,:host([disabled][checked]) #input+#switch{box-shadow:inset 0 0 0 1px GrayText;background-color:GrayText}:host([disabled][checked]) #input+#switch:before,:host([disabled][checked]) #input+#switch:before{border-color:GrayText;background-color:ButtonFace}:host([disabled]) #input~#label,:host([disabled]) #input~#label{color:GrayText}}:host{--spectrum-switch-handle-border-color-default:var(--system-spectrum-switch-handle-border-color-default);--spectrum-switch-handle-border-color-hover:var(--system-spectrum-switch-handle-border-color-hover);--spectrum-switch-handle-border-color-down:var(--system-spectrum-switch-handle-border-color-down);--spectrum-switch-handle-border-color-focus:var(--system-spectrum-switch-handle-border-color-focus);--spectrum-switch-handle-border-color-selected-default:var(--system-spectrum-switch-handle-border-color-selected-default);--spectrum-switch-handle-border-color-selected-hover:var(--system-spectrum-switch-handle-border-color-selected-hover);--spectrum-switch-handle-border-color-selected-down:var(--system-spectrum-switch-handle-border-color-selected-down);--spectrum-switch-handle-border-color-selected-focus:var(--system-spectrum-switch-handle-border-color-selected-focus)}:host([disabled]){pointer-events:none}
+`,h=n;import{css as u}from"./base.js";var b=u`
+ #switch:before{transition:background var(--spectrum-global-animation-duration-100,.13s)ease-in-out,border var(--spectrum-global-animation-duration-100,.13s)ease-in-out,box-shadow var(--spectrum-global-animation-duration-100,.13s)ease-in-out}
+`,l=b;var p=Object.defineProperty,w=Object.getOwnPropertyDescriptor,m=(c,o,s,e)=>{for(var t=e>1?void 0:e?w(o,s):o,i=c.length-1,a;i>=0;i--)(a=c[i])&&(t=(e?a(o,s,t):a(t))||t);return e&&t&&p(o,s,t),t},r=class extends g(k){constructor(){super(...arguments),this.emphasized=!1}static get styles(){return window.hasOwnProperty("ShadyDOM")?[h,l]:[h]}render(){return v`
+ ${super.render()}
+
+
+ `}firstUpdated(o){super.firstUpdated(o),this.inputElement.setAttribute("role","switch")}updated(o){o.has("checked")&&this.inputElement.setAttribute("aria-checked",this.checked?"true":"false")}};m([f({type:Boolean,reflect:!0})],r.prototype,"emphasized",2);import{defineElement as x}from"./base.js";x("sp-switch",r);
diff --git a/libs/features/spectrum-web-components/package.json b/libs/features/spectrum-web-components/package.json
index d8e48d0b676..e3fc8dcf9a7 100644
--- a/libs/features/spectrum-web-components/package.json
+++ b/libs/features/spectrum-web-components/package.json
@@ -38,6 +38,7 @@
"@spectrum-web-components/search": "^0.47.2",
"@spectrum-web-components/shared": "^0.47.2",
"@spectrum-web-components/sidenav": "^0.47.2",
+ "@spectrum-web-components/switch": "^0.47.2",
"@spectrum-web-components/tabs": "^0.47.2",
"@spectrum-web-components/textfield": "^0.47.2",
"@spectrum-web-components/theme": "^0.47.2",
diff --git a/libs/features/spectrum-web-components/src/checkbox.js b/libs/features/spectrum-web-components/src/checkbox.js
index e9b091ad043..1fd0f865131 100644
--- a/libs/features/spectrum-web-components/src/checkbox.js
+++ b/libs/features/spectrum-web-components/src/checkbox.js
@@ -1 +1,2 @@
import '@spectrum-web-components/checkbox/sp-checkbox.js';
+export * from '@spectrum-web-components/checkbox/src/CheckboxBase.js';
diff --git a/libs/features/spectrum-web-components/src/switch.js b/libs/features/spectrum-web-components/src/switch.js
new file mode 100644
index 00000000000..80a6e2f13a4
--- /dev/null
+++ b/libs/features/spectrum-web-components/src/switch.js
@@ -0,0 +1,3 @@
+/* eslint-disable no-unused-vars */
+/* eslint-disable import/no-unresolved */
+import '@spectrum-web-components/switch/sp-switch.js';
diff --git a/test/features/spectrum-web-components/switch.test.html b/test/features/spectrum-web-components/switch.test.html
new file mode 100644
index 00000000000..bd077b123a4
--- /dev/null
+++ b/test/features/spectrum-web-components/switch.test.html
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 39eafc824fd4d1500bedaa8a65debec23b14f8e5 Mon Sep 17 00:00:00 2001
From: Santoshkumar Nateekar
Date: Mon, 9 Dec 2024 09:48:07 -0800
Subject: [PATCH 08/86] [NALA][Table-Tooltip] Update tooltip locator (#3335)
update tooltip locator
Co-authored-by: Santoshkumar Sharanappa Nateekar
---
nala/blocks/table/table.page.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nala/blocks/table/table.page.js b/nala/blocks/table/table.page.js
index eaa03d9f286..93e38544089 100644
--- a/nala/blocks/table/table.page.js
+++ b/nala/blocks/table/table.page.js
@@ -63,7 +63,7 @@ export default class Table {
// verify tooltip information
if (tooltip) {
const headerColumnTooltip = await headerColumn.locator('.milo-tooltip');
- await expect(await headerColumnTooltip.locator('.icon-milo-info')).toBeVisible();
+ await expect(await headerColumnTooltip.locator('.icon-milo')).toBeVisible();
await expect(await headerColumnTooltip).toHaveAttribute('data-tooltip', tooltip.tooltipText);
await headerColumnTooltip.hover();
}
@@ -94,7 +94,7 @@ export default class Table {
}
if (column.tooltip) {
const tooltip = await sectionRowColumn.locator('.milo-tooltip');
- await expect(await tooltip.locator('.icon-milo-info')).toBeVisible();
+ await expect(await tooltip.locator('.icon-milo')).toBeVisible();
await expect(await tooltip).toHaveAttribute('data-tooltip', column.tooltipText);
await tooltip.hover();
}
From cdd773ac5e6214886eddb054dc96d805f52645d7 Mon Sep 17 00:00:00 2001
From: Swati Mukherjee
Date: Tue, 10 Dec 2024 14:48:16 +0530
Subject: [PATCH 09/86] [ENB-7566] Change domain names for stage, remove
personalization logic for not signed in (#3324)
* remobe personalization for signed out, change domain names for stage and prod
* dummy-pr
* remove hlx and aem check for getting url
* A&T property check on default production
* Fix decode URI at the base
* Fix amcv cookie name post decode
* Add Amcv encoding during setting cookie
---
libs/martech/helpers.js | 64 ++++++++++++++++++++++++++---------------
libs/utils/utils.js | 2 +-
2 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/libs/martech/helpers.js b/libs/martech/helpers.js
index 8ac87e40c67..366375c234d 100644
--- a/libs/martech/helpers.js
+++ b/libs/martech/helpers.js
@@ -1,3 +1,5 @@
+const AMCV_COOKIE = 'AMCV_9E1005A551ED61CA0A490D45@AdobeOrg';
+
/**
* Generates a random UUIDv4 using cryptographically secure random values.
* This implementation follows the RFC 4122 specification for UUIDv4.
@@ -68,7 +70,7 @@ function getTargetPropertyBasedOnPageRegion(env) {
return 'ba5bc9e8-8fb4-037a-12c8-682384720007';
}
- return 'bc8dfa27-29cc-625c-22ea-f7ccebfc6231'; // Default
+ return '4db35ee5-63ad-59f6-cec6-82ef8863b22d'; // Default
}
/**
@@ -92,14 +94,11 @@ function getDeviceInfo() {
* @param {string} key - The cookie key.
* @returns {string|null} The cookie value, or null if the cookie doesn't exist.
*/
-function getCookie(key, sendFullCookie) {
+function getCookie(key) {
const cookie = document.cookie.split(';')
- .map((x) => x.trim().split('='))
+ .map((x) => decodeURIComponent(x.trim()).split(/=(.*)/s))
.find(([k]) => k === key);
- if (sendFullCookie) {
- return cookie;
- }
return cookie ? cookie[1] : null;
}
@@ -133,11 +132,10 @@ function setCookie(key, value, options = {}) {
* { FPID: [{ id: string, authenticatedState: string, primary: boolean }] }
*/
function getOrGenerateUserId() {
- const experienceCloudCookieName = 'AMCV_9E1005A551ED61CA0A490D45%40AdobeOrg';
- const amcvCookieValue = getCookie(experienceCloudCookieName);
+ const amcvCookieValue = getCookie(AMCV_COOKIE);
// If ECID is not found, generate and return FPID
- if (!amcvCookieValue) {
+ if (!amcvCookieValue || (amcvCookieValue.indexOf('MCMID|') === -1)) {
const fpidValue = generateUUIDv4();
return {
FPID: [{
@@ -148,11 +146,9 @@ function getOrGenerateUserId() {
};
}
- // ECID found, return structured ECID object
- const extractedEcid = amcvCookieValue.substring(6); // Extract the ECID value from the cookie
return {
ECID: [{
- id: extractedEcid,
+ id: amcvCookieValue.match(/MCMID\|([^|]+)/)?.[1],
authenticatedState: 'ambiguous',
primary: true,
}],
@@ -318,7 +314,7 @@ function createRequestPayload({ updatedContext, pageName, locale, env }) {
* @param {Object} data - The response data from the API.
* @returns {string|null} The ECID value, or null if not found.
*/
-function extractECID(data) {
+function extractECIDFromResp(data) {
return data.handle
.flatMap((item) => item.payload)
.find((p) => p.namespace?.code === 'ECID')?.id || null;
@@ -330,12 +326,36 @@ function extractECID(data) {
* @param {string} ECID - The Experience Cloud ID (ECID).
*/
function updateAMCVCookie(ECID) {
- const cookieName = 'AMCV_9E1005A551ED61CA0A490D45%40AdobeOrg';
- const cookieValue = `MCMID|${ECID}`;
+ const cookieValue = getCookie(AMCV_COOKIE);
+
+ if (!cookieValue) {
+ setCookie(encodeURIComponent(AMCV_COOKIE), `MCMID|${ECID}`);
+ } else if (cookieValue.indexOf('MCMID|') === -1) {
+ setCookie(encodeURIComponent(AMCV_COOKIE), `${cookieValue}|MCMID|${ECID}`);
+ }
+}
+
+function getUrl() {
+ const PAGE_URL = new URL(window.location.href);
+ const { host } = window.location;
+ const query = PAGE_URL.searchParams.get('env');
+ const url = 'https://edge.adobedc.net/ee/v2/interact';
- if (getCookie(cookieName) !== cookieValue) {
- setCookie(cookieName, `MCMID|${ECID}`);
+ /* c8 ignore start */
+ if (query || host.includes('localhost') || host.includes('.page')
+ || host.includes('.live')) {
+ return url;
}
+
+ /* c8 ignore start */
+ if (host.includes('stage.adobe')
+ || host.includes('corp.adobe')
+ || host.includes('graybox.adobe')) {
+ return 'https://www.stage.adobe.com/experienceedge/ee/v2/interact';
+ }
+
+ const { origin } = window.location;
+ return `${origin}/experienceedge/ee/v2/interact`;
}
/**
@@ -351,17 +371,15 @@ function updateAMCVCookie(ECID) {
* personalization propositions fetched from Adobe Target.
*/
export const loadAnalyticsAndInteractionData = async ({ locale, env, calculatedTimeout }) => {
- const value = getCookie('kndctr_9E1005A551ED61CA0A490D45_AdobeOrg_consent', true);
- const isRejectedDecodedURI = value?.[2] === undefined && decodeURIComponent(value?.[1]) === 'general=out';
- const isRejectedURI = value?.[1] === 'general' && value?.[2] === 'out';
+ const value = getCookie('kndctr_9E1005A551ED61CA0A490D45_AdobeOrg_consent');
- if (isRejectedDecodedURI || isRejectedURI) {
+ if (value === 'general=out') {
return Promise.reject(new Error('Consent Cookie doesnt allow interact'));
}
// Define constants based on environment
const DATA_STREAM_ID = env === 'prod' ? '5856abb0-95d8-4f9a-bb92-37f99d2bd492' : '87f9b644-5fd3-4015-81d5-f68ad81c3561';
- const TARGET_API_URL = 'https://edge.adobedc.net/ee/v2/interact';
+ const TARGET_API_URL = getUrl();
// Device and viewport information
const {
@@ -407,7 +425,7 @@ export const loadAnalyticsAndInteractionData = async ({ locale, env, calculatedT
throw new Error('Failed to fetch interact call');
}
const targetRespJson = await targetResp.json();
- const ECID = extractECID(targetRespJson);
+ const ECID = extractECIDFromResp(targetRespJson);
// Update the AMCV cookie with ECID
updateAMCVCookie(ECID);
diff --git a/libs/utils/utils.js b/libs/utils/utils.js
index 1b8ab85f836..c0c6ddefbbd 100644
--- a/libs/utils/utils.js
+++ b/libs/utils/utils.js
@@ -1075,7 +1075,7 @@ async function checkForPageMods() {
|| mepHighlight || mepButton || mepParam === '' || xlg)) return;
const enablePersV2 = enablePersonalizationV2();
- if (martech !== 'off' && (target || xlg || pzn) && enablePersV2) {
+ if ((target || xlg) && enablePersV2) {
const params = new URL(window.location.href).searchParams;
const calculatedTimeout = parseInt(params.get('target-timeout'), 10)
|| parseInt(getMetadata('target-timeout'), 10)
From 57c5490bff16276975cdcc0b701ec7807eff0ad1 Mon Sep 17 00:00:00 2001
From: Bandana Laishram
Date: Tue, 10 Dec 2024 14:48:24 +0530
Subject: [PATCH 10/86] Adding helpx and stock url to prodDomains for
standalone gnav (#3333)
---
libs/navigation/navigation.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libs/navigation/navigation.js b/libs/navigation/navigation.js
index 9b3fc5ed671..efe77fd6cae 100644
--- a/libs/navigation/navigation.js
+++ b/libs/navigation/navigation.js
@@ -42,7 +42,14 @@ const getStageDomainsMap = (stageDomainsMap) => (
);
// Production Domain
-const prodDomains = ['milo.adobe.com', 'business.adobe.com', 'www.adobe.com', 'adobecom.github.io'];
+const prodDomains = [
+ 'milo.adobe.com',
+ 'business.adobe.com',
+ 'www.adobe.com',
+ 'helpx.adobe.com',
+ 'stock.adobe.com',
+ 'adobecom.github.io',
+];
function getParamsConfigs(configs) {
return blockConfig.reduce((acc, block) => {
From cc05e055d4145fc26d4bb1427bc31f14371447e9 Mon Sep 17 00:00:00 2001
From: Sean Choi
Date: Tue, 10 Dec 2024 02:18:31 -0700
Subject: [PATCH 11/86] [MWPW-161870] Fixing the issue that sidenav can't be
collapsed. (#3201)
* Fixing the issue that sidenav can't be collapsed.
* Unit test update.
* Move string to a const
* results announce
* trying to fix the unit test
* role status > aria-live polite
* aria-live polite test update
---
libs/blocks/merch-card-collection/merch-card-collection.js | 3 +++
libs/deps/mas/merch-sidenav.js | 4 ++--
.../mas/web-components/src/sidenav/merch-sidenav-list.js | 7 ++++---
.../test/sidenav/catalog-sidenav.test.html.js | 4 +++-
.../merch-card-collection/mocks/merch-card-collection.html | 2 +-
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/libs/blocks/merch-card-collection/merch-card-collection.js b/libs/blocks/merch-card-collection/merch-card-collection.js
index b6d7f901635..7cb8c24a457 100644
--- a/libs/blocks/merch-card-collection/merch-card-collection.js
+++ b/libs/blocks/merch-card-collection/merch-card-collection.js
@@ -293,6 +293,9 @@ export default async function init(el) {
literalEl.remove();
if (slot) {
slot.setAttribute('slot', LITERAL_SLOTS[index]);
+ if (LITERAL_SLOTS[index].toLowerCase().includes('result')) {
+ slot.setAttribute('aria-live', 'polite');
+ }
index += 1;
}
literalSlots.push(slot);
diff --git a/libs/deps/mas/merch-sidenav.js b/libs/deps/mas/merch-sidenav.js
index 20b64476e49..5fb1d81cce3 100644
--- a/libs/deps/mas/merch-sidenav.js
+++ b/libs/deps/mas/merch-sidenav.js
@@ -9,7 +9,7 @@ import{html as k,css as H,LitElement as P}from"/libs/deps/lit-all.min.js";var r=
line-height: 32px;
color: #747474;
}
-`;import{html as R,LitElement as N}from"/libs/deps/lit-all.min.js";function d(s,e){let t;return function(){let o=this,i=arguments;clearTimeout(t),t=setTimeout(()=>s.apply(o,i),e)}}var x="merch-search:change";var v="merch-sidenav:select";var g="hashchange";function n(s=window.location.hash){let e=[],t=s.replace(/^#/,"").split("&");for(let o of t){let[i,l=""]=o.split("=");i&&e.push([i,decodeURIComponent(l.replace(/\+/g," "))])}return Object.fromEntries(e)}function a(s,e){if(s.deeplink){let t={};t[s.deeplink]=e,L(t)}}function L(s){let e=new URLSearchParams(window.location.hash.slice(1));Object.entries(s).forEach(([i,l])=>{l?e.set(i,l):e.delete(i)}),e.sort();let t=e.toString();if(t===window.location.hash)return;let o=window.scrollY||document.documentElement.scrollTop;window.location.hash=t,window.scrollTo(0,o)}function b(s){let e=()=>{if(window.location.hash&&!window.location.hash.includes("="))return;let t=n(window.location.hash);s(t)};return e(),window.addEventListener(g,e),()=>{window.removeEventListener(g,e)}}var p=class extends N{static properties={deeplink:{type:String}};get search(){return this.querySelector("sp-search")}constructor(){super(),this.handleInput=()=>{a(this,this.search.value),this.search.value&&this.dispatchEvent(new CustomEvent(x,{bubbles:!0,composed:!0,detail:{type:"search",value:this.search.value}}))},this.handleInputDebounced=d(this.handleInput.bind(this))}connectedCallback(){super.connectedCallback(),this.search&&(this.search.addEventListener("input",this.handleInputDebounced),this.search.addEventListener("submit",this.handleInputSubmit),this.updateComplete.then(()=>{this.setStateFromURL()}),this.startDeeplink())}disconnectedCallback(){super.disconnectedCallback(),this.search.removeEventListener("input",this.handleInputDebounced),this.search.removeEventListener("submit",this.handleInputSubmit),this.stopDeeplink?.()}setStateFromURL(){let t=n()[this.deeplink];t&&(this.search.value=t)}startDeeplink(){this.stopDeeplink=b(({search:e})=>{this.search.value=e??""})}handleInputSubmit(e){e.preventDefault()}render(){return R`
{e.selected=!0},1),this.dispatchEvent(new CustomEvent(v,{bubbles:!0,composed:!0,detail:{type:"sidenav",value:this.selectedValue,elt:this.selectedElement}})))}setStateFromURL(){let t=n()[this.deeplink]??"all";if(t){let o=this.querySelector(`sp-sidenav-item[value="${t}"]`);if(!o)return;this.updateComplete.then(()=>{let i="SP-SIDENAV-ITEM";o.firstElementChild?.tagName===i&&(o.expanded=!0),this.selectElement(o)})}}handleClick({target:e}){let{value:t,parentNode:o}=e;this.selectElement(e),o&&o.tagName==="SP-SIDENAV"&&(a(this,t),e.selected=!0,o.querySelectorAll("sp-sidenav-item[expanded],sp-sidenav-item[selected]").forEach(i=>{i.value!==t&&(i.expanded=!1,i.selected=!1)}))}selectionChanged({target:{value:e,parentNode:t}}){this.selectElement(this.querySelector(`sp-sidenav-item[value="${e}"]`)),a(this,e)}connectedCallback(){super.connectedCallback(),this.addEventListener("click",this.handleClickDebounced),this.updateComplete.then(()=>{this.setStateFromURL()})}disconnectedCallback(){super.disconnectedCallback(),this.removeEventListener("click",this.handleClickDebounced)}render(){return C`
diff --git a/libs/features/mas/web-components/src/sidenav/merch-sidenav-list.js b/libs/features/mas/web-components/src/sidenav/merch-sidenav-list.js
index e0bc96a22e4..b0bf1068c82 100644
--- a/libs/features/mas/web-components/src/sidenav/merch-sidenav-list.js
+++ b/libs/features/mas/web-components/src/sidenav/merch-sidenav-list.js
@@ -55,9 +55,6 @@ export class MerchSidenavList extends LitElement {
if (element.parentNode.tagName === 'SP-SIDENAV-ITEM') {
this.selectElement(element.parentNode, false);
}
- if (element.firstElementChild?.tagName === 'SP-SIDENAV-ITEM') {
- element.expanded = true;
- }
if (selected) {
this.selectedElement = element;
this.selectedText = element.label;
@@ -91,6 +88,10 @@ export class MerchSidenavList extends LitElement {
);
if (!element) return;
this.updateComplete.then(() => {
+ const sideNavItemTagName = 'SP-SIDENAV-ITEM';
+ if (element.firstElementChild?.tagName === sideNavItemTagName) {
+ element.expanded = true;
+ }
this.selectElement(element);
});
}
diff --git a/libs/features/mas/web-components/test/sidenav/catalog-sidenav.test.html.js b/libs/features/mas/web-components/test/sidenav/catalog-sidenav.test.html.js
index 6dfa30a6a02..2ceedb5d7c6 100644
--- a/libs/features/mas/web-components/test/sidenav/catalog-sidenav.test.html.js
+++ b/libs/features/mas/web-components/test/sidenav/catalog-sidenav.test.html.js
@@ -196,12 +196,14 @@ runTests(async () => {
it('does refresh from url state', async () => {
const search = document.querySelector('sp-search');
+ const sidenavItemCD = document.querySelector('sp-sidenav-item[label="Creativity And Design"]');
search.value = '';
- pushState({ search: 'photoshop' });
+ pushState({ search: 'photoshop', filter: 'creativitydesign' });
await refreshElement(
document.querySelector('merch-search').parentElement,
);
expect(search.value).to.equal('photoshop');
+ expect(sidenavItemCD.expanded).to.be.true;
});
});
});
diff --git a/test/blocks/merch-card-collection/mocks/merch-card-collection.html b/test/blocks/merch-card-collection/mocks/merch-card-collection.html
index 084be8d9cf0..659df59a77c 100644
--- a/test/blocks/merch-card-collection/mocks/merch-card-collection.html
+++ b/test/blocks/merch-card-collection/mocks/merch-card-collection.html
@@ -188,7 +188,7 @@
- Search all products
Filters
Sort
Popularity
Alphabetical
0 results
1 result in
results in
1 result for
results for
1 result for:
results for:
Your search for did not yield any results
Your search for did not yield any results. Try a different search term.
Suggestions:
-
+
- Make sure all words are spelled correctly
- Use quotes to search for an entire phrase, such as "crop an image"
Search all products
Filters
Sort
Popularity
Alphabetical
0 results
1 result in
results in
1 result for
results for
1 result for:
results for:
Your search for did not yield any results
Your search for did not yield any results. Try a different search term.
Suggestions:
Show more
ContentType Fallback
-This is the content-type tag that will be applied to all cards that do not have +
This is the content-type tag that will be applied to all cards that do not have a specific content-type tag included in their metadata.
`); break; @@ -485,7 +488,7 @@ helpButtons.forEach((btn) => { case 'use-preview': showAlert(`Use Preview Content
When this option is checked, the tool will publish content from: -
https://main--{repo}--{owner}.hlx.page +
https://stage--{repo}--{owner}.hlx.page
This can be useful for testing before publishing to production.
`); break; @@ -510,6 +513,8 @@ themeOptions.forEach((btn) => { }); const init = async () => { + setTheme(); + await getPresetsData(); await loadTingleModalFiles(loadScript, loadStyle); await loadCaasTags(); loadFromLS(); @@ -532,7 +537,7 @@ const init = async () => { host: document.getElementById('host').value, project: '', branch: 'main', - caasEnv: document.getElementById('caasEnvSelector').value || 'prod', + caasEnv: document.getElementById('caasEnv').value || 'prod', contentType: document.getElementById('contentType').value, repo: document.getElementById('repo').value, owner: document.getElementById('owner').value, diff --git a/tools/send-to-caas/bulkpublish.beta.css b/tools/send-to-caas/bulkpublish.beta.css index 0f1255422e2..877a16a02d9 100644 --- a/tools/send-to-caas/bulkpublish.beta.css +++ b/tools/send-to-caas/bulkpublish.beta.css @@ -44,7 +44,7 @@ body { .main { display: flex; - height: calc(100% - 126px); + min-height: calc(100% - 126px); } .bulk-publisher .title { @@ -58,7 +58,7 @@ body { background: linear-gradient(45deg, #aaa, #eee); border-right: solid 1px #aaa; overflow-y: auto; - height: 100%; + min-height: 100%; } dd.content { diff --git a/tools/send-to-caas/bulkpublisher.beta.html b/tools/send-to-caas/bulkpublisher.beta.html index de2b6206de1..d8f4a755fb2 100644 --- a/tools/send-to-caas/bulkpublisher.beta.html +++ b/tools/send-to-caas/bulkpublisher.beta.html @@ -51,8 +51,8 @@Basic Settings
Advanced Options
-
-