Add S2 button whitelist with authorable outline variant #675
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -309,7 +309,7 @@ export async function decorateButtonsDeprecated(el, size) { | |
| const { decorateButtons } = await import(`${getLibs()}/utils/decorate.js`); | ||
| // eslint-disable-next-line max-len | ||
| // DO NOT add any more exceptions here. Authors must learn to author buttons the new milo way, even with old blocks | ||
| if (!el.closest('.banner') && !el.closest('.fullscreen-marquee') && !el.closest('.link-list')) decorateButtons(el, size); | ||
| // DO NOT add any more exceptions above. We should be removing the exceptions and not adding more. | ||
| el.querySelectorAll(':scope a:not(.con-button, .social-link)').forEach(($a) => { | ||
| // Mirrors decorateButtons' own #_button-<name> handling (milo's utils/decorate.js) | ||
|
|
@@ -364,6 +364,24 @@ export async function decorateButtonsDeprecated(el, size) { | |
| $a.classList.add('button', 'accent', 'light'); | ||
| $twoup.classList.add('button-container'); | ||
| } | ||
| // Custom button variants authored the milo way via `#_button-<class>` | ||
| // hashes on the href (e.g. `#_button-fill`, `#_button-outline`). The | ||
| // blocks that reach this fallback (ax-columns, banner, | ||
| // fullscreen-marquee, link-list) bypass milo's decorateButtons, which | ||
| // would normally strip these hashes and add the classes — so replicate | ||
| // that here: add each class, strip the hash, and drop the default | ||
| // `accent` when an explicit fill/outline variant is requested. | ||
| // Additive and hash-gated: no effect on content without these hashes. | ||
| if ($a.classList.contains('button')) { | ||
| const customClasses = [...originalHref.matchAll(/#_button-([a-zA-Z-]+)/g)]; | ||
| customClasses.forEach(([token, cls]) => { | ||
| $a.classList.add(cls); | ||
| $a.setAttribute('href', $a.href.replace(token, '')); | ||
| }); | ||
| if ($a.classList.contains('fill') || $a.classList.contains('outline')) { | ||
| $a.classList.remove('accent'); | ||
| } | ||
| } | ||
|
Comment on lines
+367
to
+384
Contributor
There was a problem hiding this comment. Ideally we would upgrade to the new button decoration rather than continue to add code to the deprecated function. Do you have an idea of how much work that would be?
Contributor
Author
There was a problem hiding this comment. Why ax-columns stays on decorateButtonsDeprecated (whitelist), not milo's native decorateButtons We prototyped switching ax-columns to call milo's real decorateButtons directly, matching the pattern already used by blog-columns, comparison-table-v2, transparent-img-marquee, etc. It doesn't hold up for this block:
Given ax-columns is one of our highest-traffic, highest-regression-risk blocks, the whitelist/deprecated-fallback approach remains the safer choice until/unless we're ready to also handle the plain-link gap deliberately, rather than fold it into a "quick" migration. https://main--da-express-milo--adobecom.aem.page/drafts/echen/plain-link-decoration-demo |
||
| } | ||
| if (linkText.startsWith('{{icon-') && linkText.endsWith('}}')) { | ||
| const $iconName = /{{icon-([\w-]+)}}/g.exec(linkText)[1]; | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you confirm with design that S2 is the right name for our design system? We're not fully on S2 so they might have a name more specific to express.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Its based on the S2 buttons in the design, I think this is a good name for it.