Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "MWPW-137282 - Action item block layout options" #2232

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Revert "MWPW-137282 - Action item block layout options" #2232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions libs/blocks/action-item/action-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.action-item {
display: flex;
width: 160px;
}

.action-item img {
Expand Down Expand Up @@ -90,10 +89,6 @@
max-height: var(--spacing-xxxl);
}

.action-item.float-icon {
margin: 0 var(--spacing-xs);
}

.action-item.float-icon .floated-icon img {
width: 24px;
min-height: 24px;
Expand Down
13 changes: 4 additions & 9 deletions libs/blocks/action-scroller/action-scroller.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@

.action-scroller .scroller {
display: grid;
grid-template-columns: repeat(var(--action-scroller-columns), var(--action-scroller-item-width));
grid-auto-columns: minmax(var(--action-scroller-column-width), var(--action-scroller-item-width));
grid-template-columns: repeat(var(--action-scroller-columns), 1fr);
grid-auto-columns: minmax(var(--action-scroller-column-width), 1fr);
grid-auto-flow: column;
gap: var(--spacing-xs);
gap: var(--spacing-m);
padding: 0 var(--action-scroller-mobile-padding);
overflow-x: auto;
-ms-overflow-style: none;
scrollbar-width: none;
scroll-behavior: smooth;
}

.action-scroller .scroller[hide-mask='false'] {
--mask-width: 60px;
--mask-image-content: linear-gradient(to right,
transparent,
Expand All @@ -47,6 +45,7 @@
mask-repeat: no-repeat, no-repeat;
}


.action-scroller .scroller::-webkit-scrollbar {
display: none;
}
Expand Down Expand Up @@ -140,8 +139,4 @@
width: var(--grid-container-width);
margin: 0 auto;
}

.action-scroller .justify-center {
justify-content: center;
}
}
37 changes: 24 additions & 13 deletions libs/blocks/action-scroller/action-scroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { createTag, getConfig } from '../../utils/utils.js';
const { miloLibs, codeRoot } = getConfig();
const base = miloLibs || codeRoot;

const defaultItemWidth = (cols) => (cols === 3 ? 160 : 147);
const [NAV, ALIGN] = ['navigation', 'grid-align'];
const defaultItemWidth = 106;
const defaultGridGap = 32;

const PREVBUTTON = `<button class="nav-button previous-button"><img class="previous-icon" alt="Previous icon" src="${base}/blocks/carousel/img/arrow.svg"></button>`;
const NEXTBUTTON = `<button class="nav-button next-button"><img class="next-icon" alt="Next icon" src="${base}/blocks/carousel/img/arrow.svg"></button>`;

Expand All @@ -21,36 +24,44 @@ const getBlockProps = (el) => [...el.childNodes].reduce((attr, row) => {

function setBlockProps(el, columns) {
const attrs = getBlockProps(el);
const itemWidth = attrs['item width'] ?? defaultItemWidth(columns);
const itemWidth = attrs['item width'] ?? defaultItemWidth;
const overrides = attrs.style
? attrs.style
.split(', ')
.map((style) => style.replaceAll(' ', '-'))
.join(' ')
: '';
const gridAlign = [...el.classList].filter((cls) => cls.toLowerCase().includes(ALIGN))
?? 'grid-align-start';
el.style.setProperty('--action-scroller-columns', columns);
el.style.setProperty('--action-scroller-item-width', itemWidth);
return `scroller ${columns <= 5 ? 'justify-center' : ''} ${overrides}`;
return `scroller ${gridAlign} ${overrides}`;
}

function handleScroll(el, btn) {
const itemWidth = el.parentElement?.style?.getPropertyValue('--action-scroller-item-width');
const itemWidth = el.parentElement?.style?.getPropertyValue('--action-scroller-item-width')
?? defaultItemWidth;
const gapStyle = window
.getComputedStyle(el, null)
.getPropertyValue('column-gap');
const scrollDistance = parseInt(itemWidth, 10) + parseInt(gapStyle.replace('px', ''), 10);
const gridGap = gapStyle
? parseInt(gapStyle.replace('px', ''), 10)
: defaultGridGap;
const scrollDistance = parseInt(itemWidth, 10) + gridGap;
el.scrollLeft = btn[1].includes('next-button')
? el.scrollLeft + scrollDistance
: el.scrollLeft - scrollDistance;
}

function handleBtnState(el, [prev, next]) {
const { scrollLeft, scrollWidth, clientWidth } = el;
const hidePrev = scrollLeft === 0;
const hideNext = Math.ceil(scrollLeft) === Math.ceil(scrollWidth - clientWidth);
prev.setAttribute('hide-btn', hidePrev);
next.setAttribute('hide-btn', hideNext);
el.setAttribute('hide-mask', hidePrev && hideNext);
function handleBtnState(
{ scrollLeft, scrollWidth, clientWidth },
[prev, next],
) {
prev.setAttribute('hide-btn', scrollLeft === 0);
next.setAttribute(
'hide-btn',
Math.ceil(scrollLeft) === Math.ceil(scrollWidth - clientWidth),
);
}

function handleNavigation(el) {
Expand All @@ -65,7 +76,7 @@ function handleNavigation(el) {
}

export default function init(el) {
const hasNav = el.classList.contains('navigation');
const hasNav = el.classList.contains(NAV);
const actions = el.parentElement.querySelectorAll('.action-item');
const style = setBlockProps(el, actions.length);
const items = createTag('div', { class: style }, null);
Expand Down
8 changes: 8 additions & 0 deletions libs/blocks/icon-block/icon-block.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@
max-width: var(--icon-size-l);
}

.section.five-up {
grid-template-columns: repeat(auto-fit, minmax(276px, 1fr)) !important;
}

.icon-block .foreground .text-content > * {
width: 100%;
}
Expand Down Expand Up @@ -445,4 +449,8 @@
.three-up .icon-block.bio .foreground {
max-width: 300px;
}

.section.five-up {
grid-template-columns: repeat(5, 1fr) !important;
}
}
22 changes: 7 additions & 15 deletions libs/blocks/section-metadata/section-metadata.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,10 @@
gap: var(--spacing-xxxl);
}

.section[class*='-up'] {
.section.two-up,
.section.three-up,
.section.four-up,
.section.five-up {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(276px, 1fr));
gap: var(--spacing-m);
Expand All @@ -179,7 +182,7 @@
}

.section.five-up {
grid-template-columns: repeat(auto-fit, minmax(125px, 1fr));
grid-template-columns: repeat(auto-fit, minmax(142px, 1fr));
}

.section.sticky-top {
Expand Down Expand Up @@ -212,11 +215,6 @@
gap: var(--spacing-m);
}

.section.sticky-bottom.promo-sticky-section {
background: none;
z-index: 4;
}

.section[class*='grid-width-'] > .content,
main > .section[class*='-up'] > .content {
max-width: initial;
Expand Down Expand Up @@ -315,12 +313,6 @@ main > .section[class*='-up'] > .content {
grid-template-columns: repeat(5, 1fr);
}

.section.center[class*='-up'] {
grid-template-columns: auto;
grid-auto-flow: column;
justify-content: center;
}

.section.grid-template-columns-1-2 {
grid-template-columns: 1fr 2fr;
}
Expand All @@ -336,12 +328,12 @@ main > .section[class*='-up'] > .content {
.section.grid-template-columns-3-1 {
grid-template-columns: 3fr 1fr;
}

.section.grid-width-6-desktop {
padding-left: var(--grid-margins-width-6);
padding-right: var(--grid-margins-width-6);
}

.section.grid-width-8-desktop {
padding-left: var(--grid-margins-width-8);
padding-right: var(--grid-margins-width-8);
Expand Down
1 change: 0 additions & 1 deletion test/blocks/action-scroller/action-scroller.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ describe('action scrollers', () => {
const scrolled = scrollArea.scrollLeft > 0;
expect(scrolled).to.be.true;
});

it('can scroll previous', async () => {
const scrollArea = scroller.querySelector('.scroller');
const prevBtn = scroller.querySelector('.previous-button');
Expand Down
37 changes: 2 additions & 35 deletions test/blocks/action-scroller/mocks/body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@
</div>
</div>
<div>
<div class="action-scroller navigation">
<div class="action-scroller navigation grid-align-end">
<div>
<div>Item width</div>
<div>110</div>
</div>
<div>
<div>style</div>
<div>dark</div>
<div>Grid align end</div>
</div>
</div>
<div class="action-item">
Expand Down Expand Up @@ -194,37 +194,4 @@
</div>
</div>
</div>
<div>
<div class="action-scroller"></div>
<div class="action-item">
<div>
<picture>
<img loading="lazy" alt="" src="" width="178" height="180">
</picture>
</div>
<div>
<div><a href="https://www.adobe.com/">https://www.adobe.com/</a></div>
</div>
</div>
<div class="action-item">
<div>
<picture>
<img loading="lazy" alt="" src="" width="178" height="180">
</picture>
</div>
<div>
<div><a href="https://www.adobe.com/">https://www.adobe.com/</a></div>
</div>
</div>
<div class="action-item">
<div>
<picture>
<img loading="lazy" alt="" src="" width="178" height="180">
</picture>
</div>
<div>
<div><a href="https://www.adobe.com/">https://www.adobe.com/</a></div>
</div>
</div>
</div>
</div>
Loading