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

Various catalog related fixes #307

Merged
merged 18 commits into from
Jun 6, 2024
Merged

Various catalog related fixes #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bee5fa7
fix(MWPW-147654): make catalog buttons more square
yesil May 7, 2024
3e765d9
WIP
yesil May 10, 2024
56aad23
update styles
yesil May 15, 2024
48b30d3
update sidenav
yesil May 15, 2024
63f2622
scroll fix
yesil May 16, 2024
ffc918d
update sidenav
yesil May 16, 2024
99fe8a1
update deps
yesil May 16, 2024
536055d
update deps
yesil May 21, 2024
8af202e
improve modal scroll
yesil May 27, 2024
78c9cda
improve modal scroll
yesil May 27, 2024
656c333
improve modal scroll
yesil May 27, 2024
c80c0e8
improve modal scroll
yesil May 27, 2024
efaa4d4
improve modal scroll
yesil May 27, 2024
535708c
update sidenav
yesil May 28, 2024
fe54ab7
update deps
yesil May 29, 2024
d7c7d31
Merge branch 'stage' into catalog-fixes
yesil Jun 3, 2024
8fd4763
update deps
yesil Jun 3, 2024
b7cba49
Merge branch 'stage' into catalog-fixes
yesil Jun 4, 2024
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
12 changes: 5 additions & 7 deletions creativecloud/blocks/sidenav/sidenav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ function appendSearch(rootNav, searchText) {
function appendResources(rootNav, resourceLink) {
const literals = resourceLink.textContent.split(':');
const title = literals[0].trim();
const tag = createTag('sp-sidenav', { manageTabIndex: true });
const tag = createTag('sp-sidenav', { manageTabIndex: true, class: 'resources' });
const merchTag = createTag('merch-sidenav-list', { title });
merchTag.append(tag);
const label = literals[1].trim();
const link = createTag('sp-sidenav-item', { href: resourceLink.href });
const link = createTag('sp-sidenav-item', { href: resourceLink.href, target: '_blank', selected: false });
if (resourceLink.href && resourceLink.href.startsWith('http')) {
link.append(document.createTextNode(label));
const icon = createTag('sp-icon-link-out-light', { class: 'right', slot: 'icon' });
Expand All @@ -140,9 +140,8 @@ function appendResources(rootNav, resourceLink) {
export default async function init(el) {
const libs = getLibs();
const [mainRow, categoryRow] = Array.from(el.children);
const merchSidenavDep = import('../../deps/merch-sidenav.js');
const deps = Promise.all([
merchSidenavDep,
import('../../deps/merch-sidenav.js'),
// eslint-disable-next-line import/no-unresolved, import/no-absolute-path
import('/libs/deps/lit-all.min.js'),
import(`${libs}/features/spectrum-web-components/dist/theme.js`),
Expand All @@ -151,8 +150,8 @@ export default async function init(el) {
import(`${libs}/features/spectrum-web-components/dist/sidenav.js`),
import(`${libs}/features/spectrum-web-components/dist/search.js`),
import(`${libs}/features/spectrum-web-components/dist/checkbox.js`),
import(`${libs}/features/spectrum-web-components/dist/button.js`),
import(`${libs}/features/spectrum-web-components/dist/dialog.js`),
import(`${libs}/features/spectrum-web-components/dist/link.js`),
import(`${libs}/features/spectrum-web-components/dist/overlay.js`),
]);

Expand All @@ -162,9 +161,8 @@ export default async function init(el) {
// eslint-disable-next-line prefer-const
const resourcesLink = mainRow?.querySelector('a');
let endpoint = categoryRow?.querySelector('a');
await merchSidenavDep;
const rootNav = createTag('merch-sidenav', { title });
await deps;
const rootNav = createTag('merch-sidenav', { title });
el.replaceWith(rootNav);
appendSearch(rootNav, searchText);
if (endpoint) {
Expand Down
148 changes: 118 additions & 30 deletions creativecloud/deps/merch-sidenav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Thu, 21 Mar 2024 10:55:19 GMT
// branch: catalog-regressions-4 commit: 90641e42ad012c2386133cbd2df855f468842b2d Wed, 29 May 2024 12:05:08 GMT

Check warning on line 1 in creativecloud/deps/merch-sidenav.js

View workflow job for this annotation

GitHub Actions / Running eslint 

[eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Raw Output:
{"fatal":false,"severity":1,"message":"File ignored because of a matching ignore pattern. Use \"--no-ignore\" to override."}

// src/sidenav/merch-sidenav.js
import { html as html4, css as css5, LitElement as LitElement4 } from "/libs/deps/lit-all.min.js";
Expand Down Expand Up @@ -42,13 +42,14 @@
import { html, LitElement, css as css2 } from "/libs/deps/lit-all.min.js";

// src/deeplink.js
var EVENT_HASHCHANGE = "hashchange";
function parseState(hash = window.location.hash) {
const result = [];
const keyValuePairs = hash.replace(/^#/, "").split("&");
for (const pair of keyValuePairs) {
const [key, value = ""] = pair.split("=");
if (key) {
result.push([key, decodeURIComponent(value)]);
result.push([key, decodeURIComponent(value.replace(/\+/g, " "))]);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this supposed to do and why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spaces are converted to +, and are converted back to spaces.

}
}
return Object.fromEntries(result);
Expand All @@ -62,15 +63,29 @@
}
function pushState(state) {
const hash = new URLSearchParams(window.location.hash.slice(1));
Object.entries(state).forEach(([key, value]) => {
if (value) {
hash.set(key, value);
Object.entries(state).forEach(([key, value2]) => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we find a better name, more meaningfull maybe?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is transpiled code and generated name 🤷‍♂️

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haaaa sorry :)

if (value2) {
hash.set(key, value2);
} else {
hash.delete(key);
}
});
hash.sort();
window.location.hash = decodeURIComponent(hash.toString());
const value = hash.toString();
let lastScrollTop = window.scrollY || document.documentElement.scrollTop;
window.location.hash = value;
window.scrollTo(0, lastScrollTop);
}
function deeplink(callback) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we factorize that code somewhere in milo?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry again just realised where it came from too :)

const handler = () => {
const state = parseState(window.location.hash);
callback(state);
};
handler();
window.addEventListener(EVENT_HASHCHANGE, handler);
return () => {
window.removeEventListener(EVENT_HASHCHANGE, handler);
};
}

// src/utils.js
Expand All @@ -89,13 +104,6 @@
static properties = {
deeplink: { type: String }
};
static styles = [
css2`
:host {
display: contents;
}
`
];
get search() {
return this.querySelector(`sp-search`);
}
Expand All @@ -110,14 +118,18 @@
return;
this.search.addEventListener("input", this.handleInputDebounced);
this.search.addEventListener("change", 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("change", this.handleInputDebounced);
this.search.removeEventListener("submit", this.handleInputSubmit);
this.stopDeeplink?.();
}
/*
* set the state of the search based on the URL
Expand All @@ -129,6 +141,14 @@
this.search.value = value;
}
}
startDeeplink() {
this.stopDeeplink = deeplink(({ search }) => {
this.search.value = search ?? "";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be a special handler passed as a parameter

});
}
handleInputSubmit(event) {
event.preventDefault();
}
render() {
return html`<slot></slot>`;
}
Expand Down Expand Up @@ -164,6 +184,17 @@
position: absolute;
right: 0;
}

::slotted(sp-sidenav.resources) {
--mod-sidenav-item-background-default-selected: transparent;
--mod-sidenav-content-color-default-selected: var(
--highcontrast-sidenav-content-color-default,
var(
--mod-sidenav-content-color-default,
var(--spectrum-sidenav-content-color-default)
)
);
}
`,
headingStyles
];
Expand Down Expand Up @@ -194,7 +225,9 @@
const state = parseState();
const value = state[this.deeplink] ?? "all";
if (value) {
const element = this.querySelector(`sp-sidenav-item[value="${value}"]`) ?? this.querySelector(`sp-sidenav-item`);
const element = this.querySelector(
`sp-sidenav-item[value="${value}"]`
);
if (!element)
return;
this.updateComplete.then(() => {
Expand Down Expand Up @@ -308,7 +341,8 @@
* leaf level item change handler
* @param {*} event
*/
selectionChanged({ target }) {
selectionChanged(event) {
const { target } = event;
const name = target.getAttribute("name");
if (name) {
const index = this.selectedValues.indexOf(name);
Expand Down Expand Up @@ -345,9 +379,15 @@

// src/media.js
var SPECTRUM_MOBILE_LANDSCAPE = "(max-width: 700px)";
var TABLET_DOWN = "(max-width: 1200px)";
var TABLET_DOWN = "(max-width: 1199px)";

// src/sidenav/merch-sidenav.js
document.addEventListener("sp-opened", () => {
document.body.classList.add("merch-modal");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'merch-modal' as constant above?

});
document.addEventListener("sp-closed", () => {
document.body.classList.remove("merch-modal");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bis

});
var MerchSideNav = class extends LitElement4 {
static properties = {
title: { type: String },
Expand All @@ -364,15 +404,50 @@
css5`
:host {
display: block;
max-width: 248px;
}

#sidenav {
:host(:not([modal])) {
--mod-sidenav-item-background-default-selected: #222;
--mod-sidenav-content-color-default-selected: #fff;
}

#content {
width: 100%;
min-width: 300px;
height: 100%;
display: flex;
justify-content: center;
align-items: baseline;
}

:host([modal]) ::slotted(merch-search) {
display: none;
}

#sidenav {
display: flex;
flex-direction: column;
max-width: 248px;
overflow-y: auto;
place-items: center;
min-height: 60vh;
position: relative;
width: 100%;
padding-bottom: 16px;
}

sp-dialog-base #sidenav {
padding-top: 16px;
max-width: 300px;
max-height: 80dvh;
min-height: min(500px, 80dvh);
background: #ffffff 0% 0% no-repeat padding-box;
box-shadow: 0px 1px 4px #00000026;
}

sp-link {
position: absolute;
top: 16px;
right: 16px;
}
`,
headingStyles
Expand All @@ -382,6 +457,9 @@
get filters() {
return this.querySelector("merch-sidenav-list");
}
get search() {
return this.querySelector("merch-search");
}
render() {
return this.mobileAndTablet.matches ? this.asDialog : this.asAside;
}
Expand All @@ -390,21 +468,24 @@
return;
return html4`
<sp-theme theme="spectrum" color="light" scale="medium">
<sp-dialog-wrapper
<sp-dialog-base
slot="click-content"
dismissable
underlay
no-divider
cancel-label="${this.closeText || "Close"}"
mode="${this.mobileDevice.matches ? "fullscreenTakeover" : void 0}"
>
<div id="sidenav">
<div>
<h2>${this.title}</h2>
<slot></slot>
<div id="content">
<div id="sidenav">
<div>
<h2>${this.title}</h2>
<slot></slot>
</div>
<sp-link href="#" @click="${this.closeModal}"
>${this.closeText || "Close"}</sp-link
>
</div>
</div>
</sp-dialog-wrapper>
</sp-dialog-base>
</sp-theme>
`;
}
Expand All @@ -414,15 +495,22 @@
<slot></slot
></sp-theme>`;
}
get dialog() {
return this.shadowRoot.querySelector("sp-dialog-base");
}
closeModal(e) {
e.preventDefault();
this.dialog?.close();
}
openModal() {
this.updateComplete.then(async () => {
const content = this.shadowRoot.querySelector("sp-dialog-wrapper");
const options = {
trigger: this.#target,
type: "modal"
notImmediatelyClosable: true,
type: "auto"
};
const overlay = await window.__merch__spectrum_Overlay.open(
content,
this.dialog,
options
);
overlay.addEventListener("close", () => {
Expand Down
Loading
Loading