@akinon/pz-theme 2.0.166-rc.0 → 2.0.166-rc.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @akinon/pz-theme
 
+## 2.0.166-rc.2
+
+### Patch Changes
+
+- f6871947: ZERO-5509: The order-detail block can hand its whole page to a child group with role `order-detail-layout`. The group is drawn once over the order in place of the built-in markup: its blocks bind `item.*` to the order (number, date, status, totals, discounts, installments, invoice / cancel / tracking links, addresses, payment), already formatted with the block's money style, and a repeat over `item.lines` draws the line rows. Line rows (also in the existing row layout) now carry color, size, tracking, carrier, return code / method / carrier / pickup date, and are scoped as a one-line order so the rate & review action placed in a line rates that line only. Clones of a repeat inside a row now open a row scope for their entry (`Block.itemScopeRow`). Without a layout the block renders exactly as before.
+  - @akinon/next@2.0.166-rc.2
+  - @akinon/theme-contract@2.0.166-rc.2
+
+## 2.0.166-rc.1
+
+### Patch Changes
+
+- e3c2bab2: ZERO-5521: restore the text block's useValueLocale import and the /api/auth no-store header rule that the automatic RC sync dropped
+- Updated dependencies [e3c2bab2]
+  - @akinon/next@2.0.166-rc.1
+  - @akinon/theme-contract@2.0.166-rc.1
+
 ## 2.0.166-rc.0
 
 ### Patch Changes

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@akinon/pz-theme",
   "description": "Theme package for Project Zero Next — ThemePlaceholder system and theme editor infrastructure",
-  "version": "2.0.166-rc.0",
+  "version": "2.0.166-rc.2",
   "license": "MIT",
   "main": "src/index.ts",
   "scripts": {
     "test": "jest"
   },
   "peerDependencies": {
-    "@akinon/next": "2.0.166-rc.0",
+    "@akinon/next": "2.0.166-rc.2",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "dependencies": {
-    "@akinon/theme-contract": "2.0.166-rc.0",
+    "@akinon/theme-contract": "2.0.166-rc.2",
     "clsx": "2.1.1",
     "lottie-web": "^5.13.0",
     "react-multi-carousel": "2.8.4",
@@ -21,7 +21,7 @@
     "zod": "4.4.1"
   },
   "devDependencies": {
-    "@akinon/next": "2.0.166-rc.0",
+    "@akinon/next": "2.0.166-rc.2",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "16.3.2",
     "@testing-library/user-event": "14.1.1",

package/src/blocks/__tests__/order-detail-layout.test.tsx

@@ -0,0 +1,311 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import OrderDetailBlock from '../order-detail-block';
+import blockRendererRegistry from '../block-renderer-registry';
+import { useThemeRowScope } from '../row-scope';
+
+/**
+ * ZERO-5509 — the order detail page as blocks. A child group with role
+ * `order-detail-layout` is drawn once over the order instead of the built-in
+ * markup: its blocks bind `item.*` to the order, a repeat over `item.lines`
+ * draws a row per line, and each line row is a row of its own, so a block that
+ * acts on "its row" (the rate & review action) answers for that line only.
+ */
+let order: Record<string, unknown> | null = null;
+let isLoading = false;
+
+jest.mock('next/navigation', () => ({
+  useParams: () => ({ id: '42' }),
+  useSearchParams: () => null
+}));
+
+jest.mock('next-auth/react', () => ({
+  useSession: () => ({ data: null, status: 'authenticated' })
+}));
+
+jest.mock('@akinon/next/hooks', () => ({
+  __esModule: true,
+  useLocalization: () => ({ locale: 'tr', currency: 'try' })
+}));
+
+jest.mock('@akinon/next/data/client/account', () => ({
+  __esModule: true,
+  useGetOrderQuery: () => ({ data: order, isLoading })
+}));
+
+// Stands in for the rate & review action: shows which row it was handed.
+const RowProbe = () => {
+  const scope = useThemeRowScope();
+  const row = (scope?.row ?? {}) as {
+    number?: string;
+    items?: Array<{ product?: { sku?: string } }>;
+  };
+  return (
+    <span data-testid="row-probe">
+      {`${row.number}:${(row.items ?? [])
+        .map((item) => item.product?.sku)
+        .join(',')}`}
+    </span>
+  );
+};
+blockRendererRegistry.register('test-row-probe', RowProbe as never);
+
+const line = (id: number, sku: string, color: string, size: string) => ({
+  id,
+  price: '5499.00',
+  quantity: 1,
+  status: { value: '550', label: 'Teslim edildi' },
+  tracking_number: `TRK${id}`,
+  tracking_url: `https://carrier.example/${id}`,
+  product: {
+    pk: id,
+    sku,
+    base_code: `BASE-${id}`,
+    name: `Gömlek ${id}`,
+    image: `/img-${id}.jpg`,
+    absolute_url: `/p-${id}/`,
+    attributes: { integration_renk_detay: color, filtrenebilir_beden: size }
+  }
+});
+
+const ORDER = {
+  id: 42,
+  number: '20920397829',
+  created_date: '2026-06-10T10:00:00Z',
+  amount: '15499.00',
+  amount_without_discount: '15499.00',
+  discount_amount: '2499.00',
+  shipping_amount: '0.00',
+  status: { value: '400', label: 'Onaylandı' },
+  currency: { value: 'try', label: 'TRY' },
+  e_archive_url: 'https://invoice.example/42',
+  tracking_number: 'TRK1',
+  tracking_url: 'https://carrier.example/1',
+  installment_count: 3,
+  orderitem_set: [
+    line(1, 'SKU-1', 'Beyaz', 'S'),
+    line(2, 'SKU-2', 'Lacivert', 'M')
+  ],
+  discountitem_set: [{ name: 'Sepet indirimi', amount: '2499.00' }],
+  shipping_address: {
+    first_name: 'İlker',
+    last_name: 'Gökçil',
+    line: 'Atatürk Cad. No:2/5',
+    district: { name: 'Atatürk Mah.' },
+    city: { name: 'İstanbul' }
+  },
+  billing_address: null,
+  bank: { name: 'İş Bankası' },
+  payment_option: { name: 'Kredi Kartı' }
+};
+
+const text = (id: string, binding: string, extra = {}) => ({
+  id,
+  type: 'text',
+  label: id,
+  value: '',
+  properties: { tag: 'span', dataBinding: binding, ...extra },
+  styles: {},
+  blocks: []
+});
+
+const layout = (overrides: Record<string, unknown> = {}) => ({
+  id: 'order-layout',
+  type: 'group',
+  label: 'Order Layout',
+  properties: { tag: 'div', role: 'order-detail-layout' },
+  styles: {},
+  blocks: [
+    text('number', 'item.number'),
+    text('date', 'item.date'),
+    text('total', 'item.total'),
+    {
+      ...text('shipping-free', '', {
+        visibleWhenField: 'item.isFreeShipping',
+        visibleWhenMode: 'truthy'
+      }),
+      value: 'Ücretsiz'
+    },
+    {
+      ...text('shipping-paid', 'item.shipping', {
+        visibleWhenField: 'item.isFreeShipping',
+        visibleWhenMode: 'falsy'
+      })
+    },
+    text(
+      'installments',
+      '{{item.installmentCount}} x {{item.installmentAmount}}'
+    ),
+    text('address', 'item.shippingAddress'),
+    text('billing', 'item.billingAddress', {
+      visibleWhenField: 'item.hasBillingAddress',
+      visibleWhenMode: 'truthy'
+    }),
+    {
+      id: 'discounts',
+      type: 'group',
+      label: 'Discounts',
+      isIterator: true,
+      iteratorDataPath: 'item.discounts',
+      properties: { tag: 'div' },
+      styles: {},
+      blocks: [text('discount', '{{item.name}} {{item.amount}}')]
+    },
+    {
+      id: 'lines',
+      type: 'group',
+      label: 'Lines',
+      isIterator: true,
+      iteratorDataPath: 'item.lines',
+      properties: { tag: 'div' },
+      styles: {},
+      blocks: [
+        {
+          id: 'line',
+          type: 'group',
+          label: 'Line',
+          properties: { tag: 'div' },
+          styles: {},
+          blocks: [
+            text('line-name', 'item.name'),
+            text('line-color', 'Renk: {{item.color}}'),
+            text('line-size', 'Beden: {{item.size}}'),
+            text('line-tracking', 'item.trackingNumber'),
+            {
+              id: 'probe',
+              type: 'test-row-probe',
+              label: 'Probe',
+              properties: {},
+              styles: {},
+              blocks: []
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  ...overrides
+});
+
+const block = (blocks: unknown[] = [layout()]) =>
+  ({
+    id: 'order-detail-1',
+    type: 'order-detail',
+    properties: {
+      colorAttributeKey: { desktop: 'integration_renk_detay' },
+      sizeAttributeKey: { desktop: 'filtrenebilir_beden' },
+      currencyDisplay: { desktop: 'custom' },
+      currencyText: { desktop: 'TL' },
+      currencyPosition: { desktop: 'after' },
+      decimals: { desktop: 'auto' }
+    },
+    styles: {},
+    blocks
+  } as never);
+
+const renderBlock = (blocks?: unknown[], isDesigner = false) =>
+  render(
+    <OrderDetailBlock
+      block={block(blocks)}
+      placeholderId="p1"
+      sectionId="s1"
+      isDesigner={isDesigner}
+    />
+  );
+
+beforeEach(() => {
+  order = ORDER;
+  isLoading = false;
+});
+
+describe('order detail layout', () => {
+  it('draws the authored layout in place of the built-in markup', () => {
+    const { container } = renderBlock();
+
+    expect(
+      container.querySelector('[data-order-detail-layout]')
+    ).not.toBeNull();
+    expect(container.querySelector('[data-order-detail-header]')).toBeNull();
+    expect(container.querySelector('[data-order-detail-items]')).toBeNull();
+  });
+
+  it('binds the order-level values, formatted the way the block formats money', () => {
+    const { container } = renderBlock();
+    const textOf = (selector: string) =>
+      container.querySelector(`[data-block-id^="${selector}"]`)?.textContent;
+
+    expect(textOf('number')).toBe('20920397829');
+    expect(textOf('date')).toBe('10.06.2026');
+    expect(textOf('total')).toMatch(/^15\.499(,00)? TL$/);
+    expect(textOf('installments')).toMatch(/^3 x 5\.166,33 TL$/);
+    expect(textOf('address')).toBe(
+      'Atatürk Cad. No:2/5 Atatürk Mah. / İstanbul'
+    );
+    expect(textOf('discount')).toMatch(/^Sepet indirimi -2\.499(,00)? TL$/);
+  });
+
+  it('shows and hides per the row conditions on the storefront', () => {
+    const { container } = renderBlock();
+
+    expect(container.textContent).toContain('Ücretsiz');
+    expect(
+      container.querySelector('[data-block-id^="shipping-paid"]')
+    ).toBeNull();
+    // No billing address on this order: the bound block is hidden.
+    expect(container.querySelector('[data-block-id^="billing"]')).toBeNull();
+  });
+
+  it('repeats a row per line with its color, size and tracking', () => {
+    const { container } = renderBlock();
+    const lines = container.querySelectorAll('[data-block-id^="line-color"]');
+
+    expect(lines).toHaveLength(2);
+    expect(lines[0].textContent).toBe('Renk: Beyaz');
+    expect(lines[1].textContent).toBe('Renk: Lacivert');
+    expect(
+      container.querySelectorAll('[data-block-id^="line-size"]')[1].textContent
+    ).toBe('Beden: M');
+    expect(
+      container.querySelectorAll('[data-block-id^="line-tracking"]')[0]
+        .textContent
+    ).toBe('TRK1');
+  });
+
+  it('gives every line row its own row scope, as a one-line order', () => {
+    renderBlock();
+
+    expect(
+      screen.getAllByTestId('row-probe').map((el) => el.textContent)
+    ).toEqual(['20920397829:SKU-1', '20920397829:SKU-2']);
+  });
+
+  it('leaves a hidden layout off the storefront and draws the built-in order', () => {
+    const { container } = renderBlock([layout({ hidden: true })]);
+
+    expect(container.querySelector('[data-order-detail-layout]')).toBeNull();
+    expect(
+      container.querySelector('[data-order-detail-header]')
+    ).not.toBeNull();
+  });
+
+  it('keeps drawing the built-in order when there is no layout', () => {
+    const { container } = renderBlock([]);
+
+    expect(container.querySelector('[data-order-detail-layout]')).toBeNull();
+    expect(
+      container.querySelector('[data-order-detail-header]')
+    ).not.toBeNull();
+  });
+
+  it('draws the layout over the sample order on the canvas', () => {
+    order = null;
+    const { container } = renderBlock(undefined, true);
+
+    expect(
+      container.querySelector('[data-order-detail-layout]')
+    ).not.toBeNull();
+    expect(
+      container.querySelectorAll('[data-block-id^="line-color"]').length
+    ).toBeGreaterThan(0);
+  });
+});

package/src/blocks/order-detail-block.tsx

@@ -8,9 +8,14 @@ import { useLocalization } from '@akinon/next/hooks';
 import { getResponsiveValue, partAttrs } from '../utils';
 import { formatDate, formatMoney } from './commerce-format';
 import { readMoneyStyle } from './money-style';
-import { hasItemTemplate, ItemTemplateList } from './item-template';
+import {
+  hasItemTemplate,
+  ITEM_TEMPLATE_ROLE,
+  ItemTemplateList
+} from './item-template';
 import { renderOrderLineActions } from './order-line-actions';
 import { BlockRendererProps } from './block-renderer-registry';
+import type { Block } from '../theme-block';
 import {
   DesignerPlaceholder,
   groupOrderItems,
@@ -33,12 +38,15 @@ type OrderItemLike = {
   status?: { value?: string; label?: string };
   tracking_url?: string;
   tracking_number?: string;
+  shipping_company?: { value?: string; label?: string } | null;
   estimated_delivery_date?: string;
   price_currency?: { value?: string; label?: string };
   is_refundable?: boolean;
   active_cancellation_request?: unknown;
   product?: {
     pk?: number;
+    sku?: string;
+    base_code?: string;
     name?: string;
     image?: string;
     absolute_url?: string;
@@ -70,6 +78,7 @@ interface OrderLike {
   shipping_amount?: string;
   tracking_url?: string;
   tracking_number?: string;
+  shipping_company?: { value?: string; label?: string } | null;
   status?: { value?: string; label?: string };
   currency?: { value?: string; label?: string };
   orderitem_set?: OrderItemLike[];
@@ -108,6 +117,19 @@ const ORDER_PARAM_KEYS = [
 // opts into h1/h2/h3 when the order number is the page's main heading.
 const NUMBER_TAGS = ['span', 'div', 'h1', 'h2', 'h3'];
 
+/**
+ * A child group marked with this role is the whole order page, drawn in place
+ * of everything the block renders itself (ZERO-5509). It is repeated once, over
+ * the order: its blocks bind `item.*` to the order (number, date, totals,
+ * addresses, payment), and a repeat inside it over `item.lines` draws one row
+ * per order line, so the header, the line rows, the totals and every caption
+ * are blocks the panel arranges instead of fixed markup styled with CSS.
+ */
+export const ORDER_LAYOUT_ROLE = 'order-detail-layout';
+
+const readChildRole = (child: Block, breakpoint: string): string =>
+  String(getResponsiveValue(child.properties?.role, breakpoint, '') ?? '');
+
 const firstString = (
   read: (key: string) => unknown,
   keys: string[]
@@ -673,8 +695,16 @@ const OrderDetailBlock = ({
     ? {}
     : { width: '50%', marginLeft: '50%' };
 
+  // A row publishes every field the built-in line can show, whatever its own
+  // show/hide toggles say: those govern the built-in line, and a designer's
+  // own layout decides for itself what to draw (ZERO-5509).
   const lineRows = groupedItems.map((line) => {
     const lineCurrency = line.item.price_currency?.value || currency;
+    const attributes = line.item.product?.attributes;
+    const returnDetails = resolveReturnDetails(
+      line.item.active_cancellation_request
+    );
+    const lineStatusValue = String(line.item.status?.value ?? '');
 
     return {
       key: line.key,
@@ -694,7 +724,43 @@ const OrderDetailBlock = ({
         ...moneyStyle
       }),
       status: line.item.status?.label || '',
-      statusValue: line.item.status?.value || ''
+      statusValue: lineStatusValue,
+      color: resolveAttribute(attributes, colorAttributeKey),
+      size: resolveAttribute(attributes, sizeAttributeKey),
+      trackingNumber: line.item.tracking_number || '',
+      trackingUrl: isDesigner ? '#' : line.item.tracking_url || '',
+      shippingCompany: line.item.shipping_company?.label || '',
+      returnCode: resolveReturnCode(line.item.active_cancellation_request),
+      returnMethod:
+        returnDetails.method === 'appointment'
+          ? appointmentReturnLabel
+          : returnDetails.method === 'standard'
+          ? standardReturnLabel
+          : '',
+      returnCarrier: returnDetails.carrier,
+      pickupDate: returnDetails.pickupDate
+        ? formatPickupDate(returnDetails.pickupDate, locale)
+        : '',
+      // The line seen as a one-line order, for blocks that act on an order
+      // from inside a row — the rate & review "Rate" action reads `id`,
+      // `number` and `items` off its row, so inside a line row it offers a
+      // review for that line's product only.
+      id: order.id ?? '',
+      number: order.number || orderKey,
+      createdDate: order.created_date || '',
+      items: [
+        {
+          id: line.item.id ?? line.key,
+          name: line.name,
+          image: line.image,
+          statusValue: lineStatusValue,
+          product: {
+            sku: line.item.product?.sku || '',
+            base_code: line.item.product?.base_code || '',
+            name: line.name
+          }
+        }
+      ]
     };
   });
 
@@ -778,6 +844,116 @@ const OrderDetailBlock = ({
     );
   };
 
+  // The designer's whole-order layout, when there is one: drawn once over
+  // the order instead of everything below. Hidden on the storefront when the
+  // author hid it, still drawn on the canvas so it can be designed.
+  const layoutChild =
+    (block.blocks || []).find(
+      (child) =>
+        readChildRole(child, currentBreakpoint) === ORDER_LAYOUT_ROLE &&
+        (isDesigner || !child.hidden)
+    ) ?? null;
+
+  if (layoutChild) {
+    const shippingLines = formatAddress(order.shipping_address);
+    const billingLines = formatAddress(order.billing_address);
+    const pieceCount = groupedItems.reduce(
+      (sum, line) => sum + Number(line.quantity || 0),
+      0
+    );
+    const shippingAmount = Number(order.shipping_amount || 0);
+    const signedMoney = (value: unknown) => {
+      const amount = Math.abs(Number(value || 0));
+      return amount > 0 ? `-${money(String(amount))}` : money('0');
+    };
+    const deliveryLine = items.find((item) => item.estimated_delivery_date);
+    const linkOrInert = (href: string) => (isDesigner && href ? '#' : href);
+
+    // One row: the order. Every value is already formatted the way the block
+    // formats it (money style, locale date), so a text block bound to
+    // `item.total` prints "15.499 TL" exactly as the built-in header does.
+    const orderRows = [
+      {
+        key: String(order.id ?? order.number ?? orderKey),
+        id: order.id ?? '',
+        number: order.number || orderKey,
+        date: formatDate(order.created_date, locale),
+        createdDate: order.created_date || '',
+        status: order.status?.label || '',
+        statusValue: String(order.status?.value ?? ''),
+        total: money(order.amount),
+        pieceCount,
+        pieceSubtotal,
+        shipping: money(order.shipping_amount),
+        isFreeShipping: !(shippingAmount > 0),
+        discountTotal: signedMoney(order.discount_amount),
+        hasDiscount: Number(order.discount_amount || 0) !== 0,
+        discounts: (order.discountitem_set || []).map((discount, index) => ({
+          key: String(index),
+          name: discount.name || discountLabel,
+          amount: signedMoney(discount.amount)
+        })),
+        hasInstallments: installmentCount > 1,
+        installmentCount,
+        installmentAmount: perInstallment,
+        invoiceUrl: linkOrInert(order.e_archive_url || ''),
+        hasInvoice: Boolean(order.e_archive_url),
+        canCancel: offersCancel && Boolean(cancelHref),
+        canReturn: offersReturn && Boolean(cancelHref),
+        cancelUrl: linkOrInert(cancelHref),
+        trackingNumber: order.tracking_number || '',
+        trackingUrl: linkOrInert(order.tracking_url || ''),
+        hasTracking: Boolean(order.tracking_url || order.tracking_number),
+        shippingCompany: order.shipping_company?.label || '',
+        estimatedDelivery: deliveryLine
+          ? formatDate(deliveryLine.estimated_delivery_date, locale)
+          : '',
+        shippingName: shippingLines.length > 1 ? shippingLines[0] : '',
+        shippingAddress: shippingLines[shippingLines.length - 1] || '',
+        billingName: billingLines.length > 1 ? billingLines[0] : '',
+        billingAddress: billingLines[billingLines.length - 1] || '',
+        hasBillingAddress: billingLines.length > 0,
+        bankName: order.bank?.name || '',
+        paymentMethod: order.payment_option?.name || '',
+        lineCount: lineRows.length,
+        lines: lineRows,
+        // The order's delivered lines, for an order-wide rate & review block
+        // placed outside the line repeat.
+        items: lineRows.flatMap((row) => row.items)
+      }
+    ];
+
+    return (
+      <div
+        data-order-detail=""
+        data-order-detail-layout=""
+        style={{ width: '100%' }}
+      >
+        <ItemTemplateList
+          block={{
+            ...block,
+            blocks: [
+              {
+                ...layoutChild,
+                properties: {
+                  ...(layoutChild.properties || {}),
+                  role: ITEM_TEMPLATE_ROLE
+                }
+              }
+            ]
+          }}
+          items={orderRows}
+          placeholderId={placeholderId}
+          sectionId={sectionId}
+          isDesigner={isDesigner}
+          selectedBlockId={selectedBlockId}
+          currentBreakpoint={currentBreakpoint}
+          designerPlaceholderCount={1}
+        />
+      </div>
+    );
+  }
+
   return (
     <div
       data-order-detail=""

package/src/blocks/text-block.tsx

@@ -7,6 +7,7 @@ import { getInnerRootInlineStyles, partAttrs } from '../utils';
 import { useThemeSettingsContext } from '../theme-settings-context';
 import { useLocalizeHref } from '../hooks/use-localize-href';
 import { localizeHtmlLinks } from '../utils/localize-href';
+import { useValueLocale } from '../utils/localized-value';
 // Rich-text element defaults from the theme settings.
 import {
   THEME_RICH_TEXT_ATTRIBUTE,

package/src/theme-block.tsx

@@ -8,6 +8,7 @@ import {
   type ThemeProduct
 } from './blocks/product-block-utils';
 import { DESIGNER_SAMPLE_PRODUCT } from './blocks/item-template-utils';
+import { ThemeRowScopeProvider } from './blocks/row-scope';
 import {
   getInnerRootInlineStyles,
   getResponsiveValue,
@@ -67,6 +68,14 @@ export interface Block {
    * position a product card's click reports (ZERO-5305). Never authored.
    */
   itemScopeIndex?: number;
+  /**
+   * Set on the clones of a repeat INSIDE a row (an order's lines inside the
+   * order): the entry the clone draws, opened here as its row scope so a block
+   * reading `useThemeRowScope()` answers for that entry. Never authored —
+   * written by `buildIteratorBlock` (ZERO-5509).
+   */
+  itemScopeRow?: Record<string, unknown>;
+  itemScopeRowIndex?: number;
   iteratorDataPath?: string;
   /**
    * Written by the property-switch pass (utils/property-switches.ts), never
@@ -240,7 +249,22 @@ export default function ThemeBlock({
     </WithDesignerFeatures>
   );
 
-  if (block.itemScopeProduct === undefined) return rendered;
+  // A clone of a repeat inside a row: its entry is the row for every block
+  // inside it (see `Block.itemScopeRow`). Context only, no element.
+  const scopedRendered =
+    block.itemScopeRow === undefined ? (
+      rendered
+    ) : (
+      <ThemeRowScopeProvider
+        listType="nested"
+        row={block.itemScopeRow}
+        index={block.itemScopeRowIndex ?? 0}
+      >
+        {rendered}
+      </ThemeRowScopeProvider>
+    );
+
+  if (block.itemScopeProduct === undefined) return scopedRendered;
 
   // A clone of a collection repeat: the row is the ambient product for every
   // block inside it (see `Block.itemScopeProduct`). Context only — the
@@ -254,7 +278,7 @@ export default function ThemeBlock({
       }
       index={block.itemScopeIndex}
     >
-      {rendered}
+      {scopedRendered}
     </ThemeItemScopeProvider>
   );
 }

package/src/utils/iterator-utils.ts

@@ -1726,6 +1726,17 @@ export const buildIteratorBlock = ({
             ),
             itemScopeIndex: index
           }
+        : {}),
+      // A repeat inside a row (an order's lines inside the order) draws rows
+      // of its own: each clone opens a row scope for its entry, so a block
+      // that acts on "its row" — the rate & review action — answers for that
+      // entry rather than for the row around it (ZERO-5509). Only entries
+      // that are records, and only real ones: padding rows have no row.
+      ...(scopedItems !== null && isRecord(displayItems[index])
+        ? {
+            itemScopeRow: displayItems[index] as Record<string, unknown>,
+            itemScopeRowIndex: index
+          }
         : {})
     };