Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
83 changes: 46 additions & 37 deletions elements/app-hax/lib/v2/app-hax-search-results.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,12 @@ export class AppHaxSearchResults extends SimpleColors {
display: flex;
align-items: center;
justify-content: flex-start;
width: 96vw;
gap: var(--ddd-spacing-6, 24px);
width: 90vw;
max-width: 1200px;
margin: 0 auto;
max-height: 280px;
position: relative;
border-radius: var(--ddd-radius-md, 8px);
border: var(--ddd-border-xs, 1px solid)
var(--ddd-theme-default-limestoneLight, #e4e5e7);
box-shadow: var(--ddd-boxShadow-sm);
overflow: visible;
}
.pager-container {
Expand All @@ -110,7 +109,7 @@ export class AppHaxSearchResults extends SimpleColors {
color: var(--ddd-theme-default-white, white);
border: var(--ddd-border-sm, 2px solid)
white;
border-radius: var(--ddd-radius-sm, 4px);
border-radius: var(--ddd-radius-circle);
padding: var(--ddd-spacing-4, 16px);
cursor: pointer;
height: var(--ddd-spacing-12);
Expand All @@ -124,22 +123,18 @@ export class AppHaxSearchResults extends SimpleColors {
z-index: 10;
position: relative;
}
.scroll-right {
margin-right: 0;
}

:host([dark]) .scroll-left,
:host([dark]) .scroll-right,
body.dark-mode .scroll-left,
body.dark-mode .scroll-right {
background: var(--ddd-theme-default-keystoneYellow, #ffd100);
background: var(--ddd-theme-default-accent);
color: var(--ddd-theme-default-nittanyNavy, #001e44);
border-color: var(--ddd-theme-default-white, white);
}

.scroll-left:hover:not(:disabled),
.scroll-right:hover:not(:disabled) {
background: var(--ddd-theme-default-keystoneYellow, #ffd100);
background: var(--ddd-theme-default-accent);
color: var(--ddd-theme-default-nittanyNavy, #001e44);
transform: translateY(-2px);
box-shadow: var(--ddd-boxShadow-md);
Expand All @@ -160,8 +155,8 @@ export class AppHaxSearchResults extends SimpleColors {
:host([dark]) .scroll-right:hover:not(:disabled),
body.dark-mode .scroll-left:hover:not(:disabled),
body.dark-mode .scroll-right:hover:not(:disabled) {
background: var(--ddd-theme-default-nittanyNavy, #001e44);
color: var(--ddd-theme-default-white, white);
background: var(--ddd-theme-default-white, white);
color: var(--ddd-theme-default-nittanyNavy, #001e44);
}

:host([dark]) .scroll-left:disabled,
Expand All @@ -170,19 +165,18 @@ export class AppHaxSearchResults extends SimpleColors {
body.dark-mode .scroll-right:disabled {
opacity: 0.3;
cursor: not-allowed;
background: var(--ddd-theme-default-coalyGray, #444);
color: var(--ddd-theme-default-slateGray, #666);
border-color: var(--ddd-theme-default-coalyGray, #444);
background: var(--ddd-theme-default-limestoneGray, #a2aaad);
color: var(--ddd-theme-default-coalyGray, #444);
}

#results {
display: flex;
flex-wrap: nowrap;
overflow-x: auto;
overflow-y: hidden;
scroll-snap-type: x mandatory;
gap: var(--ddd-spacing-6, 24px);
padding: var(--ddd-spacing-1, 4px) var(--ddd-spacing-2, 8px);
padding-bottom: var(--ddd-spacing-6, 24px);
padding-top: var(--ddd-spacing-6, 24px);
flex: 1;
min-width: 0;
cursor: grab;
Expand Down Expand Up @@ -309,9 +303,6 @@ export class AppHaxSearchResults extends SimpleColors {
min-width: 240px;
}

#results::after {
min-width: 240px;
}
/* Mobile: Show only 1 item, hide arrows */
.scroll-left,
.scroll-right {
Expand Down Expand Up @@ -438,7 +429,7 @@ export class AppHaxSearchResults extends SimpleColors {
id="scroll-left-btn"
class="scroll-left"
@click="${this.scrollLeft}"
?disabled="${this.currentIndex <= 1 || this.totalItems <= 1}"
?disabled="${this.isAtStart || this.totalItems <= 1}"
aria-label="Previous sites"
aria-describedby="scroll-left-desc"
>
Expand Down Expand Up @@ -517,7 +508,7 @@ export class AppHaxSearchResults extends SimpleColors {
id="scroll-right-btn"
class="scroll-right"
@click="${this.scrollRight}"
?disabled="${this.currentIndex >= this.totalItems ||
?disabled="${this.isAtEnd || this.totalItems <= 1}"
this.totalItems <= 1}"
aria-label="Next sites"
aria-describedby="scroll-right-desc"
Expand All @@ -531,26 +522,43 @@ export class AppHaxSearchResults extends SimpleColors {
`;
}

get isAtStart() {
const el = this.shadowRoot?.querySelector("#results");
return !el || el.scrollLeft <= 2; // tolerance for sub-pixel scroll
}

get isAtEnd() {
const el = this.shadowRoot?.querySelector("#results");
return (
!el ||
el.scrollLeft + el.clientWidth >= el.scrollWidth - 2
);
}

scrollLeft() {
// Don't scroll if at the beginning or only one item
if (this.currentIndex <= 1 || this.totalItems <= 1) return;
const el = this.shadowRoot.querySelector("#results");
if (!el || this.totalItems <= 1) return;

const itemWidth = 264 + 24; // item width + gap
this.shadowRoot
.querySelector("#results")
.scrollBy({ left: -itemWidth, behavior: "smooth" });
const itemWidth = 264 + 24;

// If we're close to the start, snap fully to 0
if (el.scrollLeft <= itemWidth) {
el.scrollTo({ left: 0, behavior: "smooth" });
} else {
el.scrollBy({ left: -itemWidth, behavior: "smooth" });
}
}


scrollRight() {
// Don't scroll if at the end or only one item
if (this.currentIndex >= this.totalItems || this.totalItems <= 1) return;
const el = this.shadowRoot.querySelector("#results");
if (!el || this.totalItems <= 1) return;

const itemWidth = 264 + 24; // item width + gap
this.shadowRoot
.querySelector("#results")
.scrollBy({ left: itemWidth, behavior: "smooth" });
const itemWidth = 264 + 24;
el.scrollBy({ left: itemWidth, behavior: "smooth" });
}


handlePointerStart(e) {
const resultsEl = this.shadowRoot.querySelector("#results");
this.isPointerDown = true;
Expand Down Expand Up @@ -623,6 +631,7 @@ export class AppHaxSearchResults extends SimpleColors {
this.totalItems,
);
}
this.requestUpdate();
}

goToPage(pageNumber) {
Expand Down
9 changes: 7 additions & 2 deletions elements/app-hax/lib/v2/app-hax-site-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -296,17 +296,22 @@ export class AppHaxSiteBars extends SimpleColors {
2px 2px 12px #1c1c1c,
2px 2px 12px rgba(0, 0, 0, 0.3)
);
transition: all 0.2s ease;
transition: transform 0.2s ease, box-shadow 0.2s ease, border 0.2s ease;
overflow: visible;

}

:host(:hover),
:host(:focus-within) {
transform: translateY(-2px);
border: var(--ddd-border-md);
border-color: var(--ddd-theme-default-accent);
box-shadow: light-dark(
4px 8px 24px rgba(28, 28, 28, 0.15),
4px 8px 24px rgba(0, 0, 0, 0.5)
);
transform: scale(1.03);
transform-origin: center top;
z-index: 2;
}

#mainCard {
Expand Down
7 changes: 3 additions & 4 deletions elements/app-hax/lib/v2/app-hax-use-case-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ export class AppHaxUseCaseFilter extends LitElement {
}

.template-group + .template-group {
margin-top: var(--ddd-spacing-6, 24px);
margin-top: var(--ddd-spacing-3, 12px);
}

.template-group-heading {
Expand All @@ -237,9 +237,8 @@ export class AppHaxUseCaseFilter extends LitElement {

.template-results {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
gap: var(--ddd-spacing-1, 4px);
width: 100%;
grid-template-columns: repeat(6, 1fr);
padding: 0 var(--ddd-spacing-5, 20px);
box-sizing: border-box;
}

Expand Down
Loading