@astryxdesign/core 0.7.5 → 0.7.6-canary.0135af4

package/src/Item/Item.tsx

@@ -48,7 +48,9 @@ import {
   typeScaleVars,
 } from '../theme/tokens.stylex';
 import type {BaseProps} from '../BaseProps';
-import {isRenderable, mergeProps} from '../utils';
+import {isRenderable} from '../utils/isRenderable';
+import {mergeProps} from '../utils/mergeProps';
+import {useFocusAcrossSwap} from '../utils/useFocusAcrossSwap';
 import {ItemDescriptionContext} from './ItemDescriptionContext';
 import {ItemMarkerColumnsContext} from './ItemMarkerColumnsContext';
 import {useMergedRefs} from '../hooks/useMergedRefs';
@@ -610,6 +612,13 @@ export function Item({
   const pressable = usePressFeedback();
   const columnMarker = use(ItemMarkerColumnsContext);
   const LinkComponent = useLinkComponent();
+  // A disabled row's anchor has no destination, so no activation path (a
+  // screen reader's click, Enter, a link context menu) can navigate
+  // (spec:AST-085 FR2). Like a disabled Link, it keeps the link role and skips
+  // the router link component, which may require a live href. The element type
+  // then changes with `isDisabled`, so focus follows the swap (FR4).
+  const RowAnchor = isDisabled ? 'a' : LinkComponent;
+  const anchorRef = useFocusAcrossSwap<HTMLAnchorElement>();
 
   // Delegation mode: the row is an enlarged click/tap target for a nested
   // control (e.g. a checkbox) that owns the keyboard access and action. The
@@ -709,7 +718,7 @@ export function Item({
 
   // Inline rows are one line by definition, so the description always
   // ellipsizes there — a ReactNode description cannot wrap the row open.
-  const isInline = layout === 'inline' && description != null;
+  const isInline = layout === 'inline' && hasRenderableDescription;
 
   const descriptionTruncateStyle =
     descriptionLines != null
@@ -733,9 +742,9 @@ export function Item({
         )}>
         {label}
       </span>
-      {description != null && (
+      {hasRenderableDescription && (
         <span
-          id={hasRenderableDescription ? descriptionID : undefined}
+          id={descriptionID}
           {...stylex.props(
             styles.description,
             isInline && styles.inlineDescription,
@@ -763,7 +772,7 @@ export function Item({
 
   const content = (
     <>
-      {startContent != null && (
+      {isRenderable(startContent) && (
         <span
           {...stylex.props(
             styles.startContent,
@@ -786,19 +795,18 @@ export function Item({
           {labelAndDescription}
         </span>
       ) : href != null && !isLinkRoot ? (
-        <LinkComponent
-          href={href}
-          target={target}
-          rel={rel}
-          aria-disabled={isDisabled || undefined}
-          tabIndex={isDisabled ? -1 : undefined}
+        <RowAnchor
+          ref={anchorRef}
+          {...(isDisabled
+            ? {role: 'link', 'aria-disabled': true, tabIndex: -1}
+            : {href, target, rel})}
           {...stylex.props(
             styles.invisibleAnchor,
             isInline && styles.inlineContent,
             isDisabled && styles.disabledContent,
           )}>
           {labelAndDescription}
-        </LinkComponent>
+        </RowAnchor>
       ) : onClick != null ? (
         <button
           type="button"
@@ -822,7 +830,7 @@ export function Item({
         </span>
       )}
 
-      {endContent != null && (
+      {isRenderable(endContent) && (
         <span
           {...stylex.props(
             styles.endContent,

package/src/Item/ItemSwipeLayer.tsx

@@ -29,8 +29,9 @@ import {
   spacingVars,
   typeScaleVars,
 } from '../theme/tokens.stylex';
-import {mergeProps} from '../utils';
+import {mergeProps} from '../utils/mergeProps';
 import {themeProps} from '../utils/themeProps';
+import {disabledInteractionProps} from '../utils/disabledInteraction';
 import {focusOutlineProps} from '../utils/focusOutline.stylex';
 import {useMediaQuery} from '../hooks/useMediaQuery';
 import {
@@ -307,13 +308,19 @@ export default function ItemSwipeLayer({
               <button
                 key={entry.id ?? entry.label}
                 type="button"
-                disabled={entry.isDisabled === true}
+                aria-disabled={entry.isDisabled === true ? true : undefined}
                 onClick={() =>
                   swipe.activateEntry(() => {
                     void entry.onActivate();
                     return entry.hasRemoval === true;
                   })
                 }
+                // A disabled entry stays focusable while the row rests open but
+                // is inert: it runs no `onActivate` and its click does not
+                // reach the row (spec:AST-085 FR1, FR2).
+                {...(entry.isDisabled === true
+                  ? disabledInteractionProps<HTMLButtonElement>()
+                  : null)}
                 {...mergeProps(
                   themeProps('item-swipe-action', {variant}),
                   focusOutlineProps.focusVisible(

package/src/Kbd/Kbd.spec.md

@@ -1,37 +1,57 @@
 ---
 schema_version: 3
-template_version: 3
+template_version: 7
 kind: component
 id: component:Kbd
-authority: draft
+authority: current
 archive_reason: null
 superseded_by: null
-approved_by: null
-approved_at: null
+approved_by: cixzhang
+approved_at: 2026-10-31
 owners: [cixzhang]
-review_triggers: [theming]
+review_triggers: [public-api, behavior, theming, accessibility]
 verified_by: [packages/core/src/Kbd/Kbd.test.tsx, scripts/check-knowledge.mjs]
 modules: []
 families: []
 design_specs: []
-architecture: [architecture:component-theming-surface]
+architecture:
+  [
+    architecture:component-theming-surface,
+    architecture:internationalization,
+    architecture:public-component-api,
+  ]
 contributing: []
-system_specs: []
+system_specs: [spec:AST-102]
 ---
 
 # Kbd component contract
 
+## Contract at a glance
+
+| Area                    | Contract                                                                                                                                                                                            |
+| ----------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Public contract         | None changes. Kbd takes a `keys` string and base props.                                                                                                                                             |
+| Behavior                | Kbd splits `keys` on `+`, draws one hidden key badge per key with platform-aware glyphs, and names the whole shortcut once with spoken key names.                                                   |
+| End-user impact         | Sighted people see familiar key glyphs; screen-reader users hear the shortcut as words. Those words are English in every locale.                                                                    |
+| Builder impact          | None.                                                                                                                                                                                               |
+| Compatibility/readiness | Records shipped behavior; no API, default, or DOM change. Badges hold a fixed height; listed under Current-state impact.                                                                            |
+| Review checks           | Reject a badge that is exposed to assistive technology, a caller `role` or `aria-label` that replaces the computed one, duplicate React keys for repeated keys, or `mod` that ignores the platform. |
+| Governing rules         | `architecture:component-theming-surface`; `architecture:internationalization` INV1, INV1a; `architecture:public-component-api` INV5; `spec:AST-102` FR4.                                            |
+
+This table is a review projection; the body below is authoritative.
+
 ## Intent
 
-Kbd presents a keyboard shortcut as one or more painted key badges. This draft
-records current consumer anatomy and theming reachability without changing
-runtime behavior, styling, targets, or public API.
+Kbd presents a keyboard shortcut as one or more painted key badges. It owns
+parsing the shortcut string, the platform-aware glyph for each key, the
+shortcut's accessible name, and the `kbd` target. Consumer usage lives in
+`Kbd.doc.mjs`.
 
 ## Compatibility and migration
 
 - Released default preserved: `yes`
-- Compatibility class: additive documentation only; runtime, DOM, styling,
-  targets, aliases, and public API remain unchanged
+- Compatibility class: records shipped behavior; no public prop, default,
+  export, or DOM change
 - Controlled/uncontrolled behavior: not applicable
 - Migration decision: none
 
@@ -43,54 +63,70 @@ Consumer migration instructions belong in consumer docs and release notes.
 
 - The shortcut group, its current `kbd` target, and the painted key badges it
   renders from the supplied shortcut string.
+- Key parsing, aliases, platform-aware glyphs, and the spoken name.
 
 **Does not own / non-goals**
 
 - The action associated with the shortcut or how the shortcut is discovered —
   owned by the product callsite.
-- Whether an individual key badge should gain a public target — unresolved by
-  this factual backfill.
+- Whether an individual key badge should gain a public target — open (OQ1).
+- Listening for or handling the shortcut — not provided; Kbd is display only.
+- Caller DOM props, `ref`, `className`, `style`, and `xstyle` on the group —
+  shipped and documented, uncontracted here beyond FR4's role and label
+  precedence.
 
 ## Public concepts
 
-No new public concept is introduced. Consumer props and usage remain documented
-in `Kbd.doc.mjs`.
+| Concept | Closed values or states                                             | Meaning               | Availability by variant/orientation/state | Default  | Owner           | Stability | Invalid-value behavior                    |
+| ------- | ------------------------------------------------------------------- | --------------------- | ----------------------------------------- | -------- | --------------- | --------- | ----------------------------------------- |
+| Keys    | `+`-separated key names; `mod`, named keys, aliases, any other text | The shortcut to show. | Always.                                   | required | `component:Kbd` | Stable    | An unknown key shows uppercased as typed. |
 
 ## Behavioral and layout contract
 
-| ID  | Candidate invariant                                                                                          | Basis                           | Draft review state                                  |
-| --- | ------------------------------------------------------------------------------------------------------------ | ------------------------------- | --------------------------------------------------- |
-| FR1 | The current render contains one shortcut group and one painted key badge for every parsed key segment.       | Current source, docs, and tests | Verified current behavior; no new behavior decided  |
-| FR2 | The shortcut group carries the current `kbd` target; individual key badges currently carry no public target. | Current source, docs, and tests | Verified current behavior; theming intent unsettled |
+| ID  | Invariant                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Basis                                                                     |
+| --- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
+| FR1 | The current render contains one shortcut group and one painted key badge for every parsed key segment. `keys` splits on `+`; each segment is trimmed and lowercased, `esc` reads as `escape` and `return` as `enter`, and a repeated key gets its own badge. Each badge is at least the `--spacing-5` size and MUST grow with a set text size so its glyph never clips (`spec:AST-102` FR4). Implementation gap: the badge height is fixed at `--spacing-5`.                                                                                    | Current source, docs, and tests; `spec:AST-102` FR4                       |
+| FR2 | The shortcut group carries the current `kbd` target; individual key badges currently carry no public target (OQ1).                                                                                                                                                                                                                                                                                                                                                                                                                              | Current source, docs, and tests                                           |
+| FR3 | Each badge shows a glyph: `mod` is ⌘ on Apple platforms and the catalog's short Control text ("Ctrl" in English) elsewhere and before hydration; `escape` shows the catalog's short Escape text ("Esc"); `ctrl`, `alt`, `shift`, `enter`, `backspace`, `tab`, and the arrows show their symbols; `plus` shows "+"; any other key shows uppercased.                                                                                                                                                                                              | `architecture:internationalization` INV1a; current source and tests       |
+| FR4 | The group has `role="img"` and an `aria-label` built from each key's spoken name, taken from the Astryx catalog (`mod` is "Command" on Apple platforms and "Control" elsewhere and before hydration; an unknown key is spoken uppercased), joined pairwise through the catalog's shortcut message (" + " in English, for example "Command + K"); every badge is `aria-hidden`. A caller's `role` and `aria-label` never replace the computed ones; other caller ARIA props, such as `aria-labelledby` and `aria-hidden`, still reach the group. | `architecture:internationalization` INV1, INV1a; current source and tests |
 
 ### Allowed variation
 
-- Platform-specific key text and caller-supplied shortcut combinations may vary
-  without changing the two-part anatomy recorded here.
+- **AV1 — Shortcut content.** Platform-specific key text and caller-supplied
+  shortcut combinations may vary without changing the two-part anatomy recorded
+  here.
 
 ### Representative states
 
-- The same anatomy applies to single-key, multi-key, modifier, and
-  platform-resolved shortcuts.
+| State        | Required invariant                                        | Allowed variation |
+| ------------ | --------------------------------------------------------- | ----------------- |
+| Single key   | One badge; the name is the key's spoken name.             | Key.              |
+| Mod + key    | ⌘ or Ctrl by platform; name "Command" or "Control" + key. | Platform.         |
+| Repeated key | One badge per occurrence.                                 | —                 |
 
 ### Transformation and precedence order
 
-- No new parsing, layout, or styling precedence rule is introduced.
+- **ORD1 — Key resolution.** Split on `+` → trim → lowercase → alias → glyph
+  and spoken name.
 
 ### Performance and resources
 
-- No new performance or resource rule is introduced.
+- **PR1 — No listener.** Kbd attaches no event listener.
 
 ## Accessibility contract
 
-This draft does not change or extend Kbd's existing accessible-name behavior.
+- **AR1 — One name.** The shortcut is one image named by its spoken keys,
+  unless a caller's `aria-labelledby` names it; the glyph badges are hidden
+  (FR4).
+- **AR2 — Localization.** Visible short texts and spoken names follow the
+  provider locale through the catalog (FR3, FR4).
 
 ## Design relationships
 
 | Anatomy or state | Design requirement                                                 | Representation authority       | Hierarchy role | Component contract |
 | ---------------- | ------------------------------------------------------------------ | ------------------------------ | -------------- | ------------------ |
-| Shortcut         | Groups the complete shortcut and carries its accessible name.      | Current source and public docs | Supporting     | FR1, FR2           |
-| Key badge        | Paints one visible badge for each key in the supplied combination. | Current source and public docs | Prominent      | FR1, FR2           |
+| Shortcut         | Groups the complete shortcut and carries its accessible name.      | Current source and public docs | Supporting     | FR1, FR2, FR4      |
+| Key badge        | Paints one visible badge for each key in the supplied combination. | Current source and public docs | Prominent      | FR1–FR3            |
 
 ### Theming anatomy
 
@@ -116,25 +152,32 @@ target.
 - `architecture:component-theming-surface` owns anatomy qualification, target
   mapping, and the difference between factual reachability and intended public
   theming API.
+- `architecture:internationalization` owns catalog-backed Astryx text; FR3
+  and FR4 take their short texts, spoken names, and joining message from it.
 
 ## Verification map
 
-| Contract            | Verification                                     | Representative states           | Mutation or failure expectation                                                                  | Audit section       |
-| ------------------- | ------------------------------------------------ | ------------------------------- | ------------------------------------------------------------------------------------------------ | ------------------- |
-| FR1                 | `Kbd.test.tsx` key rendering suites              | Single-key and multi-key output | Removing the group or a parsed badge fails existing role, element, or text assertions.           | `audit:Kbd/anatomy` |
-| FR2                 | Source inspection and current target inventories | Root target and child badges    | Adding or documenting a current target without updating the anatomy map fails repository checks. | `audit:Kbd/theming` |
-| Theming anatomy map | `scripts/check-knowledge.mjs`                    | Canonical anatomy and targets   | Missing, extra, prefixed, stale, or alias-backed mappings fail repository validation.            | `audit:Kbd/theming` |
+| Contract            | Verification                                                                                                                                         | Representative states                                                   | Mutation or failure expectation                                                                                                                                                                                                                                                                                                                       | Audit section             |
+| ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
+| FR1                 | `Kbd.test.tsx` single-key, multi-key, whitespace, alias, and repeated-key cases                                                                      | Single and multiple keys; spaced and mixed-case input; repeated aliases | A missing or extra badge, an untrimmed or wrongly cased key, or a lost alias fails. Evidence gap: no test asserts badge height or text growth.                                                                                                                                                                                                        | `audit:Kbd/anatomy`       |
+| FR2                 | `Kbd.test.tsx` theme-class case                                                                                                                      | Root target and child badges                                            | A missing root `kbd` target fails. Evidence gap: no test asserts that badges carry no target.                                                                                                                                                                                                                                                         | `audit:Kbd/theming`       |
+| FR3, FR4            | `Kbd.test.tsx` glyph, platform, accessible-name, override, and localization cases ("localizes visible key text and the spoken shortcut combination") | Mac and non-Mac; special and unknown keys                               | A wrong glyph for `mod`, `ctrl`, `alt`, `shift`, `enter`, `escape`, `plus`, or an unknown key, an exposed badge, a caller `role` or `aria-label` that replaces the computed one, or text that skips the catalog fails. Evidence gap: no test asserts the `backspace`, `tab`, or arrow glyphs, or the "Ctrl" text and "Control" name before hydration. | `audit:Kbd/accessibility` |
+| Theming anatomy map | `scripts/check-knowledge.mjs`                                                                                                                        | Canonical anatomy and targets                                           | Missing, extra, prefixed, stale, or alias-backed mappings fail repository validation.                                                                                                                                                                                                                                                                 | `audit:Kbd/theming`       |
+| ORD1, PR1, AR1, AR2 | ORD1 is covered by the FR1 and FR3 rows and AR1 and AR2 by the FR3, FR4 row. Evidence gap: no test asserts the absence of listeners                  | —                                                                       | —                                                                                                                                                                                                                                                                                                                                                     | `audit:Kbd/behavior`      |
+
+## Current-state impact
+
+- **Fixed badge height (FR1).** Badges hold a fixed height instead of growing
+  with a set text size, against `spec:AST-102` FR4.
 
 ## Decision log
 
-None. This draft records current facts and introduces no component-local design
-or theming decision.
+No component-local decision.
 
 ## Open questions
 
 - **OQ1 — Should each Key badge gain a stable public theming target?**
-  (`human-api`) Target exposure is unsettled; the current lack of reachability
-  does not decide the answer.
+  (`human-api`) The current lack of reachability does not decide the answer.
 
 ## Content boundary
 

package/src/Layer/popoverOperations.ts

@@ -0,0 +1,172 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file popoverOperations.ts
+ * @input Popover API events (`beforetoggle`, `toggle`) and the layers' own show/hide calls
+ * @output The per-document ledger of popover operations in flight, and the deferral of a show that arrives inside one
+ * @position Internal to the layer runtime; used by useLayer
+ *
+ * SYNC: When modified, update:
+ * - /packages/core/src/Layer/useLayer.tsx
+ * - /packages/core/src/Layer/popoverOperations.test.ts
+ */
+
+/**
+ * Popover operations in flight, per document.
+ *
+ * The Popover API refuses to show a popover while the document is in the
+ * middle of showing or hiding ANY popover: `showPopover()` throws an
+ * `InvalidStateError` ("Invalid to show a popover during another show
+ * operation"; Chromium 150+, where 149 still accepts such a show).
+ * Hiding a popover restores focus to the element that had it —
+ * synchronously, inside that window — so a focus-driven layer on the element
+ * receiving focus (a tooltip on the trigger that just closed a popover) asks
+ * to show while the hide is still running.
+ *
+ * Two kinds of operation are counted:
+ *
+ * - The layers' own shows and hides pass through `runPopoverOperation`, so
+ *   their windows are known exactly: a `show()` that arrives inside one is
+ *   deferred ahead of asking the browser.
+ * - A hide the browser runs on its own — an Escape its close watcher answers,
+ *   a light dismiss, an `auto` popover evicted by another one opening — never
+ *   passes through here. It is observable from its element's events:
+ *   `beforetoggle` fires synchronously as the hide starts, and `toggle` in a
+ *   task once it has ended; `observeBrowserHide` counts it between the two.
+ *   That window is wider than the engine's, which ends when the hide returns,
+ *   so a show inside it is asked of the browser first and deferred only when
+ *   the browser refuses it: a light dismiss at `pointerup` followed by a show
+ *   at `click` in the same gesture still opens at once.
+ *
+ * A deferred show waits in `afterPopoverOperations` and replays, one
+ * microtask each, once the document's last operation of either kind has
+ * ended and the script that started it has unwound.
+ */
+const ownOperationsByDocument = new WeakMap<Document, number>();
+const browserHidesByDocument = new WeakMap<Document, number>();
+const settledCallbacksByDocument = new WeakMap<Document, (() => void)[]>();
+
+function count(map: WeakMap<Document, number>, doc: Document, delta: number) {
+  map.set(doc, Math.max(0, (map.get(doc) ?? 0) + delta));
+}
+
+function anyInFlight(doc: Document): boolean {
+  return (
+    (ownOperationsByDocument.get(doc) ?? 0) > 0 ||
+    (browserHidesByDocument.get(doc) ?? 0) > 0
+  );
+}
+
+function ended(doc: Document): void {
+  if (!anyInFlight(doc) && settledCallbacksByDocument.has(doc)) {
+    // The operation's own script is still on the stack (the `finally` of a
+    // `runPopoverOperation`, a `toggle` listener): replay once it has unwound.
+    queueMicrotask(() => replaySettled(doc));
+  }
+}
+
+function replaySettled(doc: Document): void {
+  if (anyInFlight(doc)) {
+    // Another operation started before the replay ran; its end replays.
+    return;
+  }
+  const callbacks = settledCallbacksByDocument.get(doc);
+  if (callbacks == null) {
+    return;
+  }
+  settledCallbacksByDocument.delete(doc);
+  // One microtask each: a replay that throws reaches the page on its own and
+  // leaves the ones after it to run.
+  for (const callback of callbacks) {
+    queueMicrotask(callback);
+  }
+}
+
+/** Runs `operation`, counting it as one of the layers' own popover operations in `doc`. */
+export function runPopoverOperation(
+  doc: Document,
+  operation: () => void,
+): void {
+  count(ownOperationsByDocument, doc, 1);
+  try {
+    operation();
+  } finally {
+    count(ownOperationsByDocument, doc, -1);
+    ended(doc);
+  }
+}
+
+/** Whether one of the layers' own shows or hides is running in `doc`: a show asked now would be refused. */
+export function isPopoverOperationInFlight(doc: Document): boolean {
+  return (ownOperationsByDocument.get(doc) ?? 0) > 0;
+}
+
+/**
+ * Whether a hide the browser runs itself is counted in `doc`. The count
+ * outlasts the engine's own window (it ends at the element's `toggle`, a task
+ * later), so a show asked inside it may well succeed; one the browser refuses
+ * is deferred to the count's end.
+ */
+export function isBrowserHideInFlight(doc: Document): boolean {
+  return (browserHidesByDocument.get(doc) ?? 0) > 0;
+}
+
+/** Popovers whose browser-run hide is being counted, so one hide is counted once. */
+const browserHidesInFlight = new WeakSet<Element>();
+
+/**
+ * Counts a hide the browser runs itself. Called as the element's `beforetoggle`
+ * fires, which the hide dispatches synchronously as it starts; the count ends
+ * at the element's `toggle`, which the browser queues for the task after the
+ * hide, and in any case at the next task: the hide is synchronous, so the task
+ * after it is past the window even when the element has left the document and
+ * its `toggle` never arrives. Calling it again for the same hide is a no-op.
+ */
+export function observeBrowserHide(popover: HTMLElement): void {
+  if (browserHidesInFlight.has(popover)) {
+    return;
+  }
+  browserHidesInFlight.add(popover);
+  const doc = popover.ownerDocument;
+  count(browserHidesByDocument, doc, 1);
+  const view = doc.defaultView ?? globalThis;
+  let timer: ReturnType<typeof setTimeout> | null = null;
+  let done = false;
+  const finish = () => {
+    if (done) {
+      return;
+    }
+    done = true;
+    popover.removeEventListener('toggle', finish);
+    if (timer != null) {
+      view.clearTimeout(timer);
+      timer = null;
+    }
+    browserHidesInFlight.delete(popover);
+    count(browserHidesByDocument, doc, -1);
+    ended(doc);
+  };
+  popover.addEventListener('toggle', finish);
+  timer = view.setTimeout(finish, 0);
+}
+
+/**
+ * Runs `callback` once no popover operation of either kind is in flight in
+ * `doc`: at once when none is, otherwise in its own microtask after the last
+ * one has ended and the script that started it has unwound.
+ */
+export function afterPopoverOperations(
+  doc: Document,
+  callback: () => void,
+): void {
+  if (!anyInFlight(doc)) {
+    callback();
+    return;
+  }
+  const callbacks = settledCallbacksByDocument.get(doc);
+  if (callbacks == null) {
+    settledCallbacksByDocument.set(doc, [callback]);
+  } else {
+    callbacks.push(callback);
+  }
+}