@onekeyfe/react-native-native-list 6.7.0-alpha.405 → 6.7.0-alpha.406

package/lib/module/validation.js

@@ -12,6 +12,7 @@ const MAX_HEADER_LENGTH = 4096;
 const MAX_SPACER_HEIGHT = 512;
 const MAX_SECTION_INDEX_TITLE_LENGTH = 8;
 const MAX_MARKET_BADGES = 3;
+const MARKET_METRIC_FIELDS = ['key', 'text', 'textSegments', 'secondaryText', 'secondaryTextSegments', 'weight', 'alignment', 'tone', 'secondaryTone'];
 function isDevelopment() {
   return typeof __DEV__ !== 'undefined' && __DEV__;
 }
@@ -524,8 +525,56 @@ function assertWebMarketTable(table, path) {
     }
   });
 }
+function assertMarketMetrics(metrics, path) {
+  if (metrics === undefined) return;
+  if (!Array.isArray(metrics) || ![2, 3].includes(metrics.length)) fail(path, 'must contain 2 or 3 columns');
+  const keys = new Set();
+  metrics.forEach((column, index) => {
+    const columnPath = `${path}[${index}]`;
+    const value = protocolObject(column, columnPath);
+    protocolKey(value.key, `${columnPath}.key`);
+    if (keys.has(column.key)) fail(`${columnPath}.key`, 'must be unique');
+    keys.add(column.key);
+    if (typeof value.text !== 'string') fail(`${columnPath}.text`, 'must be a string');
+    for (const field of ['textSegments', 'secondaryTextSegments']) {
+      const segments = column[field];
+      if (segments !== undefined && !Array.isArray(segments)) fail(`${columnPath}.${field}`, 'must be an array');
+      segments?.forEach((segment, segmentIndex) => {
+        const segmentPath = `${columnPath}.${field}[${segmentIndex}]`;
+        protocolObject(segment, segmentPath);
+        if (typeof segment.text !== 'string') fail(`${segmentPath}.text`, 'must be a string');
+        if (segment.style !== undefined && segment.style !== 'subscript') fail(`${segmentPath}.style`, 'must be subscript');
+      });
+    }
+    if (value.weight !== undefined && ![1, 2, 3].includes(value.weight)) fail(`${columnPath}.weight`, 'must be 1, 2, or 3');
+    if (value.alignment !== undefined && !['start', 'center', 'end'].includes(value.alignment)) fail(`${columnPath}.alignment`, 'must be start, center, or end');
+    if (value.secondaryText !== undefined && typeof value.secondaryText !== 'string') fail(`${columnPath}.secondaryText`, 'must be a string');
+    assertTextTone(value.tone, `${columnPath}.tone`);
+    assertTextTone(value.secondaryTone, `${columnPath}.secondaryTone`);
+  });
+}
 function assertMarketRow(row, path) {
   assertWebMarketTable(row.webTable, `${path}.webTable`);
+  assertMarketMetrics(row.metrics, `${path}.metrics`);
+  if (row.metrics !== undefined) {
+    row.metrics.forEach((column, index) => {
+      const columnPath = `${path}.metrics[${index}]`;
+      const value = protocolObject(column, columnPath);
+      assertUnknownKeys(value, MARKET_METRIC_FIELDS, columnPath, 'Market metric key');
+      assertKey(column.key, `${columnPath}.key`);
+      assertText(column.text, `${columnPath}.text`);
+      assertText(column.secondaryText, `${columnPath}.secondaryText`);
+      assertTextTone(column.tone, `${columnPath}.tone`);
+      assertTextTone(column.secondaryTone, `${columnPath}.secondaryTone`);
+      for (const field of ['textSegments', 'secondaryTextSegments']) {
+        column[field]?.forEach((segment, segmentIndex) => {
+          const segmentPath = `${columnPath}.${field}[${segmentIndex}]`;
+          assertText(segment.text, `${segmentPath}.text`);
+          if (segment.style !== undefined && segment.style !== 'subscript') fail(`${segmentPath}.style`, 'must be subscript');
+        });
+      }
+    });
+  }
   if (!['token', 'stock', 'perp'].includes(row.variant)) {
     fail(`${path}.variant`, 'must be token, stock, or perp');
   }
@@ -1183,7 +1232,7 @@ const ROW_FIELDS = {
   activity: [...COMMON_ROW_FIELDS, 'leading', 'hideLeading', 'secondaryLeading', 'title', 'description', 'status', 'primaryAmount', 'secondaryAmount', 'amounts', 'badges', 'presentation', 'fee', 'descriptionActionKey', 'footerActions'],
   message: [...COMMON_ROW_FIELDS, 'presentation', 'unread', 'leading', 'title', 'body', 'bodyLines', 'time', 'thumbnail'],
   dataRow: [...COMMON_ROW_FIELDS, 'leading', 'columns', 'trailing', 'checkbox', 'index', 'badge', 'badges', 'favorite', 'favoriteActive'],
-  market: [...COMMON_ROW_FIELDS, 'variant', 'webTable', 'leadingAction', 'leading', 'title', 'subtitle', 'subtitlePrefix', 'subtitleSegments', 'price', 'priceSegments', 'change', 'badges', 'pressActionKey', 'pressInActionKey', 'longPressActionKey', 'diagnostics'],
+  market: [...COMMON_ROW_FIELDS, 'variant', 'webTable', 'metrics', 'leadingAction', 'leading', 'title', 'subtitle', 'subtitlePrefix', 'subtitleSegments', 'price', 'priceSegments', 'change', 'badges', 'pressActionKey', 'pressInActionKey', 'longPressActionKey', 'diagnostics'],
   mediaTile: [...COMMON_ROW_FIELDS, 'variant', 'media', 'image', 'imageState', 'networkImage', 'title', 'subtitle', 'badge', 'closeActionKey'],
   metricCard: [...COMMON_ROW_FIELDS, 'variant', 'title', 'value', 'subtitle', 'trend', 'trendTone', 'visual', 'badge', 'metrics', 'progress'],
   sectionHeader: [...COMMON_ROW_FIELDS, 'sticky', 'valueActionTestID', 'valueSegments', 'titleActionKey', 'titleActionOnHover', 'presentation', 'indexTitle', 'variant', 'title', 'leadingBadge', 'titleLoading', 'subtitle', 'value', 'valueHelp', 'valueActionKey', 'titleIcon', 'valueIcon', 'checkbox'],
@@ -1198,7 +1247,7 @@ const PATCH_FIELDS = {
   activity: [...COMMON_PATCH_FIELDS, 'presentation', 'leading', 'title', 'badges', 'status', 'hideLeading', 'secondaryLeading', 'description', 'primaryAmount', 'secondaryAmount', 'amounts', 'fee', 'descriptionActionKey', 'footerActions'],
   message: [...COMMON_PATCH_FIELDS, 'presentation', 'title', 'unread', 'body', 'bodyLines', 'time', 'thumbnail'],
   dataRow: [...COMMON_PATCH_FIELDS, 'leading', 'badges', 'trailing', 'badge', 'columns', 'checkbox', 'index', 'favorite', 'favoriteActive'],
-  market: [...COMMON_PATCH_FIELDS, 'longPressActionKey', 'subtitleSegments', 'leading', 'leadingAction', 'title', 'subtitle', 'badges', 'webTable', 'price', 'priceSegments', 'change', 'pressActionKey', 'pressInActionKey', 'diagnostics'],
+  market: [...COMMON_PATCH_FIELDS, 'longPressActionKey', 'subtitleSegments', 'leading', 'leadingAction', 'title', 'subtitle', 'badges', 'webTable', 'metrics', 'price', 'priceSegments', 'change', 'pressActionKey', 'pressInActionKey', 'diagnostics'],
   mediaTile: [...COMMON_PATCH_FIELDS, 'title', 'subtitle', 'badge', 'media', 'image', 'imageState', 'networkImage', 'closeActionKey'],
   metricCard: [...COMMON_PATCH_FIELDS, 'title', 'subtitle', 'visual', 'badge', 'variant', 'value', 'trend', 'trendTone', 'metrics', 'progress'],
   sectionHeader: [...COMMON_PATCH_FIELDS, 'titleActionKey', 'titleActionOnHover', 'title', 'titleIcon', 'subtitle', 'checkbox', 'variant', 'value', 'leadingBadge', 'titleLoading', 'valueHelp', 'valueActionKey', 'valueIcon'],
@@ -1326,6 +1375,7 @@ function assertRowProtocol(row, path) {
   }
   if (row.type === 'market') {
     protocolObject(row.change, `${path}.change`);
+    assertMarketMetrics(row.metrics, `${path}.metrics`);
     if (row.webTable) {
       const {
         columns,
@@ -1633,6 +1683,16 @@ function sanitizeDecoration(value, field) {
   }
   return next;
 }
+function sanitizeMarketMetrics(value) {
+  if (!Array.isArray(value)) return value;
+  return value.map(metric => {
+    const next = pickFields(metric, MARKET_METRIC_FIELDS);
+    for (const field of ['textSegments', 'secondaryTextSegments']) {
+      if (next[field] !== undefined) next[field] = sanitizeDecoration(next[field], field);
+    }
+    return next;
+  });
+}
 function sanitizeRowForProduction(row) {
   const object = protocolObject(row, 'row');
   const fields = ROW_FIELDS[row.type];
@@ -1644,7 +1704,7 @@ function sanitizeRowForProduction(row) {
       continue;
     }
     if (field === 'parent' && isRecord(value)) next[field] = sanitizeRowForProduction(value);else if (field === 'children' && Array.isArray(value)) next[field] = value.map(child => sanitizeRowForProduction(child));else {
-      const normalized = sanitizeDecoration(value, field);
+      const normalized = row.type === 'market' && field === 'metrics' ? sanitizeMarketMetrics(value) : sanitizeDecoration(value, field);
       if (normalized === undefined) delete next[field];else next[field] = normalized;
     }
   }
@@ -1665,7 +1725,7 @@ function normalizeEmptyImages(value, field = '') {
   const next = {};
   for (const [key, item] of Object.entries(object)) {
     const optional = object.type && !['key', 'type', ...(REQUIRED_ROW_FIELDS[object.type] ?? [])].includes(key);
-    if (item === undefined || item === null && optional || ['priceSegments', 'subtitleSegments'].includes(key) && Array.isArray(item) && item.length === 0) {
+    if (item === undefined || item === null && optional && !(object.type === 'market' && key === 'metrics') || ['priceSegments', 'subtitleSegments'].includes(key) && Array.isArray(item) && item.length === 0) {
       changed = true;
       continue;
     }
@@ -1718,6 +1778,11 @@ export function validateSnapshot(snapshot) {
   assertPlainSerializable(snapshot, 'snapshot', new Set(), false);
   protocolObject(snapshot, 'snapshot');
   const normalized = normalizeEmptyImages(snapshot);
+  if (Array.isArray(normalized.rows)) {
+    normalized.rows.forEach((row, index) => {
+      if (row.type === 'market') assertMarketMetrics(row.metrics, `snapshot.rows[${index}].metrics`);
+    });
+  }
   const canonical = isDevelopment() ? normalized : normalizeSnapshotForProduction(normalized);
   assertPlainSerializable(canonical, 'snapshot', new Set());
   if (isDevelopment()) assertSnapshotContract(canonical);
@@ -2009,6 +2074,7 @@ function normalizePatch(patch, index) {
       continue;
     }
     if (value === null) {
+      if (patch.type === 'market' && field === 'metrics') fail(`${path}.changes.metrics`, 'use a full snapshot to remove metrics');
       if (REQUIRED_ROW_FIELDS[patch.type].includes(field) || patch.type === 'system' && field === 'message') {
         // The concrete system variant is checked after merging with its baseline.
         if (patch.type !== 'system') fail(`${path}.changes.${field}`, 'required field cannot be cleared');
@@ -2016,6 +2082,7 @@ function normalizePatch(patch, index) {
       changes[field] = null;
       continue;
     }
+    if (patch.type === 'market' && field === 'metrics') assertMarketMetrics(value, `${path}.changes.metrics`);
     if (['priceSegments', 'subtitleSegments'].includes(field) && Array.isArray(value) && value.length === 0) {
       changes[field] = null;
       continue;
@@ -2025,7 +2092,7 @@ function normalizePatch(patch, index) {
       if (!REQUIRED_ROW_FIELDS[patch.type].includes(field)) changes[field] = null;
       continue;
     }
-    const canonical = isDevelopment() ? normalized : sanitizeDecoration(normalized, field);
+    const canonical = isDevelopment() ? normalized : patch.type === 'market' && field === 'metrics' ? sanitizeMarketMetrics(normalized) : sanitizeDecoration(normalized, field);
     if (canonical !== undefined) changes[field] = canonical;else if (field === 'titleImage') changes[field] = null;
   }
   if (patch.type === 'market' && Array.isArray(changes.priceSegments) && changes.priceSegments.length > 0 && (typeof changes.price !== 'string' || !changes.price.trim())) fail(`${path}.changes.price`, 'is required when priceSegments is updated');
@@ -2040,6 +2107,7 @@ function normalizePatch(patch, index) {
     }
   }
   const values = Object.fromEntries(Object.entries(changes).filter(([, value]) => value !== null));
+  if (patch.type === 'market' && 'metrics' in changes) assertMarketMetrics(changes.metrics, `${path}.changes.metrics`);
   assertPlainSerializable(values, `${path}.changes`, new Set());
   assertProtocolFields(values, `${path}.changes`);
   if (isDevelopment()) assertPatchChanges({

package/lib/typescript/src/models.d.ts

@@ -602,6 +602,8 @@ export type MarketRow = RowBase & Readonly<{
     variant: 'token' | 'stock' | 'perp';
     /** Web-only bounded table presentation; native reads the ordinary Market fields. */
     webTable?: WebMarketTablePresentation;
+    /** Two or three ordered native text metrics; omitting them keeps the compact quote. */
+    metrics?: readonly Pick<DataColumn, 'key' | 'text' | 'textSegments' | 'secondaryText' | 'secondaryTextSegments' | 'weight' | 'alignment' | 'tone' | 'secondaryTone'>[];
     leadingAction?: Extract<TrailingAccessory, {
         kind: 'icon';
     }>;
@@ -898,7 +900,7 @@ export type RowPatch = Readonly<{
 }> | Readonly<{
     type: 'market';
     key: string;
-    changes: PatchClearableChanges<MarketRow, CommonPatchFields | 'leadingAction' | 'leading' | 'title' | 'subtitle' | 'subtitleSegments' | 'price' | 'priceSegments' | 'change' | 'badges' | 'pressActionKey' | 'pressInActionKey' | 'longPressActionKey' | 'diagnostics' | 'webTable' | 'style'>;
+    changes: PatchClearableChanges<MarketRow, CommonPatchFields | 'leadingAction' | 'leading' | 'title' | 'subtitle' | 'subtitleSegments' | 'price' | 'priceSegments' | 'change' | 'badges' | 'pressActionKey' | 'pressInActionKey' | 'longPressActionKey' | 'diagnostics' | 'webTable' | 'metrics' | 'style'>;
 }> | Readonly<{
     type: 'mediaTile';
     key: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-list",
-  "version": "6.7.0-alpha.405",
+  "version": "6.7.0-alpha.406",
   "description": "Template-driven native RecyclerView and UICollectionView for React Native",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -86,8 +86,8 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-image": "6.7.0-alpha.405",
-    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.405",
+    "@onekeyfe/react-native-image": "6.7.0-alpha.406",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.406",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"

package/src/NativeList.tsx

@@ -149,6 +149,7 @@ export const NativeList = forwardRef<NativeListRef, NativeListProps>(
     forwardedRef
   ) {
     const snapshotRef = useRef<NativeListSnapshot>(emptyNativeListSnapshot());
+    const needsNativeSnapshotRef = useRef(false);
     const renderedSnapshotRef = useRef<NativeListSnapshot | undefined>(
       undefined
     );
@@ -588,10 +589,11 @@ export const NativeList = forwardRef<NativeListRef, NativeListProps>(
           return;
         }
         pendingDisclosureSnapshotRef.current = undefined;
-        const nextSnapshotJson = JSON.stringify(accepted);
-        nativeRef.current?.applySnapshot(nextSnapshotJson);
+        const native = nativeRef.current;
+        if (native) native.applySnapshot(JSON.stringify(accepted));
         snapshotRef.current = accepted;
-        if (nativeRef.current && avatarLifecycle.current !== 'unmounted') {
+        needsNativeSnapshotRef.current = !native;
+        if (native && avatarLifecycle.current !== 'unmounted') {
           avatarModelRef.current?.replaceSnapshot(accepted.rows);
           updateAvatarPrefetchRef.current();
         }
@@ -614,12 +616,15 @@ export const NativeList = forwardRef<NativeListRef, NativeListProps>(
           return;
         }
         const native = nativeRef.current;
-        const dispatch = native
-          ? () => {
-              native.applyPatches(accepted.json);
-              snapshotRef.current = nextSnapshot;
-            }
-          : undefined;
+        if (!native) {
+          snapshotRef.current = nextSnapshot;
+          needsNativeSnapshotRef.current = true;
+          return;
+        }
+        const dispatch = () => {
+          native.applyPatches(accepted.json);
+          snapshotRef.current = nextSnapshot;
+        };
         if (avatarLifecycle.current === 'unmounted') {
           dispatch?.();
           return;
@@ -646,7 +651,10 @@ export const NativeList = forwardRef<NativeListRef, NativeListProps>(
           };
           if (pending)
             pendingDisclosureSnapshotRef.current = { ...pending, owned: next };
-          else snapshotRef.current = next;
+          else {
+            snapshotRef.current = next;
+            if (!nativeRef.current) needsNativeSnapshotRef.current = true;
+          }
         }
       },
       scrollToKey(paramsOrKey, animated, alignment) {
@@ -712,7 +720,19 @@ export const NativeList = forwardRef<NativeListRef, NativeListProps>(
     const nativeCallbacks = useMemo(
       () => ({
         hybridRef: callback((ref: NativeListMethods) => {
+          const previous = nativeRef.current;
           nativeRef.current = ref;
+          if (
+            needsNativeSnapshotRef.current ||
+            (previous && previous !== ref)
+          ) {
+            // The parent can publish values before Fabric delivers the host.
+            const latest = snapshotRef.current;
+            ref.applySnapshot(JSON.stringify(latest));
+            needsNativeSnapshotRef.current = false;
+            avatarModelRef.current?.replaceSnapshot(latest.rows);
+            updateAvatarPrefetchRef.current();
+          }
           applyInitialScrollCallbackRef.current();
         }),
         onRowAction: callback((payloadJson: string) => {

package/src/models.ts

@@ -755,6 +755,19 @@ export type MarketRow = RowBase &
     variant: 'token' | 'stock' | 'perp';
     /** Web-only bounded table presentation; native reads the ordinary Market fields. */
     webTable?: WebMarketTablePresentation;
+    /** Two or three ordered native text metrics; omitting them keeps the compact quote. */
+    metrics?: readonly Pick<
+      DataColumn,
+      | 'key'
+      | 'text'
+      | 'textSegments'
+      | 'secondaryText'
+      | 'secondaryTextSegments'
+      | 'weight'
+      | 'alignment'
+      | 'tone'
+      | 'secondaryTone'
+    >[];
     leadingAction?: Extract<TrailingAccessory, { kind: 'icon' }>;
     leading: LeadingVisual;
     title: string;
@@ -1178,6 +1191,7 @@ export type RowPatch =
         | 'longPressActionKey'
         | 'diagnostics'
         | 'webTable'
+        | 'metrics'
         | 'style'
       >;
     }>

package/src/validation.ts

@@ -19,6 +19,7 @@ import type {
   WebMarketTableCell,
   WebMarketTablePresentation,
   WebMarketTableText,
+  ValueTextSegment,
 } from './models';
 
 const MAX_KEY_LENGTH = 256;
@@ -32,6 +33,17 @@ const MAX_HEADER_LENGTH = 4096;
 const MAX_SPACER_HEIGHT = 512;
 const MAX_SECTION_INDEX_TITLE_LENGTH = 8;
 const MAX_MARKET_BADGES = 3;
+const MARKET_METRIC_FIELDS = [
+  'key',
+  'text',
+  'textSegments',
+  'secondaryText',
+  'secondaryTextSegments',
+  'weight',
+  'alignment',
+  'tone',
+  'secondaryTone',
+] as const;
 
 function isDevelopment(): boolean {
   return typeof __DEV__ !== 'undefined' && __DEV__;
@@ -982,8 +994,88 @@ function assertWebMarketTable(
   });
 }
 
+function assertMarketMetrics(
+  metrics: MarketRow['metrics'],
+  path: string
+): void {
+  if (metrics === undefined) return;
+  if (!Array.isArray(metrics) || ![2, 3].includes(metrics.length))
+    fail(path, 'must contain 2 or 3 columns');
+  const keys = new Set<string>();
+  metrics.forEach(
+    (column: NonNullable<MarketRow['metrics']>[number], index: number) => {
+      const columnPath = `${path}[${index}]`;
+      const value = protocolObject(column, columnPath);
+      protocolKey(value.key, `${columnPath}.key`);
+      if (keys.has(column.key)) fail(`${columnPath}.key`, 'must be unique');
+      keys.add(column.key);
+      if (typeof value.text !== 'string')
+        fail(`${columnPath}.text`, 'must be a string');
+      for (const field of ['textSegments', 'secondaryTextSegments'] as const) {
+        const segments = column[field];
+        if (segments !== undefined && !Array.isArray(segments))
+          fail(`${columnPath}.${field}`, 'must be an array');
+        segments?.forEach((segment: ValueTextSegment, segmentIndex: number) => {
+          const segmentPath = `${columnPath}.${field}[${segmentIndex}]`;
+          protocolObject(segment, segmentPath);
+          if (typeof segment.text !== 'string')
+            fail(`${segmentPath}.text`, 'must be a string');
+          if (segment.style !== undefined && segment.style !== 'subscript')
+            fail(`${segmentPath}.style`, 'must be subscript');
+        });
+      }
+      if (
+        value.weight !== undefined &&
+        ![1, 2, 3].includes(value.weight as number)
+      )
+        fail(`${columnPath}.weight`, 'must be 1, 2, or 3');
+      if (
+        value.alignment !== undefined &&
+        !['start', 'center', 'end'].includes(value.alignment as string)
+      )
+        fail(`${columnPath}.alignment`, 'must be start, center, or end');
+      if (
+        value.secondaryText !== undefined &&
+        typeof value.secondaryText !== 'string'
+      )
+        fail(`${columnPath}.secondaryText`, 'must be a string');
+      assertTextTone(value.tone as string | undefined, `${columnPath}.tone`);
+      assertTextTone(
+        value.secondaryTone as string | undefined,
+        `${columnPath}.secondaryTone`
+      );
+    }
+  );
+}
+
 function assertMarketRow(row: MarketRow, path: string): void {
   assertWebMarketTable(row.webTable, `${path}.webTable`);
+  assertMarketMetrics(row.metrics, `${path}.metrics`);
+  if (row.metrics !== undefined) {
+    row.metrics.forEach((column, index) => {
+      const columnPath = `${path}.metrics[${index}]`;
+      const value = protocolObject(column, columnPath);
+      assertUnknownKeys(
+        value,
+        MARKET_METRIC_FIELDS,
+        columnPath,
+        'Market metric key'
+      );
+      assertKey(column.key, `${columnPath}.key`);
+      assertText(column.text, `${columnPath}.text`);
+      assertText(column.secondaryText, `${columnPath}.secondaryText`);
+      assertTextTone(column.tone, `${columnPath}.tone`);
+      assertTextTone(column.secondaryTone, `${columnPath}.secondaryTone`);
+      for (const field of ['textSegments', 'secondaryTextSegments'] as const) {
+        column[field]?.forEach((segment, segmentIndex) => {
+          const segmentPath = `${columnPath}.${field}[${segmentIndex}]`;
+          assertText(segment.text, `${segmentPath}.text`);
+          if (segment.style !== undefined && segment.style !== 'subscript')
+            fail(`${segmentPath}.style`, 'must be subscript');
+        });
+      }
+    });
+  }
   if (!['token', 'stock', 'perp'].includes(row.variant)) {
     fail(`${path}.variant`, 'must be token, stock, or perp');
   }
@@ -2386,6 +2478,7 @@ const ROW_FIELDS: Readonly<Record<string, readonly string[]>> = {
     ...COMMON_ROW_FIELDS,
     'variant',
     'webTable',
+    'metrics',
     'leadingAction',
     'leading',
     'title',
@@ -2557,6 +2650,7 @@ const PATCH_FIELDS: Readonly<Record<string, readonly string[]>> = {
     'subtitle',
     'badges',
     'webTable',
+    'metrics',
     'price',
     'priceSegments',
     'change',
@@ -2942,6 +3036,7 @@ function assertRowProtocol(row: RowModel, path: string): void {
   }
   if (row.type === 'market') {
     protocolObject(row.change, `${path}.change`);
+    assertMarketMetrics(row.metrics, `${path}.metrics`);
     if (row.webTable) {
       const { columns, cells } = row.webTable;
       if (
@@ -3805,6 +3900,21 @@ function sanitizeDecoration(value: unknown, field: string): unknown {
   return next;
 }
 
+function sanitizeMarketMetrics(value: unknown): unknown {
+  if (!Array.isArray(value)) return value;
+  return value.map((metric) => {
+    const next = pickFields(
+      metric as Record<string, unknown>,
+      MARKET_METRIC_FIELDS
+    );
+    for (const field of ['textSegments', 'secondaryTextSegments'] as const) {
+      if (next[field] !== undefined)
+        next[field] = sanitizeDecoration(next[field], field);
+    }
+    return next;
+  });
+}
+
 function sanitizeRowForProduction(row: RowModel): RowModel {
   const object = protocolObject(row, 'row');
   const fields = ROW_FIELDS[row.type];
@@ -3826,7 +3936,10 @@ function sanitizeRowForProduction(row: RowModel): RowModel {
         sanitizeRowForProduction(child as RowModel)
       );
     else {
-      const normalized = sanitizeDecoration(value, field);
+      const normalized =
+        row.type === 'market' && field === 'metrics'
+          ? sanitizeMarketMetrics(value)
+          : sanitizeDecoration(value, field);
       if (normalized === undefined) delete next[field];
       else next[field] = normalized;
     }
@@ -3871,7 +3984,9 @@ function normalizeEmptyImages(value: unknown, field = ''): unknown {
       ].includes(key);
     if (
       item === undefined ||
-      (item === null && optional) ||
+      (item === null &&
+        optional &&
+        !(object.type === 'market' && key === 'metrics')) ||
       (['priceSegments', 'subtitleSegments'].includes(key) &&
         Array.isArray(item) &&
         item.length === 0)
@@ -3993,6 +4108,12 @@ export function validateSnapshot(
   assertPlainSerializable(snapshot, 'snapshot', new Set<object>(), false);
   protocolObject(snapshot, 'snapshot');
   const normalized = normalizeEmptyImages(snapshot) as NativeListSnapshot;
+  if (Array.isArray(normalized.rows)) {
+    normalized.rows.forEach((row, index) => {
+      if (row.type === 'market')
+        assertMarketMetrics(row.metrics, `snapshot.rows[${index}].metrics`);
+    });
+  }
   const canonical = isDevelopment()
     ? normalized
     : normalizeSnapshotForProduction(normalized);
@@ -4423,6 +4544,11 @@ function normalizePatch(patch: RowPatch, index: number): RowPatch | undefined {
       continue;
     }
     if (value === null) {
+      if (patch.type === 'market' && field === 'metrics')
+        fail(
+          `${path}.changes.metrics`,
+          'use a full snapshot to remove metrics'
+        );
       if (
         REQUIRED_ROW_FIELDS[patch.type].includes(field) ||
         (patch.type === 'system' && field === 'message')
@@ -4434,6 +4560,11 @@ function normalizePatch(patch: RowPatch, index: number): RowPatch | undefined {
       changes[field] = null;
       continue;
     }
+    if (patch.type === 'market' && field === 'metrics')
+      assertMarketMetrics(
+        value as MarketRow['metrics'],
+        `${path}.changes.metrics`
+      );
     if (
       ['priceSegments', 'subtitleSegments'].includes(field) &&
       Array.isArray(value) &&
@@ -4450,6 +4581,8 @@ function normalizePatch(patch: RowPatch, index: number): RowPatch | undefined {
     }
     const canonical = isDevelopment()
       ? normalized
+      : patch.type === 'market' && field === 'metrics'
+      ? sanitizeMarketMetrics(normalized)
       : sanitizeDecoration(normalized, field);
     if (canonical !== undefined) changes[field] = canonical;
     else if (field === 'titleImage') changes[field] = null;
@@ -4475,6 +4608,11 @@ function normalizePatch(patch: RowPatch, index: number): RowPatch | undefined {
   const values = Object.fromEntries(
     Object.entries(changes).filter(([, value]) => value !== null)
   );
+  if (patch.type === 'market' && 'metrics' in changes)
+    assertMarketMetrics(
+      changes.metrics as MarketRow['metrics'],
+      `${path}.changes.metrics`
+    );
   assertPlainSerializable(values, `${path}.changes`, new Set<object>());
   assertProtocolFields(values, `${path}.changes`);
   if (isDevelopment())