MWPW-202435: Tech debt: avoid relocating mas-field CTA content outside the mas-field wrapper by joaquinrivero · Pull Request #6586 · adobecom/milo

joaquinrivero · 2026-08-27T15:59:04Z

Resolves: MWPW-202435

Keep the mas-field wrapper around inline CTAs instead of unwrapping it, so commerce context (promo code, ids) survives by structure.

Needs mas display: contents deployed first, else the kept wrapper computes as a box and breaks layout.

Companion PR (mas): adobecom/mas#1210

Test URLs:

…paint race mas-field now stamps its context (promo code, ids) onto the elements it renders, so it survives the unwrap by construction: drop copyMasFieldIdToParent / preserveInlineCommerceContext, keep only the merch.css load. Also hold an unwrapped CTA's action area hidden until the card's still-wrapped price resolves, closing the cold-load window where the CTA paints above the price. MWPW-202435.

aem-code-sync · 2026-08-27T15:59:08Z

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch.
In case there are problems, just click the checkbox below to rerun the respective action.

Re-sync branch

Commits

84f85c2 ✅ (latest)
401e7c7 ✅
49e9056 ✅
adeccfc ✅
bed1635 ✅
ffc6ce6 ✅
b74f8f3 ✅
942e44e ✅
28cd2ab ✅
091c55f ✅

github-actions · 2026-08-28T10:24:48Z

This pull request is not passing all required checks. Please see this discussion for information on how to get all checks passing. Inconsistent checks can be manually retried. If a test absolutely can not pass for a good reason, please add a comment with an explanation to the PR.

yesil

@joaquinrivero AFAIK, with #6463, the MAS fields will become part of the merch autoblock.

Could you please check with @TsayAdobe whether this is still needed, or if you can rebase on stage once that PR is merged?

Axelcureno

Approving. This is the Milo half of MWPW-202435 — pairs with mas#1185, which adds the #stampContext price-span stamping this relies on. Just make sure that MAS bundle deploys before/with this, or price-field promo codes drop on unwrap.

One ask: the new holdCtaUntilPrice tests only hit the happy path — the 3s timeout fallback (the real safety net) and the .section walk boundary aren't covered. Worth adding.

yesil

I'll wait for @TsayAdobe's review.
There should not be any more mas-field logic in merch-card-autoblock

* origin/stage: (33 commits) INTL1207 - Add content-toggle block for A/B test campaign (#6451) Add a guard in decorateAutoBlock for merch links (#6567) [MWPW-204859] - Apply forced-reflow fix to brand-concierge floating (#6510) [MWPW-204698] Remove manifest overline (#6496) [Milo][Martech] Remove performance consent check from analytics event sending (#6491) MWPW-203941: Update authoring pattern for bc marquee (#6490) MWPW-204795 [MEP] Remove RainFocus registration-data (event-id) path (#6483) [MWPW-204301] [Lingo] MEP replace/remove on mep-lingo fragments + regional replacement resolution (#6474) MWPW-202286 Separate mas field from merch card autoblock (#6463) [MWPW-203054] [MWPW-203055] - Additional Manifest and Page Summary fields. (#6446) MWPW-200965: Port email-collection block to C2 (#6441) [MWPW-205693]: Adding rtl change for languageselector (#6581) [MWPW-204596] Validate the fedsbranch query parameter in C2 global-navigation (#6497) [MWPW-199609] Harden sanitizeHtml URL scheme allowlist (#6475) MWPW-204984: Revert eager IMS load (#6511) (#6549) MWPW-204984 [MWPW-204913]: C2 persistent cart (#6522) fix for mc autoblock MWPW-204875: eagerly load ims up to date with main ... # Conflicts: # libs/blocks/merch-card-autoblock/merch-card-autoblock.js # libs/blocks/merch/merch.js # test/blocks/merch-card-autoblock/merch-card-autoblock.test.js

yesil · 2026-09-02T13:37:10Z

@joaquinrivero I compared the DOMs of before and after I don not see any difference.

before:

after:

what should we check in the DOM?

milo-pr-merge · 2026-09-02T15:09:04Z

Error merging 6586: MWPW-202435: Tech debt: avoid relocating mas-field CTA content outside the mas-field wrapper Pull Request has merge conflicts

joaquinrivero · 2026-09-02T16:09:12Z

@yesil Since the mas PR got merge, we are seeing the context injected by mas now, instead of doing it from milo side, we expect to see the same context without copying it on milo

* origin/stage: (21 commits) VULN-38270: Validate repo/owner and pin sharepoint.site to Adobe's Graph host (#6610) Brand Concierge - UI update based on chat history (#6624) Site redesign foundation (#6614) MWPW-205898 Update Field Names (#6606) MWPW-205871 Add Marketo form id param (#6593) MWPW-205706: bottom-align compare-pod CTAs when a promo makes a price taller (#6587) MWPW-205235 - Contribute Blog Author Block From da-bacom-blog to Milo (#6577) MWPW-203648 Conflicting hashes causing CTA not to display (#6500) MWPW-204427 [MEP][C2 Gnav] Scope gnav decorateBody hook to href localization (#6482) [Site Redesign] PDF-Space block RTL Support Sync (#6609) [MWPW-203651] Geo-IP placeholders: single sheet per repo (column-per-market + language tabs) (#6589) MWPW-203985 [Preview Indexer] Replace all site admin tokens with a single AEM EDS Service token (#6617) [NALA] Stabilize BC floating-button scroll assertions (webkit flake) (#6620) S2A v0.0.21 spacing and border-radius sync (#6439) [Lingo] MWPW-203985 Preview Indexer - Replace all site admin tokens with a single AEM EDS Service token (#6521) add logs and pass arp sesson token (#6580) [MWPW-203833] Debounce brand-concierge floating-input resize handler (#6555) MWPW-204858 M@S Preflight Price Unavailable Check (#6552) MWPW-204695: Fix video play/pause interaction (#6527) MWPW-204936: Adds Product Icon option to details text (#6518) ... # Conflicts: # libs/blocks/merch/merch.js

yesil

@joaquinrivero isn't this PR supposed to keep the CTA as child of mas-field ?

I commented PR with a question.

Re-nest mas-field to wrap the authored em/strong instead of unwrapping it, so promo/id context survives by structure. Needs mas-field display:contents (MWPW-206522) to stay boxless.

joaquinrivero · 2026-09-04T05:15:11Z

@yesil Reworked to do exactly that. The CTA now stays inside mas-field, thanks.

Drop the hand-rolled timer/clearTimeout; race checkReady against the shared FIELD_TIMEOUT like checkFieldReady does.

Axelcureno

Two small things on the re-nest commit, both non-blocking. Approval stands.

Axelcureno · 2026-09-04T21:13:08Z

+  if (outer === masField) {
+    masField.replaceChildren(...content.childNodes);
+  } else {
+    masField.replaceWith(...content.childNodes);


Leaves the emptied <span data-role="mas-field-content"> in mas-field, unlike the replaceChildren path above. MAS #ensureContentElement matches :scope > span[data-role=...] and reuses it, so a re-render writes into that span ahead of the decorated <em><a>. Drop it after the append?

Axelcureno · 2026-09-04T21:13:08Z

+  if (!price?.checkReady) return;
+  container.style.visibility = 'hidden';
+  const reveal = () => { container.style.visibility = ''; };
+  withTimeout(price.checkReady().catch(() => false)).then(reveal);


Nice catch on the double reveal. This also moves the hold from 3s to FIELD_TIMEOUT (5s), so a slow WCS hides the CTA 2s longer. Intended?

Roycethan

@joaquinrivero Regression observed:
"Free trial" shifts right by 16px (past one phantom span+gap), and "Buy now" shifts by 32px (past two)
https://main--da-cc--adobecom.aem.live/products/premiere/plans?maslibs=MWPW-206522&milolibs=MWPW-202435

…undary

joaquinrivero · 2026-09-05T02:36:29Z

Follow-ups from review:

fix(merch): drop the empty mas-field-content span after re-nest, so a re-render can't reuse it before the CTA (@Axelcureno).
test(merch): cover holdCtaUntilPrice timeout + .section boundary (@Axelcureno).
docs(preview): fix stale display: inline comment → display: contents.

Gnav fix stacked as #6660; retargets to main after this merges.

joaquinrivero requested a review from a team as a code owner August 27, 2026 15:59

joaquinrivero mentioned this pull request Aug 27, 2026

MWPW-202435: Tech debt: avoid relocating mas-field CTA content outside the mas-field wrapper adobecom/mas#1185

Merged

6 tasks

joaquinrivero changed the title ~~MWPW-202435: let mas-field own context; guard CTA paint race~~ MWPW-202435: mas-field own context; guard CTA paint race Aug 27, 2026

joaquinrivero requested review from Axelcureno, Blainegunn, Roycethan, TsayAdobe, antonio-rmrz, npeltier and yesil August 27, 2026 16:02

yesil reviewed Aug 28, 2026

View reviewed changes

joaquinrivero changed the title ~~MWPW-202435: mas-field own context; guard CTA paint race~~ MWPW-202435: Tech debt: avoid relocating mas-field CTA content outside the mas-field wrapper Aug 28, 2026

Axelcureno approved these changes Aug 28, 2026

View reviewed changes

Roycethan approved these changes Aug 28, 2026

View reviewed changes

yesil requested changes Aug 31, 2026

View reviewed changes

aem-code-sync Bot deployed to MWPW-202435 August 31, 2026 18:45 View deployment

joaquinrivero force-pushed the MWPW-202435 branch from feb9255 to 28cd2ab Compare August 31, 2026 18:50

TsayAdobe approved these changes Sep 1, 2026

View reviewed changes

joaquinrivero requested a review from yesil September 1, 2026 14:53

Roycethan added verified PR has been E2E tested by a reviewer Ready for Stage labels Sep 1, 2026

Roycethan deployed to milo_pr_merge September 1, 2026 15:55 — with GitHub Actions Active

aem-code-sync Bot deployed to MWPW-202435 September 2, 2026 16:44 View deployment

yesil previously approved these changes Sep 3, 2026

View reviewed changes

yesil reviewed Sep 3, 2026

View reviewed changes

yesil self-requested a review September 3, 2026 16:59

Roycethan removed the Ready for Stage label Sep 3, 2026

fix(merch): keep mas-field wrapper around inline CTAs

b74f8f3

Re-nest mas-field to wrap the authored em/strong instead of unwrapping it, so promo/id context survives by structure. Needs mas-field display:contents (MWPW-206522) to stay boxless.

joaquinrivero mentioned this pull request Sep 4, 2026

MWPW-206522: render mas-field as display:contents adobecom/mas#1210

Open

6 tasks

refactor(merch): reuse withTimeout in holdCtaUntilPrice

ffc6ce6

Drop the hand-rolled timer/clearTimeout; race checkReady against the shared FIELD_TIMEOUT like checkFieldReady does.

aem-code-sync Bot deployed to MWPW-202435 September 4, 2026 05:24 View deployment

docs(merch): fix stale comments after wrapper rework

bed1635

aem-code-sync Bot deployed to MWPW-202435 September 4, 2026 05:28 View deployment

docs(merch): tighten re-nest comment

adeccfc

aem-code-sync Bot deployed to MWPW-202435 September 4, 2026 05:29 View deployment

yesil approved these changes Sep 4, 2026

View reviewed changes

Axelcureno reviewed Sep 4, 2026

View reviewed changes

Roycethan removed the verified PR has been E2E tested by a reviewer label Sep 4, 2026

Roycethan self-requested a review September 4, 2026 22:18

Roycethan requested changes Sep 4, 2026

View reviewed changes

docs(preview): update stale mas-field display comment

49e9056

joaquinrivero requested a review from a team as a code owner September 5, 2026 01:46

aem-code-sync Bot deployed to MWPW-202435 September 5, 2026 02:09 View deployment

joaquinrivero requested a review from Roycethan September 5, 2026 02:16

joaquinrivero mentioned this pull request Sep 5, 2026

MWPW-206593: fix gnav promo CTA styling for mas-field CTAs #6660

Open

joaquinrivero added 2 commits September 4, 2026 19:20

fix(merch): drop emptied mas-field content span after CTA re-nest

401e7c7

test(merch): cover holdCtaUntilPrice timeout fallback and .section bo…

84f85c2

…undary

joaquinrivero force-pushed the MWPW-202435 branch from abbc786 to 84f85c2 Compare September 5, 2026 02:20

Uh oh!

Conversation

joaquinrivero commented Aug 27, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aem-code-sync Bot commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Aug 28, 2026

Uh oh!

yesil left a comment

Choose a reason for hiding this comment

Uh oh!

Axelcureno left a comment

Choose a reason for hiding this comment

Uh oh!

yesil left a comment

Choose a reason for hiding this comment

Uh oh!

yesil commented Sep 2, 2026

Uh oh!

milo-pr-merge Bot commented Sep 2, 2026

Uh oh!

joaquinrivero commented Sep 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yesil left a comment

Choose a reason for hiding this comment

Uh oh!

joaquinrivero commented Sep 4, 2026

Uh oh!

Axelcureno left a comment

Choose a reason for hiding this comment

Uh oh!

Axelcureno Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

Axelcureno Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

Roycethan left a comment

Choose a reason for hiding this comment

Uh oh!

joaquinrivero commented Sep 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

joaquinrivero commented Aug 27, 2026 •

edited by github-actions Bot

Loading

aem-code-sync Bot commented Aug 27, 2026 •

edited

Loading

joaquinrivero commented Sep 2, 2026 •

edited

Loading