Compare commits

..

14 Commits

Author SHA1 Message Date
3558b6f575 feat(carousel): add size probe for responsive layout and optimize item width calculation 2026-09-24 15:42:44 -03:00
f4959e0250 feat(carousel): enhance circular layout handling and optimize page creation logic 2026-09-24 15:20:57 -03:00
ee1420801d feat(store-home-page): implement lazy loading for product thumbnails and enhance deferred loading for sections 2026-09-24 14:12:30 -03:00
4b9343a867 Merge branch 'tenant/onticket' into homologacion 2026-09-23 15:45:46 -03:00
114a986205 Merge pull request 'tenant/onticket' (#8) from tenant/onticket into homologacion
Reviewed-on: https://gitea.quo.ar/tbianchini/shopit-front/pulls/8
2026-09-23 18:43:51 +00:00
b320501650 style(simple-modal): adjust heading styles for improved readability
style(toast-container): reduce gap between toast items for better spacing
2026-09-23 15:18:52 -03:00
2162ae3963 feat(store-header): enhance search functionality with responsive styles and improved visibility 2026-09-23 12:16:18 -03:00
92cc1c0275 feat(store-header): enhance immersive header styles and adjust background handling for better visual consistency 2026-09-23 12:04:23 -03:00
ed806abb9f feat(event-detail): adjust product layout and quantity selector styles for improved responsiveness 2026-09-23 11:55:10 -03:00
321f2c08cd feat(event-detail): restructure layout and enhance styles for better responsiveness 2026-09-23 11:48:24 -03:00
9ba3b24b7e feat(store-header): enhance search functionality and improve mobile layout with new styles 2026-09-23 11:39:36 -03:00
b8b5292200 feat(store-header): enhance mobile layout with improved spacing and responsive styles 2026-09-23 10:39:10 -03:00
e8602cca13 feat(store-header): adjust padding, margin, and font styles for improved layout and readability 2026-09-23 10:39:00 -03:00
36fda9f7ea feat(store-header): integrate immersive categories within the header and update styles for improved layout 2026-09-23 10:29:47 -03:00
24 changed files with 604 additions and 162 deletions

View File

@@ -31,7 +31,13 @@
<div class="immersive-header__actions">
@if (displaySearchBar()) {
<form class="immersive-header__search" role="search" (submit)="submitSearch($event)">
<form
id="immersive-search"
class="immersive-header__search"
[class.immersive-header__search--open]="isSearchOpen()"
role="search"
(submit)="submitSearch($event)"
>
<label class="visually-hidden" for="immersive-search-input">Buscar productos</label>
<app-input
id="immersive-search-input"
@@ -62,6 +68,20 @@
}
}
@if (!showHero() && displaySearchBar()) {
<button
#searchToggle
type="button"
class="immersive-header__search-toggle"
aria-label="Buscar productos"
aria-controls="immersive-search"
[attr.aria-expanded]="isSearchOpen()"
(click)="toggleSearch()"
>
<i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
</button>
}
@if (displayCart()) {
<app-cart-icon
[quantity]="cartDisabled() ? null : cartQuantity()"
@@ -81,13 +101,19 @@
[ariaExpanded]="isUserDropdownOpen()"
(clicked)="toggleUserDropdown()"
/>
@if (isUserDropdownOpen()) {
@if (isUserDropdownOpen() && isAuthenticated()) {
<app-user-dropdown
id="immersive-user-dropdown"
[user]="user()"
[accountNavigationMenus]="accountNavigationMenus()"
(logoutClick)="onLogoutClick()"
/>
} @else if (isUserDropdownOpen()) {
<div id="immersive-user-dropdown" class="immersive-header__guest-menu">
<button type="button" (click)="isUserDropdownOpen.set(false); loginClick.emit()">
Iniciar sesión
</button>
</div>
}
</div>
</div>
@@ -119,5 +145,7 @@
/>
}
}
<ng-content />
</div>
</header>

View File

@@ -7,7 +7,6 @@
display: grid;
grid-template-columns: minmax(0, 1fr);
isolation: isolate;
min-height: 640px;
color: #fff;
background: #f5f5f5;
}
@@ -18,7 +17,7 @@
z-index: 1;
min-width: 0;
padding-top: clamp(1.75rem, 4vw, 2.5rem);
padding-bottom: 0.5rem;
padding-bottom: clamp(1rem, 2vw, 1.5rem);
}
.immersive-header__backdrop {
@@ -136,11 +135,13 @@
.immersive-header__title {
margin: -0.15rem 0 0;
font-size: 140px;
line-height: 1.05;
line-height: 0.7;
}
.immersive-header__description {
margin: 1.15rem 0 0;
font-size: clamp(0.75rem, 1.4vw, 0.95rem);
margin: 30px 0 0;
font-family: 'Gotham Book', sans-serif;
font-size: 18px;
font-weight: 300;
text-shadow: 0 1px 5px rgba(0, 0, 0, 0.6);
}
.immersive-header__timer {
@@ -158,10 +159,86 @@
}
.immersive-header--compact {
min-height: 0;
padding-bottom: 1.5rem;
min-height: 115px;
color: #666666;
background: transparent;
.immersive-header__content {
padding: 35px 0 36px;
}
.immersive-header__nav {
flex-wrap: nowrap;
gap: 0.75rem;
min-height: 44px;
}
.immersive-header__brand img {
width: clamp(92px, 24vw, 145px);
}
.immersive-header__actions {
flex: 0 1 auto;
gap: 0.375rem;
}
}
.immersive-header__search-toggle {
display: none;
flex: none;
align-items: center;
justify-content: center;
width: 32px;
height: 44px;
padding: 0;
border: 0;
border-radius: 4px;
background: transparent;
color: #888;
font-size: 20px;
&:focus-visible {
outline: 2px solid var(--tenant-primary);
outline-offset: 2px;
}
}
.immersive-header__guest-menu {
position: absolute;
top: calc(100% + 0.5rem);
right: 0;
min-width: 180px;
padding: 0.5rem;
border-radius: 6px;
background: #fff;
box-shadow: 0 4px 16px #0002;
button {
width: 100%;
padding: 0.75rem;
border: 0;
background: transparent;
color: #666;
text-align: left;
}
}
:host ::ng-deep .immersive-header--compact {
.immersive-header__tickets {
flex: none;
width: auto;
.btn {
min-width: 120px;
white-space: nowrap;
}
}
.immersive-header__account .icon-btn {
width: 32px;
height: 44px;
color: #888;
}
}
.immersive-header--compact .immersive-header__backdrop {
display: none;
@@ -169,7 +246,18 @@
:host ::ng-deep .immersive-header--compact .immersive-header__actions .icon-btn,
:host ::ng-deep .immersive-header--compact .immersive-header__actions .cart-icon {
color: #666666;
color: #888;
}
@media (max-width: 359.98px) {
.immersive-header--compact .immersive-header__nav {
padding-inline: 1rem !important;
gap: 0.375rem;
}
.immersive-header--compact .immersive-header__actions {
gap: 0.125rem;
}
}
@media (max-width: 600px) {
@@ -196,6 +284,34 @@
}
@media (max-width: 767.98px) {
.immersive-header--compact {
.immersive-header__search {
position: absolute;
top: calc(100% + 0.5rem);
right: 8vw;
display: none;
width: min(320px, 84vw);
padding: 0.75rem;
border-radius: 6px;
background: #f5f5f5;
box-shadow: 0 4px 16px #0002;
}
.immersive-header__search--open {
display: block;
}
.immersive-header__search-error {
position: static;
display: block;
margin-top: 0.25rem;
}
.immersive-header__search-toggle {
display: inline-flex;
}
}
.immersive-header:not(.immersive-header--compact) {
min-height: 0;
@@ -203,7 +319,8 @@
display: grid;
grid-template-columns: minmax(0, 1fr) auto auto;
align-items: center;
padding: 1.25rem 0 0;
align-content: start;
padding: 1.875rem 0 1.5rem;
}
// Keep one search form while placing it below the hero copy on mobile.
@@ -236,7 +353,7 @@
.immersive-header__copy {
grid-area: 3 / 1 / auto / -1;
margin: 1rem 0 0;
margin: 1.25rem 0 0;
}
.immersive-header__eyebrow {
@@ -244,18 +361,21 @@
}
.immersive-header__title {
font-size: clamp(42px, 13vw, 64px);
line-height: 0.95;
font-size: clamp(40px, 12vw, 56px);
line-height: 0.7;
}
.immersive-header__description {
margin-top: 2rem;
margin-top: 30px;
font-size: clamp(11px, 3vw, 14px);
line-height: 1.5;
color: #666;
text-shadow: none;
}
.immersive-header__search {
grid-area: 4 / 1 / auto / -1;
width: 76%;
width: 74%;
max-width: 28rem;
margin: 0.5rem auto 0;
}
@@ -264,11 +384,11 @@
right: auto;
left: 0;
width: 100%;
color: #fff;
color: var(--tenant-danger, #dc3545);
}
app-continuous-image-carousel {
grid-area: 5 / 1 / auto / -1;
grid-area: 6 / 1 / auto / -1;
margin-top: 1.5rem;
--carousel-card-width: 27vw;
--carousel-gap: 3.3vw;
@@ -280,6 +400,9 @@
}
.immersive-header__backdrop {
// Keep the fade tied to the hero, independent of the content below it.
align-self: start;
height: 12.5rem;
// Fade the entire layer so its dark base cannot leave a subpixel seam.
mask-image: linear-gradient(#000 calc(100% - 8px), transparent 100%);
}
@@ -287,10 +410,10 @@
.immersive-header__backdrop::after {
background: linear-gradient(
180deg,
rgba(0, 0, 0, 0.45) 0%,
rgba(0, 0, 0, 0.15) 55%,
rgba(245, 245, 245, 0.55) 75%,
#f5f5f5 95%,
rgba(0, 0, 0, 0.25) 0%,
rgba(245, 245, 245, 0.1) 30%,
rgba(245, 245, 245, 0.65) 65%,
#f5f5f5 98%,
#f5f5f5 100%
);
}
@@ -300,10 +423,10 @@
.immersive-header__search .form-control {
min-height: 36px;
padding: 0.25rem 2.5rem 0.25rem 0.75rem;
border: 1px solid rgba(255, 255, 255, 0.85);
border: 1px solid #888;
border-radius: 3px;
background: transparent;
color: #fff;
color: #666;
font-size: 16px;
&::placeholder {
@@ -311,13 +434,13 @@
}
&:focus-visible {
outline: 2px solid #fff;
outline: 2px solid #666;
outline-offset: 2px;
}
}
.immersive-header__search .input-search-icon {
color: #fff;
color: #666;
right: 0.75rem;
}

View File

@@ -7,6 +7,8 @@ import {
input,
output,
signal,
afterRenderEffect,
viewChild,
} from '@angular/core';
import { RouterLink } from '@angular/router';
import { AuthUser } from '../../../services/auth/auth.interfaces';
@@ -59,6 +61,20 @@ export class ImmersiveStoreHeaderComponent {
protected searchTerm = '';
protected readonly showSearchError = signal(false);
protected readonly isUserDropdownOpen = signal(false);
protected readonly isSearchOpen = signal(false);
private readonly searchInput = viewChild(InputComponent);
private readonly searchToggle = viewChild<ElementRef<HTMLButtonElement>>('searchToggle');
constructor() {
afterRenderEffect(() => {
if (this.isSearchOpen()) this.searchInput()?.focus();
});
}
protected toggleSearch(): void {
this.isUserDropdownOpen.set(false);
this.isSearchOpen.update((open) => !open);
}
protected readonly checkoutRemainingTime = computed(() => {
const seconds = this.checkoutRemainingSeconds();
if (seconds === null) return null;
@@ -76,11 +92,13 @@ export class ImmersiveStoreHeaderComponent {
return;
}
this.showSearchError.set(false);
this.isSearchOpen.set(false);
this.searchSubmit.emit(term);
}
protected toggleUserDropdown(): void {
if (!this.isAuthenticated()) {
this.isSearchOpen.set(false);
if (this.showHero() && !this.isAuthenticated()) {
this.loginClick.emit();
return;
}
@@ -100,11 +118,14 @@ export class ImmersiveStoreHeaderComponent {
protected onDocumentClick(event: MouseEvent): void {
if (event.target instanceof Node && !this.host.nativeElement.contains(event.target)) {
this.isUserDropdownOpen.set(false);
this.isSearchOpen.set(false);
}
}
@HostListener('document:keydown.escape')
protected onEscapeKey(): void {
if (this.isSearchOpen()) this.searchToggle()?.nativeElement.focus();
this.isSearchOpen.set(false);
this.isUserDropdownOpen.set(false);
}
}

View File

@@ -6,10 +6,6 @@
background-size: cover;
}
.store-layout__header-main {
border-bottom: 1px solid var(--border-color);
}
.store-layout__categories {
height: 3.5rem;
}

View File

@@ -20,7 +20,17 @@
(loginClick)="loginClick.emit()"
(logoutClick)="logoutClick.emit()"
(searchSubmit)="searchSubmit.emit($event)"
/>
>
@if (showHero() && displayCategories() && categories().length) {
<nav class="immersive-categories" aria-label="Categorías">
<app-horizontal-carousel
[items]="categoryItems()"
ariaLabel="Categorías"
(itemSelect)="onCategoryItemSelect($event)"
/>
</nav>
}
</app-immersive-store-header>
}
@default {
<ng-container *ngTemplateOutlet="standardHeader" />
@@ -50,13 +60,3 @@
(categorySelect)="categorySelect.emit($event)"
/>
</ng-template>
@if (headerType() === 'immersive' && displayCategories() && categories().length) {
<nav class="immersive-categories" aria-label="Categor<6F>as">
<app-horizontal-carousel
[items]="categoryItems()"
ariaLabel="Categor<6F>as"
(itemSelect)="onCategoryItemSelect($event)"
/>
</nav>
}

View File

@@ -8,45 +8,43 @@ app-immersive-store-header {
}
:host(.immersive-shell--compact) {
position: relative;
background-color: #f5f5f5;
background-position: center 42%;
background-size: cover;
}
background-image: none !important;
:host(.immersive-shell--compact) .immersive-categories {
border: 0;
box-shadow: none;
background: transparent;
}
:host(.immersive-shell--compact) .immersive-categories::after {
content: '';
position: absolute;
z-index: 1;
right: 0;
bottom: -1px;
left: 0;
height: 2px;
background: #f5f5f5;
pointer-events: none;
&::before {
content: '';
position: absolute;
inset: 0;
pointer-events: none;
background-image: var(--compact-header-background);
background-position: left top, center 42%;
background-size: 100% 100%, cover;
background-repeat: no-repeat;
mask-image: linear-gradient(#000 calc(100% - 12px), transparent calc(100% - 4px));
}
}
.immersive-categories {
position: relative;
z-index: 0;
z-index: 1;
width: 100%;
margin-top: clamp(5rem, 11vw, 9rem);
padding: 0.375rem 1rem;
background: #f5f5f5;
background: transparent;
color: #666;
font-size: 15px;
font-weight: 700;
--horizontal-carousel-gap: clamp(1rem, 3vw, 2.5rem);
--horizontal-carousel-gap: 90px;
--horizontal-carousel-text-transform: uppercase;
}
@media (max-width: 767.98px) {
.immersive-categories {
padding: 1rem 0.25rem 0;
grid-area: 5 / 1 / auto / -1;
min-width: 0;
margin-top: 1.5rem;
padding: 0 1rem;
font-size: clamp(10px, 2.8vw, 12px);
--horizontal-carousel-visible-items: 3;
--horizontal-carousel-gap: 0.5rem;

View File

@@ -24,7 +24,8 @@ export type StoreHeaderType = 'standard' | 'immersive';
styleUrl: './store-header.component.scss',
host: {
'[class.immersive-shell--compact]': 'isCompactImmersive()',
'[style.background-image]': 'compactBackground()',
'[style.background-image]': 'null',
'[style.--compact-header-background]': 'compactBackground()',
},
})
export class StoreHeaderComponent {
@@ -41,7 +42,7 @@ export class StoreHeaderComponent {
if (!this.isCompactImmersive()) return null;
const gradient =
'linear-gradient(180deg, rgba(245, 245, 245, 0.72) 0%, rgba(245, 245, 245, 0.88) 58%, #f5f5f5 100%)';
'linear-gradient(180deg, rgba(245, 245, 245, 0.72) 0%, rgba(245, 245, 245, 0.88) 58%, #f5f5f5 calc(100% - 4px), #f5f5f5 100%)';
const image = this.backgroundImageUrl();
return image ? `${gradient}, url(${JSON.stringify(image)})` : gradient;
});

View File

@@ -332,7 +332,7 @@ describe('StoreLayoutComponent', () => {
expect(element.querySelector('[data-testid="store-header-tickets"]')).not.toBeNull();
});
it('shows immersive categories below the header and navigates on selection', () => {
it('shows immersive categories inside the header and navigates on selection', () => {
tenantState.set({
...tenant,
header_type: 'immersive',
@@ -362,7 +362,7 @@ describe('StoreLayoutComponent', () => {
expect(header).not.toBeNull();
expect(categories).not.toBeNull();
expect(header?.contains(categories)).toBe(false);
expect(header?.contains(categories)).toBe(true);
expect(categoryButton?.textContent?.trim()).toBe('MÚSICA');
const navigate = vi.spyOn(TestBed.inject(Router), 'navigate');

View File

@@ -62,7 +62,13 @@
(click)="selectImage(idx)"
[attr.aria-label]="'Select image ' + (idx + 1)"
>
<img [src]="image" alt="Product thumbnail" class="w-100 h-100 object-fit-cover" />
<img
[src]="image"
alt="Product thumbnail"
loading="lazy"
decoding="async"
class="w-100 h-100 object-fit-cover"
/>
</button>
}
</div>

View File

@@ -1,6 +1,6 @@
@if (event(); as item) {
<div class="event-detail row gx-sm-4 gx-lg-5">
<aside class="event-detail__sidebar col-12 col-sm-4">
<div class="event-detail">
<aside class="event-detail__sidebar">
<div class="event-detail__image" [class.event-detail__image--placeholder]="!item.image">
@if (item.image) {
<img [src]="item.image" [alt]="item.title" />
@@ -12,37 +12,9 @@
@if (item.starts_at) {
<app-counter-to [startsAt]="item.starts_at" />
}
@if (item.description) {
<section class="event-detail__description" aria-labelledby="event-description-title">
<h2 id="event-description-title">Descripción</h2>
<p>{{ item.description }}</p>
</section>
}
@if (item.social_media?.length) {
<section class="event-detail__social" aria-labelledby="event-social-title">
<h2 id="event-social-title">Información</h2>
@for (social of item.social_media; track social.code) {
<a [href]="social.url" target="_blank" rel="noopener noreferrer">
<i [class]="socialIcon(social.code)" aria-hidden="true"></i>
<span>{{ socialLabel(social.code) }}</span>
</a>
}
</section>
}
@if (mapLocations().length) {
<app-location-map
class="event-detail__map"
[locations]="mapLocations()"
ariaLabel="Ubicación del evento"
mapStyle="standard"
/>
}
</aside>
<main class="event-detail__main col-12 col-sm-8">
<main class="event-detail__main">
<header class="event-detail__header">
<h1>{{ item.title }}</h1>
@if (item.subtitle) { <p class="event-detail__subtitle">{{ item.subtitle }}</p> }
@@ -105,6 +77,36 @@
}
</section>
</main>
<aside class="event-detail__details">
@if (item.description) {
<section class="event-detail__description" aria-labelledby="event-description-title">
<h2 id="event-description-title">Descripción</h2>
<p>{{ item.description }}</p>
</section>
}
@if (item.social_media?.length) {
<section class="event-detail__social" aria-labelledby="event-social-title">
<h2 id="event-social-title">Información</h2>
@for (social of item.social_media; track social.code) {
<a [href]="social.url" target="_blank" rel="noopener noreferrer">
<i [class]="socialIcon(social.code)" aria-hidden="true"></i>
<span>{{ socialLabel(social.code) }}</span>
</a>
}
</section>
}
@if (mapLocations().length) {
<app-location-map
class="event-detail__map"
[locations]="mapLocations()"
ariaLabel="Ubicación del evento"
mapStyle="standard"
/>
}
</aside>
</div>
} @else if (!loading()) {
<p role="alert">No encontramos este evento.</p>

View File

@@ -1,6 +1,9 @@
:host { display: block; color: #666666; }
.event-detail { margin-bottom: 3rem; }
.event-detail { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 2fr); column-gap: 1.5rem; margin-bottom: 3rem; }
.event-detail__sidebar, .event-detail__main { min-width: 0; }
.event-detail__sidebar { grid-column: 1; grid-row: 1; }
.event-detail__main { grid-column: 2; grid-row: 1 / span 2; }
.event-detail__details { min-width: 0; grid-column: 1; grid-row: 2; }
.event-detail__image { background: #e7e8e9; }
.event-detail__image--placeholder { aspect-ratio: 1.43; display: grid; place-items: center; }
.event-detail__image img { width: 100%; height: auto; display: block; }
@@ -34,10 +37,40 @@
.event-detail__buttons { display: flex; justify-content: flex-end; gap: .5rem; margin-top: 1.6rem; }
.event-detail__buttons app-button { min-width: 0; flex: 0 0 36%; }
.event-detail__empty { color: #7c8286; font-size: .85rem; }
@media (min-width: 992px) {
.event-detail { column-gap: 3rem; }
}
@media (max-width: 575.98px) {
.event-detail { grid-template-columns: minmax(0, 1fr); }
.event-detail__sidebar, .event-detail__main, .event-detail__details { grid-column: 1; grid-row: auto; }
.event-detail__main { margin-top: 2rem; }
.event-detail__date-select { width: 100%; }
.event-detail__description, .event-detail__social { margin-top: 1.5rem; }
.event-detail__header { min-height: 0; margin-bottom: 2rem; }
.event-detail__buttons { flex-wrap: wrap; }
.event-detail__buttons app-button { flex: 1 1 100%; }
.event-detail__header h1 { font-size: 20px; }
.event-detail__product-list { gap: 42px; }
.event-detail__product {
display: grid;
grid-template-columns: minmax(0, 1fr) 96px 72px;
column-gap: 26px;
margin-inline: 0;
}
.event-detail__product > * { width: auto; margin-top: 0; padding-inline: 0; }
.event-detail__product h3 { align-self: center; font-size: 13px; }
.event-detail__product-action { margin-left: 0 !important; }
.event-detail__product-action app-quantity-selector {
--quantity-selector-width: 96px;
--quantity-selector-height: 32px;
--quantity-selector-button-width: 28px;
--quantity-selector-button-font-size: 14px;
--quantity-selector-value-font-size: 14px;
}
.event-detail__price { align-self: center; font-size: 14px; }
.event-detail__total { margin-top: 44px; padding-top: 25px; font-size: 13px; }
.event-detail__total strong { font-size: 20px; }
.event-detail__buttons { gap: 10px; margin-top: 44px; }
.event-detail__buttons app-button {
--app-button-min-height: 50px;
flex: 1 1 0;
}
}

View File

@@ -23,24 +23,49 @@
</p>
} @else {
@for (group of catalog(); track group.id; let first = $first) {
<app-store-section [attr.id]="group.code" [title]="group.title">
<app-product-list
[layout]="group.layout"
[groupLayout]="group.group_layout"
[items]="group.items"
[loading]="isGroupLoading(group.id)"
[loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
[prioritizeFirstImage]="first && !hasMainCarouselImages()"
[unavailableVariantIds]="unavailableVariantIds()"
[savingProductIds]="savingProductIds()"
(buy)="onBuyProduct($event)"
(addToCart)="onAddToCart($event)"
(pageChange)="onPageChange(group.id, $event)"
@if (first) {
<ng-container
[ngTemplateOutlet]="catalogGroup"
[ngTemplateOutletContext]="{ $implicit: group, prioritizeFirstImage: true }"
/>
</app-store-section>
} @else {
@defer (on viewport; prefetch on idle) {
<ng-container
[ngTemplateOutlet]="catalogGroup"
[ngTemplateOutletContext]="{ $implicit: group, prioritizeFirstImage: false }"
/>
} @placeholder {
<section
class="store-home__deferred-group-placeholder"
[attr.aria-label]="group.title"
></section>
}
}
}
}
<ng-template
#catalogGroup
let-group
let-prioritizeFirstImage="prioritizeFirstImage"
>
<app-store-section [attr.id]="group.code" [title]="group.title">
<app-product-list
[layout]="group.layout"
[groupLayout]="group.group_layout"
[items]="group.items"
[loading]="isGroupLoading(group.id)"
[loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
[prioritizeFirstImage]="prioritizeFirstImage && !hasMainCarouselImages()"
[unavailableVariantIds]="unavailableVariantIds()"
[savingProductIds]="savingProductIds()"
(buy)="onBuyProduct($event)"
(addToCart)="onAddToCart($event)"
(pageChange)="onPageChange(group.id, $event)"
/>
</app-store-section>
</ng-template>
@if (additionalInfo(); as content) {
<app-store-section class="store-home__additional-info" title="Información adicional">
<div class="store-home__additional-info-content" [innerHTML]="content"></div>

View File

@@ -15,6 +15,13 @@ app-store-section[id] {
scroll-margin-top: 8rem;
}
.store-home__deferred-group-placeholder {
display: block;
min-height: clamp(24rem, 42vw, 34rem);
content-visibility: auto;
contain-intrinsic-size: auto 30rem;
}
:host > .store-home__additional-info:not(:first-child) {
margin-top: clamp(3rem, 6vw, 5rem);
}

View File

@@ -8,6 +8,7 @@ import {
inject,
signal,
} from '@angular/core';
import { NgTemplateOutlet } from '@angular/common';
import { HttpErrorResponse } from '@angular/common/http';
import { ActivatedRoute, Router } from '@angular/router';
import { finalize, Subscription } from 'rxjs';
@@ -44,6 +45,7 @@ import {
ProductListComponent,
HeroBannerComponent,
MainCarouselComponent,
NgTemplateOutlet,
],
templateUrl: './store-home-page.component.html',
styleUrl: './store-home-page.component.scss',

View File

@@ -4,12 +4,18 @@
}
.btn {
min-height: 40px;
min-height: var(--app-button-min-height, 40px);
font-weight: 700;
font-size: 15px;
width: 100%;
}
@media (max-width: 767.98px) {
.btn {
font-size: 11px;
}
}
.btn-primary,
.btn-secondary,
.btn-danger {

View File

@@ -1,4 +1,10 @@
<section class="carousel" role="region" [attr.aria-label]="ariaLabel()">
<span
#sizeProbe
class="carousel__size-probe"
aria-hidden="true"
[style.width]="itemBasis()"
></span>
<div class="carousel__frame" [class.carousel__frame--with-controls]="hasMultipleItems()">
<div
#viewport

View File

@@ -4,8 +4,17 @@
}
.carousel {
position: relative;
width: 100%;
&__size-probe {
position: absolute;
height: 0;
visibility: hidden;
pointer-events: none;
contain: strict;
}
&__frame {
position: relative;
display: grid;

View File

@@ -1,6 +1,6 @@
import { Component, signal, TemplateRef, viewChild } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { CarouselComponent, CarouselItemContext } from './carousel.component';
interface TestItem {
@@ -16,7 +16,7 @@ interface TestItem {
</ng-template>
<app-carousel
[items]="items"
[items]="items()"
[itemTemplate]="itemTemplate"
[scrollStep]="120"
[gap]="16"
@@ -28,11 +28,11 @@ interface TestItem {
class TestHostComponent {
readonly circular = signal(false);
readonly items: TestItem[] = [
readonly items = signal<TestItem[]>([
{ id: 1, label: 'Primero' },
{ id: 2, label: 'Segundo' },
{ id: 3, label: 'Tercero' },
];
]);
readonly carousel = viewChild.required(CarouselComponent<TestItem>);
readonly itemTemplate =
@@ -41,8 +41,47 @@ class TestHostComponent {
describe('CarouselComponent', () => {
let fixture: ComponentFixture<TestHostComponent>;
let frames: Map<number, FrameRequestCallback>;
let resize: () => void;
let disconnect: ReturnType<typeof vi.fn>;
const flushLayout = () => {
const pending = [...frames.values()];
frames.clear();
pending.forEach((callback) => callback(0));
fixture.detectChanges();
};
const setDimensions = (width: number, basis: number) => {
const host = fixture.nativeElement.querySelector('app-carousel');
Object.defineProperty(host, 'clientWidth', { configurable: true, value: width });
const probe = fixture.nativeElement.querySelector('.carousel__size-probe');
probe.getBoundingClientRect = () => ({ width: basis }) as DOMRect;
};
beforeEach(async () => {
frames = new Map();
let frameId = 0;
vi.stubGlobal(
'requestAnimationFrame',
vi.fn((callback: FrameRequestCallback) => {
frames.set(++frameId, callback);
return frameId;
}),
);
vi.stubGlobal(
'cancelAnimationFrame',
vi.fn((id: number) => frames.delete(id)),
);
disconnect = vi.fn();
vi.stubGlobal(
'ResizeObserver',
class {
constructor(callback: () => void) {
resize = callback;
}
observe() {}
disconnect = disconnect;
},
);
await TestBed.configureTestingModule({
imports: [TestHostComponent],
}).compileComponents();
@@ -51,6 +90,75 @@ describe('CarouselComponent', () => {
fixture.detectChanges();
});
afterEach(() => {
fixture.destroy();
vi.unstubAllGlobals();
});
it('agrupa las mediciones y no se realimenta al renderizar o navegar', async () => {
fixture.componentInstance.circular.set(true);
setDimensions(650, 200);
fixture.detectChanges();
resize();
resize();
expect(frames.size).toBe(1);
flushLayout();
await Promise.resolve();
expect(frames.size).toBe(0);
const carousel = fixture.componentInstance.carousel();
expect(carousel['itemsPerPage']()).toBe(2);
carousel.next();
fixture.detectChanges();
const track = fixture.nativeElement.querySelector('.carousel__track');
track.dispatchEvent(new TransitionEvent('transitionend', { propertyName: 'transform' }));
fixture.detectChanges();
await Promise.resolve();
resize(); // Same width, even if the new cards have a different height.
expect(frames.size).toBe(0);
expect(carousel['currentPage']()).toBe(1);
expect(carousel['itemWidth']()).toBe(269);
});
it('recalcula al cambiar el ancho y la base responsive de las tarjetas', () => {
setDimensions(650, 200);
resize();
flushLayout();
setDimensions(350, 200);
resize();
flushLayout();
expect(fixture.componentInstance.carousel()['itemsPerPage']()).toBe(1);
setDimensions(350, 100);
resize();
flushLayout();
expect(fixture.componentInstance.carousel()['itemsPerPage']()).toBe(2);
expect(frames.size).toBe(0);
});
it('actualiza productos y admite una lista vacía sin anchos inválidos', () => {
setDimensions(650, 200);
flushLayout();
fixture.componentInstance.items.set([]);
fixture.detectChanges();
expect(frames.size).toBe(1);
flushLayout();
const carousel = fixture.componentInstance.carousel();
expect(carousel['itemWidth']()).toBeNull();
expect(carousel['hasOverflow']()).toBe(false);
fixture.componentInstance.items.set([{ id: 4, label: 'Nuevo' }]);
fixture.detectChanges();
flushLayout();
expect(carousel['itemWidth']()).toBe(650);
expect(fixture.nativeElement.querySelectorAll('article')).toHaveLength(1);
expect(frames.size).toBe(0);
});
it('cancela mediciones pendientes y desconecta el observador al destruirse', () => {
expect(frames.size).toBe(1);
fixture.destroy();
expect(frames.size).toBe(0);
expect(disconnect).toHaveBeenCalledOnce();
});
it('renderiza el template provisto para cada elemento', () => {
const articles = fixture.nativeElement.querySelectorAll('article');
@@ -59,6 +167,17 @@ describe('CarouselComponent', () => {
expect(articles[1].getAttribute('data-index')).toBe('1');
});
it('permite inspeccionar las páginas antes de medir el viewport sin generar listas enormes', () => {
const carousel = fixture.componentInstance.carousel();
fixture.componentInstance.circular.set(true);
carousel['itemsPerPage'].set(Number.MAX_SAFE_INTEGER);
expect(carousel['circularPages']()).toEqual([]);
expect(carousel['createPage']('current', 0).items.map((entry) => entry.item.id)).toEqual([
1, 2, 3,
]);
});
it('expone una región accesible y controles con etiquetas', () => {
const region = fixture.nativeElement.querySelector('[role="region"]');
const buttons = fixture.nativeElement.querySelectorAll('button');
@@ -99,7 +218,7 @@ describe('CarouselComponent', () => {
it('usa todo el ancho y distribuye el espacio sobrante entre elementos completos', () => {
const host = fixture.nativeElement.querySelector('app-carousel') as HTMLElement;
const firstItem = fixture.nativeElement.querySelector('.carousel__item') as HTMLElement;
const firstItem = fixture.nativeElement.querySelector('.carousel__size-probe') as HTMLElement;
Object.defineProperty(host, 'clientWidth', {
configurable: true,
@@ -112,7 +231,7 @@ describe('CarouselComponent', () => {
}) as DOMRect,
);
fixture.componentInstance.carousel().ngAfterViewInit();
flushLayout();
fixture.detectChanges();
const frame = fixture.nativeElement.querySelector('.carousel__frame') as HTMLElement;
@@ -128,7 +247,7 @@ describe('CarouselComponent', () => {
fixture.detectChanges();
const host = fixture.nativeElement.querySelector('app-carousel') as HTMLElement;
const firstItem = fixture.nativeElement.querySelector('.carousel__item') as HTMLElement;
const firstItem = fixture.nativeElement.querySelector('.carousel__size-probe') as HTMLElement;
Object.defineProperty(host, 'clientWidth', {
configurable: true,
@@ -141,7 +260,7 @@ describe('CarouselComponent', () => {
}) as DOMRect,
);
fixture.componentInstance.carousel().ngAfterViewInit();
flushLayout();
fixture.detectChanges();
const pages = fixture.nativeElement.querySelectorAll('.carousel__page');

View File

@@ -1,5 +1,6 @@
import {
AfterViewInit,
afterRenderEffect,
ChangeDetectionStrategy,
Component,
DestroyRef,
@@ -10,6 +11,7 @@ import {
inject,
input,
signal,
untracked,
viewChild,
} from '@angular/core';
import { isPlatformBrowser, NgTemplateOutlet } from '@angular/common';
@@ -45,12 +47,15 @@ export class CarouselComponent<T> implements AfterViewInit {
private readonly platformId = inject(PLATFORM_ID);
private readonly host = inject<ElementRef<HTMLElement>>(ElementRef);
private readonly viewport = viewChild.required<ElementRef<HTMLElement>>('viewport');
private readonly sizeProbe = viewChild.required<ElementRef<HTMLElement>>('sizeProbe');
private layoutFrame: number | null = null;
readonly items = input.required<readonly T[]>();
readonly itemTemplate = input.required<TemplateRef<CarouselItemContext<T>>>();
readonly trackBy = input<CarouselTrackBy<T>>((index) => index);
readonly scrollStep = input<number | null>(null);
readonly gap = input(0);
readonly itemBasis = input('16rem');
readonly circular = input(false);
readonly ariaLabel = input('Carrusel');
readonly previousLabel = input('Mostrar elementos anteriores');
@@ -70,6 +75,10 @@ export class CarouselComponent<T> implements AfterViewInit {
);
protected readonly isCircularLayout = computed(() => this.circular() && this.pageCount() > 1);
protected readonly circularPages = computed<CarouselPage<T>[]>(() => {
if (!this.isCircularLayout()) {
return [];
}
const pageCount = this.pageCount();
const currentPage = this.normalizePage(this.currentPage(), pageCount);
@@ -86,27 +95,51 @@ export class CarouselComponent<T> implements AfterViewInit {
() => !this.hasOverflow() || (!this.circular() && !this.canScrollNext()),
);
constructor() {
afterRenderEffect(() => {
this.items();
this.gap();
this.circular();
this.itemBasis();
this.itemTemplate();
// Layout outputs must never become dependencies of this effect.
untracked(() => this.scheduleLayout());
});
}
private scheduleLayout(): void {
if (this.destroyRef.destroyed || this.layoutFrame !== null) return;
this.layoutFrame = requestAnimationFrame(() => {
this.layoutFrame = null;
this.refreshLayout();
});
}
ngAfterViewInit(): void {
if (!isPlatformBrowser(this.platformId)) {
return;
}
const viewport = this.viewport().nativeElement;
this.refreshLayout();
let previousWidth = -1;
let previousBasis = -1;
const resizeObserver =
typeof ResizeObserver === 'undefined' ? null : new ResizeObserver(() => this.refreshLayout());
resizeObserver?.observe(this.host.nativeElement);
const mutationObserver =
typeof MutationObserver === 'undefined'
typeof ResizeObserver === 'undefined'
? null
: new MutationObserver(() => this.refreshLayout());
mutationObserver?.observe(viewport, { childList: true, subtree: true });
: new ResizeObserver(() => {
const width = this.host.nativeElement.clientWidth;
const basis = this.sizeProbe().nativeElement.getBoundingClientRect().width;
// Image loads and page rotation can change height, but not the layout inputs.
if (width === previousWidth && basis === previousBasis) return;
previousWidth = width;
previousBasis = basis;
this.scheduleLayout();
});
resizeObserver?.observe(this.host.nativeElement);
resizeObserver?.observe(this.sizeProbe().nativeElement);
this.destroyRef.onDestroy(() => {
resizeObserver?.disconnect();
mutationObserver?.disconnect();
if (this.layoutFrame !== null) cancelAnimationFrame(this.layoutFrame);
});
}
@@ -218,24 +251,32 @@ export class CarouselComponent<T> implements AfterViewInit {
}
private refreshLayout(): void {
const viewport = this.viewport().nativeElement;
const firstItem = viewport.querySelector<HTMLElement>('.carousel__item');
const itemCount = this.items().length;
const availableWidth = this.host.nativeElement.clientWidth;
const availableViewportWidth = Math.max(
availableWidth - (this.hasMultipleItems() ? CarouselComponent.CONTROL_SLOT_WIDTH * 2 : 0),
0,
);
if (!firstItem || availableViewportWidth <= 0) {
if (itemCount === 0) {
this.itemsPerPage.set(1);
this.currentPage.set(0);
this.transitionDirection.set(0);
this.itemWidth.set(null);
this.hasOverflow.set(false);
this.canScrollPrevious.set(false);
this.canScrollNext.set(false);
return;
}
if (availableViewportWidth <= 0) {
this.itemWidth.set(null);
this.refreshNavigation();
return;
}
const assignedWidth = firstItem.style.width;
firstItem.style.width = '';
const naturalItemWidth = firstItem.getBoundingClientRect().width;
firstItem.style.width = assignedWidth;
// Measure a stable CSS basis, never a card whose content/width we just changed.
const naturalItemWidth = this.sizeProbe().nativeElement.getBoundingClientRect().width;
if (naturalItemWidth <= 0) {
this.itemWidth.set(null);
@@ -244,9 +285,9 @@ export class CarouselComponent<T> implements AfterViewInit {
}
const gap = this.resolvedGap();
const fittingItems = Math.max(
1,
Math.floor((availableViewportWidth + gap) / (naturalItemWidth + gap)),
const fittingItems = Math.min(
itemCount,
Math.max(1, Math.floor((availableViewportWidth + gap) / (naturalItemWidth + gap))),
);
const visibleItems = Math.min(fittingItems, this.items().length);
const distributedItemWidth =
@@ -258,7 +299,12 @@ export class CarouselComponent<T> implements AfterViewInit {
this.transitionDirection.set(0);
}
this.itemWidth.set(distributedItemWidth);
if (this.itemWidth() !== distributedItemWidth) this.itemWidth.set(distributedItemWidth);
const normalizedPage = this.normalizePage(this.currentPage(), this.pageCount());
if (normalizedPage !== this.currentPage()) {
this.currentPage.set(normalizedPage);
this.transitionDirection.set(0);
}
if (this.circular()) {
const hasOverflow = this.items().length > fittingItems;
this.hasOverflow.set(hasOverflow);
@@ -270,14 +316,20 @@ export class CarouselComponent<T> implements AfterViewInit {
}
private createPage(slot: CarouselPage<T>['slot'], page: number): CarouselPage<T> {
const sourceItems = this.items();
// Layout has not necessarily been measured when a computed value is inspected.
const pageSize = Math.min(this.itemsPerPage(), sourceItems.length);
if (pageSize === 0) {
return { slot, items: [] };
}
const pageCount = this.pageCount();
const normalizedPage = this.normalizePage(page, pageCount);
const start = normalizedPage * this.itemsPerPage();
const start = normalizedPage * pageSize;
const items: CarouselPageItem<T>[] = [];
for (let offset = 0; offset < this.itemsPerPage(); offset += 1) {
const index = (start + offset) % this.items().length;
items.push({ item: this.items()[index], index });
for (let offset = 0; offset < pageSize; offset += 1) {
const index = (start + offset) % sourceItems.length;
items.push({ item: sourceItems[index], index });
}
return { slot, items };

View File

@@ -1,5 +1,5 @@
:host { display: block; margin-top: 9px; }
.counter-to { min-height: 30px; padding-block: 12px; display: grid; grid-template-columns: repeat(4, 1fr); align-items: center; text-align: center; border: 1px solid #d7d9db; border-radius: 3px; }
.counter-to { min-height: 30px; padding-block: 12px; display: grid; grid-template-columns: repeat(4, 1fr); align-items: center; text-align: center; border: 1px solid #a0a0a0; border-radius: 3px; }
.counter-to > div + div { border-left: 1px solid #e6e7e8; }
.counter-to strong { display: block; color: #666666; font-size: 16px; font-weight: 700; line-height: 1.1; }
.counter-to small { display: block; margin-top: 1px; color: #666666; font-size: 11px; font-weight: 400; letter-spacing: .02em; }

View File

@@ -67,6 +67,9 @@
[itemTemplate]="productItem"
[trackBy]="trackProduct"
[gap]="24"
[itemBasis]="
effectiveLayout() === 'row' ? 'clamp(18rem, 70vw, 32rem)' : 'clamp(15rem, 30vw, 18rem)'
"
[circular]="true"
ariaLabel="Productos destacados"
/>

View File

@@ -4,16 +4,16 @@
.quantity-selector {
border: 1px solid var(--border-color);
width: 78px;
height: 40px;
min-height: 40px;
width: var(--quantity-selector-width, 78px);
height: var(--quantity-selector-height, 40px);
min-height: var(--quantity-selector-height, 40px);
background-color: #ffffff;
box-sizing: border-box;
&__button {
width: 24px;
width: var(--quantity-selector-button-width, 24px);
height: 100%;
font-size: 20px;
font-size: var(--quantity-selector-button-font-size, 20px);
color: #6f6f6f;
background-color: #ffffff;
transition:
@@ -34,7 +34,7 @@
}
&__value {
font-size: 16px;
font-size: var(--quantity-selector-value-font-size, 16px);
color: #6f6f6f;
}

View File

@@ -11,6 +11,11 @@
line-height: 1.5;
}
h2.simple-modal__content {
font-size: 15px;
font-weight: bold;
}
.simple-modal__actions {
display: flex;
justify-content: center;

View File

@@ -2,7 +2,7 @@
z-index: 1500;
display: flex;
flex-direction: column;
gap: 0.5rem;
gap: 0.25rem;
pointer-events: none;
width: 90vw;
max-width: 800px;