fix: manifest-aware layout picker, real carousel items-per-page, hero arrows/swipe/2-panel

Sprint E: homepage section editor now filters the layout-strategy picker
to each widget's widget-manifest.json supportedLayouts instead of always
showing all 5 strategies. columns field gated to widgets that read it
(hero, product-collection carousel).

Sprint F: closes client bug report (no items-per-page control, hero
carousel not manually/automatically scrollable, no 1-2 slide big-carousel
option). Product carousel item width now driven by layout.columns
(reused, was already editable but dead). Hero widget gains prev/next
arrows, touch swipe, and 1-2 panel mode via the same field.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

src/app/features/project-editor/sections/homepage-section.component.html

@@ -38,21 +38,23 @@
               [usedByLabel]="'builder.usedByLabel' | translate"
             >
               <app-visual-layout-picker
-                [options]="layoutStrategyPickerOptions"
+                [options]="layoutOptionsFor(section)"
                 [ariaLabel]="'builder.layoutStrategyLabel' | translate"
                 [ngModel]="section.layout?.strategy || 'stack'"
                 (ngModelChange)="updateLayout(section.id, 'strategy', $event)"
               />
             </app-form-field>
-            <app-form-field
-              appHighlightSource="spacing"
-              [label]="'builder.columns' | translate"
-              [hint]="'builder.sectionColumnsDesc' | translate"
-              [usedBy]="[blockLabel(section.type)]"
-              [usedByLabel]="'builder.usedByLabel' | translate"
-            >
-              <app-input type="number" [ngModel]="section.layout?.columns || 1" (ngModelChange)="updateLayout(section.id, 'columns', $event)" />
-            </app-form-field>
+            @if (showColumnsFor(section)) {
+              <app-form-field
+                appHighlightSource="spacing"
+                [label]="'builder.columns' | translate"
+                [hint]="'builder.sectionColumnsDesc' | translate"
+                [usedBy]="[blockLabel(section.type)]"
+                [usedByLabel]="'builder.usedByLabel' | translate"
+              >
+                <app-input type="number" [ngModel]="section.layout?.columns || 1" (ngModelChange)="updateLayout(section.id, 'columns', $event)" />
+              </app-form-field>
+            }
           </div>
         </div>
 

src/app/features/project-editor/sections/homepage-section.component.ts

@@ -1,5 +1,6 @@
 import { CdkDragDrop, DragDropModule, moveItemInArray } from '@angular/cdk/drag-drop';
 import { ChangeDetectionStrategy, Component, computed, inject, signal } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 import { ProjectEditorFacade } from '../facade/project-editor.facade';
 import { TranslatePipe } from '../../../i18n/translate.pipe';
@@ -16,6 +17,8 @@ import { ConfirmDialogComponent } from '../../../shared/ui/confirm-dialog/confir
 import { FormFieldComponent } from '../../../shared/ui/form-field/form-field.component';
 import { VisualLayoutPickerComponent, VisualLayoutOption } from '../../../shared/ui/visual-layout-picker/visual-layout-picker.component';
 import { HighlightSourceDirective } from '../../../shared/ui/highlight-source/highlight-source.directive';
+import { WidgetManifestService } from '../../../widgets/registry/widget-manifest.service';
+import { WidgetLayoutSupport, WidgetManifestEntry } from '../../../widgets/contracts/widget-manifest.contract';
 
 export interface LayoutStrategyOption {
   value: 'stack' | 'grid' | 'hero' | 'carousel' | 'split';
@@ -45,6 +48,9 @@ const BLOCK_CATALOG: BlockCatalogEntry[] = [
 
 const BLOCK_BY_TYPE = new Map(BLOCK_CATALOG.map(entry => [entry.type, entry]));
 
+/** Widget componentKeys (widget-manifest.json) that read `section.layout.columns`. Keep in sync with the widget components that actually consume it - see hero-widget.component.ts and product-carousel-widget.component.ts. */
+const COMPONENT_KEYS_READING_COLUMNS = new Set(['hero', 'product-collection']);
+
 @Component({
   selector: 'app-project-editor-homepage-section',
   standalone: true,
@@ -56,7 +62,11 @@ const BLOCK_BY_TYPE = new Map(BLOCK_CATALOG.map(entry => [entry.type, entry]));
 export class ProjectEditorHomepageSectionComponent {
   private readonly facade = inject(ProjectEditorFacade);
   private readonly translate = inject(TranslateService);
+  private readonly widgetManifest = inject(WidgetManifestService);
   readonly homePage = this.facade.homepagePage;
+
+  private readonly manifestEntries = toSignal(this.widgetManifest.getWidgets(), { initialValue: [] as WidgetManifestEntry[] });
+  private readonly manifestByType = computed(() => new Map(this.manifestEntries().map(entry => [entry.type, entry])));
   readonly fieldError = (key: string): string | null => {
     const messageKey = this.facade.fieldError(key);
     return messageKey ? this.translate.t(messageKey) : null;
@@ -89,6 +99,35 @@ export class ProjectEditorHomepageSectionComponent {
     icon: this.layoutStrategyIcons[option.value],
   }));
 
+  /** Layout strategy options filtered to what the section's bound widget actually supports (widget-manifest.json `supportedLayouts`). Keeps a stale/unsupported saved value selectable instead of rendering a picker with no active card. */
+  layoutOptionsFor(section: SectionConfig): VisualLayoutOption[] {
+    const supported = this.manifestByType().get(section.type)?.supportedLayouts;
+    if (!supported || supported.length === 0) {
+      return this.layoutStrategyPickerOptions;
+    }
+    const options = this.layoutStrategyPickerOptions.filter(option => supported.includes(option.value as WidgetLayoutSupport));
+    const current = section.layout?.strategy;
+    if (current && !options.some(option => option.value === current)) {
+      const currentOption = this.layoutStrategyPickerOptions.find(option => option.value === current);
+      if (currentOption) {
+        return [...options, currentOption];
+      }
+    }
+    return options;
+  }
+
+  /** Whether the section's bound widget consumes `layout.columns` (see COMPONENT_KEYS_READING_COLUMNS). Product carousel only uses it in carousel strategy - grid mode ignores it. */
+  showColumnsFor(section: SectionConfig): boolean {
+    const componentKey = this.manifestByType().get(section.type)?.componentKey;
+    if (!componentKey || !COMPONENT_KEYS_READING_COLUMNS.has(componentKey)) {
+      return false;
+    }
+    if (componentKey === 'product-collection') {
+      return (section.layout?.strategy ?? 'stack') === 'carousel';
+    }
+    return true;
+  }
+
   blockLabel(type: string): string {
     const entry = BLOCK_BY_TYPE.get(type);
     return entry ? this.translate.t(entry.labelKey) : type;

src/app/i18n/en.ts

@@ -1116,6 +1116,8 @@ export const en: Translations = {
     slidesLabel: 'Slides',
     previousProducts: 'Previous products',
     nextProducts: 'Next products',
+    previousSlide: 'Previous slide',
+    nextSlide: 'Next slide',
     closeDialog: 'Close dialog',
     dismiss: 'Dismiss',
     qrCode: 'QR Code',

src/app/i18n/hy.ts

@@ -1116,6 +1116,8 @@ export const hy: Translations = {
     slidesLabel: 'Սլայդներ',
     previousProducts: 'Նախորդ ապրանքները',
     nextProducts: 'Հաջորդ ապրանքները',
+    previousSlide: 'Նախորդ սլայդը',
+    nextSlide: 'Հաջորդ սլայդը',
     closeDialog: 'Փակել պատուհանը',
     dismiss: 'Փակել',
     qrCode: 'QR կոդ',

src/app/i18n/ru.ts

@@ -1116,6 +1116,8 @@ export const ru: Translations = {
     slidesLabel: 'Слайды',
     previousProducts: 'Предыдущие товары',
     nextProducts: 'Следующие товары',
+    previousSlide: 'Предыдущий слайд',
+    nextSlide: 'Следующий слайд',
     closeDialog: 'Закрыть диалог',
     dismiss: 'Скрыть',
     qrCode: 'QR-код',

src/app/i18n/translations.ts

@@ -1115,6 +1115,8 @@ export interface Translations {
     slidesLabel: string;
     previousProducts: string;
     nextProducts: string;
+    previousSlide: string;
+    nextSlide: string;
     closeDialog: string;
     dismiss: string;
     qrCode: string;

src/app/widgets/ui/hero-widget.component.ts

@@ -5,6 +5,7 @@ import { HeroSlideData, HeroWidgetData } from '../contracts/widget-data.contract
 import { TranslatePipe } from '../../i18n/translate.pipe';
 
 const AUTOPLAY_INTERVAL_MS = 5000;
+const SWIPE_THRESHOLD_PX = 50;
 
 @Component({
   selector: 'app-hero-widget',
@@ -12,14 +13,40 @@ const AUTOPLAY_INTERVAL_MS = 5000;
   imports: [CommonModule, TranslatePipe],
   template: `
     <section class="hero-widget">
-      @if (activeSlide(); as slide) {
-        <h1 class="hero-widget__title">{{ slide.title }}</h1>
-        @if (slide.subtitle) {
-          <p class="hero-widget__subtitle">{{ slide.subtitle }}</p>
-        }
-        @if (slide.ctaLabel) {
-          <button type="button" class="hero-widget__cta" (click)="onCtaClick()">{{ slide.ctaLabel }}</button>
-        }
+      @if (visibleSlides().length) {
+        <div class="hero-widget__nav">
+          @if (allSlides().length > 1) {
+            <button
+              type="button"
+              class="hero-widget__arrow hero-widget__arrow--prev"
+              [attr.aria-label]="'common.previousSlide' | translate"
+              (click)="prevSlide()"
+            >&larr;</button>
+          }
+
+          <div class="hero-widget__slides" (touchstart)="onSwipeStart($event)" (touchend)="onSwipeEnd($event)">
+            @for (slide of visibleSlides(); track $index) {
+              <article class="hero-widget__slide">
+                <h2 class="hero-widget__title">{{ slide.title }}</h2>
+                @if (slide.subtitle) {
+                  <p class="hero-widget__subtitle">{{ slide.subtitle }}</p>
+                }
+                @if (slide.ctaLabel) {
+                  <button type="button" class="hero-widget__cta" (click)="onCtaClick()">{{ slide.ctaLabel }}</button>
+                }
+              </article>
+            }
+          </div>
+
+          @if (allSlides().length > 1) {
+            <button
+              type="button"
+              class="hero-widget__arrow hero-widget__arrow--next"
+              [attr.aria-label]="'common.nextSlide' | translate"
+              (click)="nextSlide()"
+            >&rarr;</button>
+          }
+        </div>
 
         @if (allSlides().length > 1) {
           <div class="hero-widget__dots" role="tablist" [attr.aria-label]="'common.slidesLabel' | translate">
@@ -49,6 +76,40 @@ const AUTOPLAY_INTERVAL_MS = 5000;
         animation: hero-widget-in 420ms ease-out both;
       }
 
+      .hero-widget__nav {
+        display: flex;
+        align-items: stretch;
+        gap: var(--space-sm, 8px);
+      }
+
+      .hero-widget__slides {
+        flex: 1;
+        min-width: 0;
+        display: flex;
+        gap: var(--space-lg, 24px);
+      }
+
+      .hero-widget__slide {
+        flex: 1 1 0;
+        min-width: 0;
+      }
+
+      .hero-widget__arrow {
+        flex-shrink: 0;
+        align-self: center;
+        width: 40px;
+        height: 40px;
+        border-radius: 50%;
+        border: 1px solid var(--border-color, #d3dad9);
+        background: #fff;
+        color: var(--text-primary, #1e3c38);
+        cursor: pointer;
+        font-size: 1rem;
+
+        &:hover { background: var(--primary-color, #497671); color: #fff; }
+        &:focus-visible { outline: 2px solid var(--primary-color, #497671); outline-offset: 2px; }
+      }
+
       .hero-widget__title {
         margin: 0 0 var(--space-sm, 8px);
         font-size: 2rem;
@@ -140,6 +201,7 @@ export class HeroWidgetComponent implements OnChanges, OnDestroy {
   readonly activeIndex = signal(0);
   private readonly dataSignal = signal<HeroWidgetData | null>(null);
   private autoplayHandle: ReturnType<typeof setInterval> | null = null;
+  private swipeStartX: number | null = null;
 
   readonly allSlides = computed<HeroSlideData[]>(() => {
     const current = this.dataSignal();
@@ -152,6 +214,25 @@ export class HeroWidgetComponent implements OnChanges, OnDestroy {
 
   readonly activeSlide = computed<HeroSlideData | null>(() => this.allSlides()[this.activeIndex()] ?? null);
 
+  /** 1 or 2, reusing `layout.columns` (no dedicated "slides per page" field). 2 has nothing to show a second panel with when there's only one slide. */
+  get panelCount(): number {
+    const requested = this.section?.layout?.columns === 2 ? 2 : 1;
+    return requested === 2 && this.allSlides().length > 1 ? 2 : 1;
+  }
+
+  visibleSlides(): HeroSlideData[] {
+    const slides = this.allSlides();
+    if (slides.length === 0) {
+      return [];
+    }
+    if (this.panelCount === 2) {
+      const nextIndex = (this.activeIndex() + 1) % slides.length;
+      return [slides[this.activeIndex()], slides[nextIndex]];
+    }
+    const current = slides[this.activeIndex()];
+    return current ? [current] : [];
+  }
+
   ngOnChanges(changes: SimpleChanges): void {
     if (changes['data']) {
       this.dataSignal.set(this.data);
@@ -169,6 +250,41 @@ export class HeroWidgetComponent implements OnChanges, OnDestroy {
     this.setupAutoplay();
   }
 
+  prevSlide(): void {
+    const total = this.allSlides().length;
+    if (total <= 1) {
+      return;
+    }
+    this.goTo((this.activeIndex() - 1 + total) % total);
+  }
+
+  nextSlide(): void {
+    const total = this.allSlides().length;
+    if (total <= 1) {
+      return;
+    }
+    this.goTo((this.activeIndex() + 1) % total);
+  }
+
+  onSwipeStart(event: TouchEvent): void {
+    this.swipeStartX = event.touches[0]?.clientX ?? null;
+  }
+
+  onSwipeEnd(event: TouchEvent): void {
+    const startX = this.swipeStartX;
+    this.swipeStartX = null;
+    if (startX === null) {
+      return;
+    }
+    const endX = event.changedTouches[0]?.clientX ?? startX;
+    const diff = startX - endX;
+    if (diff > SWIPE_THRESHOLD_PX) {
+      this.nextSlide();
+    } else if (diff < -SWIPE_THRESHOLD_PX) {
+      this.prevSlide();
+    }
+  }
+
   onCtaClick(): void {
     this.ctaClicked.emit();
   }

src/app/widgets/ui/product-carousel-widget.component.ts

@@ -10,7 +10,7 @@ import { TranslatePipe } from '../../i18n/translate.pipe';
   standalone: true,
   imports: [CommonModule, CatalogProductGridComponent, TranslatePipe],
   template: `
-    <section class="product-carousel-widget">
+    <section class="product-carousel-widget" [style.--items-per-page]="itemsPerPage()">
       @if (data?.title) {
         <h2 class="product-carousel-widget__title">{{ data?.title }}</h2>
       }
@@ -83,7 +83,8 @@ import { TranslatePipe } from '../../i18n/translate.pipe';
 
         ::ng-deep .catalog-product-shell {
           flex: 0 0 auto;
-          width: 220px;
+          width: calc((100% - (var(--items-per-page, 4) - 1) * var(--space-md, 16px)) / var(--items-per-page, 4));
+          min-width: 160px;
         }
       }
 
@@ -121,6 +122,12 @@ export class ProductCarouselWidgetComponent {
     return this.section?.layout?.strategy === 'carousel';
   }
 
+  /** Items visible per page - reuses `layout.columns` (default 4, min 1) rather than a dedicated field. */
+  itemsPerPage(): number {
+    const columns = this.section?.layout?.columns;
+    return columns && columns >= 1 ? Math.floor(columns) : 4;
+  }
+
   scrollBy(direction: -1 | 1): void {
     const el = this.scroller?.nativeElement;
     if (!el) {