@gjsify/adwaita-nativescript 0.46.0 → 0.48.0

package/lib/types/widgets/adw-entry-row.d.ts

@@ -1,7 +1,7 @@
 import { Label, StackLayout, TextField, type EventData, type View } from '@nativescript/core';
 import { EntryRowState, type EntryRowRenderState } from '@gjsify/adwaita-core';
 import { AdwActionRow } from './adw-action-row.js';
-import { AdwIcon } from './adw-icon.js';
+import { GtkImage } from './gtk-image.js';
 import { AdwImageButton } from './adw-image-button.js';
 export { EntryRowState } from '@gjsify/adwaita-core';
 export type { EntryRowRenderState, EntryRowActivation } from '@gjsify/adwaita-core';
@@ -44,9 +44,9 @@ export declare class AdwEntryRow extends AdwActionRow {
     /** The trailing affordance box — `Adw.EntryRow`'s suffixes BOX, not a slot. */
     protected readonly _suffixes: StackLayout;
     /** The pencil (`edit_icon`). Non-interactive, like its `can-target=False` original. */
-    protected readonly _editIcon: AdwIcon;
+    protected readonly _editIcon: GtkImage;
     /** The caps-lock warning slot (`indicator`). */
-    protected readonly _indicator: AdwIcon;
+    protected readonly _indicator: GtkImage;
     protected readonly _applyButton: AdwImageButton;
     /** The suffix installed through the inherited single-slot {@link setSuffix}. */
     private _slotSuffix;

package/lib/types/widgets/adw-expander-row.d.ts

@@ -1,7 +1,7 @@
 import type { View } from '@nativescript/core';
 import { ItemSpec, StackLayout, type EventData } from '@nativescript/core';
 import { AdwActionRow } from './adw-action-row.js';
-import { AdwIcon } from './adw-icon.js';
+import { GtkImage } from './gtk-image.js';
 export { ExpanderState } from '@gjsify/adwaita-core';
 export type { ExpanderStateListener } from '@gjsify/adwaita-core';
 /** Event name emitted when {@link AdwExpanderRow.expanded} changes. Mirrors GObject `notify::expanded`. */
@@ -16,7 +16,7 @@ export declare class AdwExpanderRow extends AdwActionRow {
      *  (adw-expander-row.c:72), so the search does not consult a subtitle here. */
     readonly isActionRow: boolean;
     /** The disclosure chevron (suffix) — a plain symbolic icon, like Adw.ExpanderRow. */
-    protected readonly _toggle: AdwIcon;
+    protected readonly _toggle: GtkImage;
     /** The container of revealed child rows (second grid row). */
     protected readonly _disclosure: StackLayout;
     /** The headless expanded/collapsed disclosure state machine (ADR 0004). */

package/lib/types/widgets/adw-slider-row.d.ts

@@ -1,9 +1,10 @@
 import { Label, Slider, StackLayout, type EventData } from '@nativescript/core';
+import type { AdwAdjustment, AdwAdjustmentInput } from '@gjsify/adwaita-core';
 /** Event name emitted when {@link AdwSliderRow.value} changes. Mirrors GObject `notify::value`. */
 export declare const NOTIFY_SLIDER_VALUE = "notify::value";
 /** Payload of the `notify::value` event. */
 export interface NotifySliderValueEventData extends EventData {
-    /** The new numeric value (already clamped to `[min, max]` and snapped to `step`). */
+    /** The new numeric value (already clamped into the adjustment's range and snapped to a tick). */
     value: number;
 }
 export declare class AdwSliderRow extends StackLayout {
@@ -13,32 +14,29 @@ export declare class AdwSliderRow extends StackLayout {
     protected readonly _valueLabel: Label;
     /** The horizontal slider. */
     protected readonly _slider: Slider;
-    private _value;
-    private _min;
-    private _max;
-    private _step;
+    /** The headless adjustment: clamp, step and the two signals (ADR 0004, ADR 0047). */
+    private readonly _state;
     /** Guards the slider's `valueChange` while we programmatically set its value. */
     private _suppress;
     constructor();
-    /** Clamp to `[min, max]` then snap to the nearest `step` from `min`. */
-    private _snap;
     /** Push the current value to the slider + label without emitting. */
     private _sync;
     /** The group title shown in the header (left). */
     get title(): string;
     set title(value: string);
-    /** The current numeric value (always within `[min, max]`, snapped to `step`). */
+    /** The current numeric value (always within the adjustment's range, snapped to a tick). */
     get value(): number;
     set value(raw: number | string);
-    /** Lower bound. Re-clamps the current value if it now falls below. */
-    get min(): number;
-    set min(raw: number | string);
-    /** Upper bound. Re-clamps the current value if it now falls above. */
-    get max(): number;
-    set max(raw: number | string);
-    /** Snap granularity applied as the slider is dragged. */
-    get step(): number;
-    set step(raw: number | string);
+    /**
+     * The numeric range this row slides through — the `Gtk.Adjustment` a `Gtk.Scale` is
+     * handed, under the same key the spin row uses.
+     *
+     * Reads back whole; writes MERGE, so `adjustment = { upper: 20 }` moves one bound and
+     * leaves the rest. From XML it is a JSON object —
+     * `adjustment='{"lower":0,"upper":20,"stepIncrement":5}'`.
+     */
+    get adjustment(): AdwAdjustment;
+    set adjustment(v: AdwAdjustmentInput | string);
     /** The underlying {@link Slider} (e.g. to tweak styling). */
     get slider(): Slider;
 }

package/lib/types/widgets/adw-spin-row.d.ts

@@ -1,14 +1,15 @@
 import { Label } from '@nativescript/core';
 import type { EventData } from '@nativescript/core';
+import type { AdwAdjustment, AdwAdjustmentInput } from '@gjsify/adwaita-core';
 import { AdwActionRow } from './adw-action-row.js';
 import { AdwImageButton } from './adw-image-button.js';
 export { SpinState } from '@gjsify/adwaita-core';
-export type { SpinStateChange, SpinStateListener } from '@gjsify/adwaita-core';
+export type { AdwAdjustment, AdwAdjustmentInput, SpinStateChange, SpinStateListener } from '@gjsify/adwaita-core';
 /** Event name emitted when {@link AdwSpinRow.value} changes. Mirrors GObject `notify::value`. */
 export declare const NOTIFY_VALUE = "notify::value";
 /** Payload of the `notify::value` event. */
 export interface NotifyValueEventData extends EventData {
-    /** The new numeric value (already clamped to `[min, max]`). */
+    /** The new numeric value (already clamped into the adjustment's range). */
     value: number;
 }
 export declare class AdwSpinRow extends AdwActionRow {
@@ -18,19 +19,21 @@ export declare class AdwSpinRow extends AdwActionRow {
     protected readonly _plusButton: AdwImageButton;
     /** The value display before the stepper buttons. */
     protected readonly _valueLabel: Label;
-    /** The headless value/min/max/step clamp-and-step state machine (ADR 0004). */
+    /** The headless adjustment: clamp, step and the two signals (ADR 0004, ADR 0047). */
     private readonly _state;
     constructor();
-    /** The current numeric value (always within `[min, max]`). */
+    /** The current numeric value (always within the adjustment's range). */
     get value(): number;
     set value(v: number | string);
-    /** Lower bound. Re-clamps the current value if it now falls below. */
-    get min(): number;
-    set min(v: number | string);
-    /** Upper bound. Re-clamps the current value if it now falls above. */
-    get max(): number;
-    set max(v: number | string);
-    /** Increment/decrement step applied per button press. */
-    get step(): number;
-    set step(v: number | string);
+    /**
+     * The numeric range this row steps through — `Adw.SpinRow:adjustment`.
+     *
+     * Reads back whole; writes MERGE, so `adjustment = { upper: 20 }` moves one bound and
+     * leaves the rest, the value included (re-clamped if the move came under it). From XML
+     * it is a JSON object — `adjustment='{"lower":1,"upper":20}'` — which is why the setter
+     * takes a string: NativeScript's XML builder assigns attributes verbatim, so a
+     * non-string property needs its own door (see `xml-values.ts`).
+     */
+    get adjustment(): AdwAdjustment;
+    set adjustment(v: AdwAdjustmentInput | string);
 }

package/lib/types/widgets/adw-split-button.d.ts

@@ -1,6 +1,6 @@
 import { GridLayout, Label, StackLayout, type EventData } from '@nativescript/core';
-import type { AdwMenuEntry, SplitButtonDirection } from '@gjsify/adwaita-core';
-import { AdwIcon } from './adw-icon.js';
+import type { AdwMenuActions, AdwMenuInput, AdwMenuModel, SplitButtonDirection } from '@gjsify/adwaita-core';
+import { GtkImage } from './gtk-image.js';
 /** Event name emitted when the main action part is tapped. Mirrors `Adw.SplitButton::clicked`. */
 export declare const CLICKED = "clicked";
 /** Event name emitted when a dropdown menu item is chosen. */
@@ -9,9 +9,15 @@ export declare const MENU_TAPPED = "menuTapped";
 export interface MenuTappedEventData extends EventData {
     /** The chosen menu item label. */
     item: string;
-    /** The chosen item's index in {@link AdwSplitButton.menu} — its GMenuModel POSITION. */
-    index: number;
-    /** The chosen item's detailed action name, when the entry carried one. */
+    /** The chosen item's id, falling back to its label. */
+    id: string;
+    /**
+     * Where the item sits in {@link AdwSplitButton.menuModel} — its `GMenuModel`
+     * POSITION, as a PATH since ADR 0042: a submenu is a model of its own, so `[2, 0]`
+     * is the first item of the third entry and a flat index cannot name it.
+     */
+    path: readonly number[];
+    /** The chosen item's detailed action name, when the item carried one. */
     action?: string;
 }
 export declare class AdwSplitButton extends GridLayout {
@@ -20,12 +26,13 @@ export declare class AdwSplitButton extends GridLayout {
     /** The action label (shown in label mode). */
     protected readonly _actionLabel: Label;
     /** The action symbolic icon (shown in icon mode). */
-    protected readonly _actionIcon: AdwIcon;
+    protected readonly _actionIcon: GtkImage;
     /** The dropdown-arrow part (column 1). */
     protected readonly _dropdownPart: GridLayout;
     /** The direction arrow. */
-    protected readonly _chevron: AdwIcon;
+    protected readonly _chevron: GtkImage;
     private readonly _state;
+    private _actions;
     /** Which of the two action views is currently parented. */
     private _showingIcon;
     /**
@@ -64,9 +71,37 @@ export declare class AdwSplitButton extends GridLayout {
      */
     get iconName(): string;
     set iconName(svg: string);
-    /** The dropdown menu entries (opened as a native `action()` sheet on arrow tap). */
-    get menu(): readonly AdwMenuEntry[];
-    set menu(value: readonly (string | AdwMenuEntry)[]);
+    /**
+     * The dropdown menu, normalised (ADR 0042) — opened as a native `action()` sheet on
+     * an arrow tap.
+     *
+     * Accepts everything the portable model does, INCLUDING the bare `string[]` this
+     * widget used to be alone in taking: that shorthand is now one of the model's own
+     * input forms rather than a NativeScript-only shape, so the same value works on
+     * every surface.
+     *
+     * IT DOES NOT TAKE A JSON STRING, which the browser element's `menu-model`
+     * ATTRIBUTE does. Not an oversight: NativeScript's Builder writes an XML attribute
+     * straight onto the property, so accepting one here would open the XML door — and
+     * the gallery probe that would have to prove it compares a read-back by IDENTITY
+     * (`gallery-page.ts`), which no structured value can satisfy. An input form nothing
+     * can run is a claim, not a feature.
+     *
+     * AND IT SAYS SO. Left to `normalizeMenuModel`, a string is "not an array" and
+     * becomes an EMPTY menu — so an XML author writing `menuModel="[…]"` would get a
+     * button whose dropdown is dead, with nothing anywhere saying why. A shut door that
+     * is silent is worse than one that is open.
+     */
+    get menuModel(): AdwMenuModel;
+    set menuModel(value: AdwMenuInput);
+    /**
+     * What the action group publishes about the actions this menu names — the portable
+     * stand-in for a `GActionGroup`, and the only source of a menu's enabled/checked
+     * state (ADR 0042). A sheet has no disabled row, so an insensitive item is not
+     * offered; a checked one wears a tick.
+     */
+    get actions(): AdwMenuActions | null;
+    set actions(value: AdwMenuActions | null);
     /** The direction the arrow points (and, on GTK, the popup opens). */
     get direction(): SplitButtonDirection;
     set direction(value: SplitButtonDirection);

package/lib/types/widgets/adw-status-page.d.ts

@@ -1,11 +1,11 @@
 import type { View } from '@nativescript/core';
 import { GridLayout, Label, StackLayout } from '@nativescript/core';
-import { AdwIcon } from './adw-icon.js';
+import { GtkImage } from './gtk-image.js';
 export declare class AdwStatusPage extends GridLayout {
     /** The centered vertical stack. */
     protected readonly _stack: StackLayout;
     /** The large symbolic icon (shown when an `icon` SVG is set). */
-    protected readonly _icon: AdwIcon;
+    protected readonly _icon: GtkImage;
     private _iconSvg;
     /** The large glyph label (shown when `iconText` is set — the legacy fallback). */
     protected readonly _iconLabel: Label;

package/lib/types/widgets/entry-row-view.d.ts

@@ -47,7 +47,7 @@ export declare const NS_ENTRY_ROW_CLASS = "adw-row adw-action-row adw-entry-row"
 /** Base class list of a password entry row. */
 export declare const NS_PASSWORD_ENTRY_ROW_CLASS = "adw-row adw-action-row adw-entry-row adw-password-entry-row";
 /** Class list of the trailing pencil. */
-export declare const NS_EDIT_ICON_CLASS = "adw-icon adw-entry-edit";
+export declare const NS_EDIT_ICON_CLASS = "gtk-image adw-entry-edit";
 /**
  * Marker class for a desensitized part. NS has no insensitive state, so the
  * class is only a styling hook — {@link NS_INSENSITIVE_OPACITY} is what the user

package/lib/types/widgets/gtk-drop-down.d.ts

@@ -1,6 +1,6 @@
 import { Label, StackLayout, type EventData } from '@nativescript/core';
-import type { AdwComboOption } from '@gjsify/adwaita-core';
-import { AdwIcon } from './adw-icon.js';
+import type { AdwComboOption, AdwListModelInput } from '@gjsify/adwaita-core';
+import { GtkImage } from './gtk-image.js';
 /** Event name emitted when {@link GtkDropDown.selected} changes through a pick. Mirrors GObject `notify::selected`. */
 export declare const NOTIFY_SELECTED = "notify::selected";
 /** Payload of the `notify::selected` event. */
@@ -16,7 +16,7 @@ export declare class GtkDropDown extends StackLayout {
     /** The button label — the selected option. */
     protected readonly _label: Label;
     /** The down-chevron — a real Adwaita `pan-down-symbolic` icon. */
-    protected readonly _chevron: AdwIcon;
+    protected readonly _chevron: GtkImage;
     /** The headless options list + selectedIndex↔selectedValue state machine (ADR 0004). */
     private readonly _state;
     /** Title shown atop the substituted `action()` sheet. */
@@ -24,9 +24,9 @@ export declare class GtkDropDown extends StackLayout {
     constructor();
     /** Open the native chooser and apply the picked option. */
     private _openChooser;
-    /** The selectable options. Updates the button label. */
-    get options(): AdwComboOption[];
-    set options(value: AdwComboOption[]);
+    /** The list model (`Gtk.DropDown:model`). Updates the button label. */
+    get model(): AdwComboOption[];
+    set model(value: AdwListModelInput);
     /** The selected option index (`Gtk.DropDown:selected`). */
     get selected(): number;
     set selected(raw: number | string);

package/lib/types/widgets/{adw-icon.d.ts → gtk-image.d.ts}

@@ -1,7 +1,7 @@
 import { Image } from '@nativescript/core';
 /** Default decorative-icon size, in DIPs — the Adwaita 16px symbolic grid. */
-export declare const DEFAULT_ADW_ICON_SIZE = 16;
-export declare class AdwIcon extends Image {
+export declare const DEFAULT_GTK_IMAGE_SIZE = 16;
+export declare class GtkImage extends Image {
     private _iconSvg;
     private _iconColor;
     private _explicitColor;

package/lib/types/widgets/gtk-menu-button.d.ts

@@ -1,34 +1,44 @@
-import type { AdwMenuEntry } from '@gjsify/adwaita-core';
+import type { AdwMenuActions, AdwMenuInput, AdwMenuModel } from '@gjsify/adwaita-core';
 import { type EventData } from '@nativescript/core';
 import { AdwImageButton } from './adw-image-button.js';
 /** Event name emitted when a menu item is chosen. */
 export declare const MENU_ITEM_ACTIVATED = "menuItemActivated";
-/**
- * One entry in an {@link GtkMenuButton}'s menu — `@gjsify/adwaita-core`'s
- * {@link AdwMenuEntry}, under the name this widget has always used.
- *
- * It used to be a THIRD declaration of the same shape (the browser element had a
- * second, and the core the original), and this one was missing `icon` — so a menu
- * written for one renderer was not the same object on the other. The browser side
- * adopted the core type in #1191; this is its twin.
- */
-export type AdwMenuItem = AdwMenuEntry;
 /** Payload of the {@link MENU_ITEM_ACTIVATED} event. */
 export interface MenuItemActivatedEventData extends EventData {
     /** The chosen item's id (or its label when no id was given). */
     id: string;
     /** The chosen item's label. */
     label: string;
-    /** The chosen item's index in {@link GtkMenuButton.menuItems}. */
-    index: number;
+    /**
+     * Where the item sits in {@link GtkMenuButton.menuModel} — a PATH since ADR 0042,
+     * because a submenu is a model of its own and a flat index cannot name one.
+     */
+    path: readonly number[];
+    /** The chosen item's detailed action name, when the item carried one. */
+    action?: string;
 }
 export declare class GtkMenuButton extends AdwImageButton {
-    private _items;
+    private _model;
+    private _actions;
     private _menuTitle;
     constructor();
-    /** The menu items (opened as a native `action()` sheet on tap). */
-    get menuItems(): AdwMenuItem[];
-    set menuItems(value: AdwMenuItem[]);
+    /**
+     * The menu, normalised (ADR 0042) — opened as a native `action()` sheet on tap.
+     *
+     * Accepts every input form the portable model does, a bare `string[]` included —
+     * but NOT a JSON string; see `AdwSplitButton.menuModel` for why the XML door stays
+     * shut until a probe can prove it, and why being shut is not the same as being
+     * silent.
+     */
+    get menuModel(): AdwMenuModel;
+    set menuModel(value: AdwMenuInput);
+    /**
+     * What the action group publishes about the actions this menu names — the portable
+     * stand-in for a `GActionGroup`, and the only source of a menu's enabled/checked
+     * state (ADR 0042).
+     */
+    get actions(): AdwMenuActions | null;
+    set actions(value: AdwMenuActions | null);
     /** Optional title shown atop the native menu sheet. */
     get menuTitle(): string;
     set menuTitle(value: string);

package/lib/types/widgets/index.d.ts

@@ -22,8 +22,10 @@ export { GtkButton } from './gtk-button.js';
 export type { AdwButtonVariant } from './gtk-button.js';
 export { AdwImageButton, DEFAULT_ICON_BUTTON_ICON_SIZE } from './adw-image-button.js';
 export { GtkMenuButton, MENU_ITEM_ACTIVATED } from './gtk-menu-button.js';
-export type { AdwMenuItem, MenuItemActivatedEventData } from './gtk-menu-button.js';
-export { AdwIcon, DEFAULT_ADW_ICON_SIZE } from './adw-icon.js';
+export type { MenuItemActivatedEventData } from './gtk-menu-button.js';
+export { MENU_CANCEL_LABEL, menuSheetActions, menuSheetRows, presentMenuSheet, resolveMenuChoice, } from './menu-sheet.js';
+export type { MenuSheetPresenter, MenuSheetRow } from './menu-sheet.js';
+export { GtkImage, DEFAULT_GTK_IMAGE_SIZE } from './gtk-image.js';
 export { AdwBanner, BUTTON_CLICKED } from './adw-banner.js';
 export { AdwAvatar, DEFAULT_AVATAR_SIZE, avatarInitials } from './adw-avatar.js';
 export { AdwWindowTitle } from './adw-window-title.js';

package/lib/types/widgets/menu-sheet.d.ts

@@ -0,0 +1,58 @@
+import type { AdwMenuActions, AdwMenuModel, AdwMenuPath } from '@gjsify/adwaita-core';
+/** Text of the sheet's dismiss button. */
+export declare const MENU_CANCEL_LABEL = "Cancel";
+/** One row of the sheet: the string presented, and where in the model it came from. */
+export interface MenuSheetRow {
+    /** The string handed to `action()`, unique within the page. */
+    readonly action: string;
+    readonly path: AdwMenuPath;
+    /** Whether choosing it opens another sheet rather than activating an item. */
+    readonly submenu: boolean;
+}
+/**
+ * The rows of ONE page — the model's root, or the submenu at `page`.
+ *
+ * `cancelLabel` seeds the uniqueness set, which is what makes a menu item literally
+ * called "Cancel" distinguishable from the reader dismissing the sheet.
+ */
+export declare function menuSheetRows(model: AdwMenuModel, page?: AdwMenuPath, actions?: AdwMenuActions, cancelLabel?: string): MenuSheetRow[];
+/** Just the strings, in order — what `action()` takes. */
+export declare const menuSheetActions: (rows: readonly MenuSheetRow[]) => string[];
+/**
+ * The row the reader chose, or `null` when the sheet was dismissed. Feed it the SAME
+ * rows {@link menuSheetRows} produced, or the lookup is a guess.
+ */
+export declare function resolveMenuChoice(rows: readonly MenuSheetRow[], chosen: string | null | undefined): MenuSheetRow | null;
+/** What a caller supplies so this module never imports `@nativescript/core`. */
+export type MenuSheetPresenter = (options: {
+    title?: string;
+    cancelButtonText: string;
+    actions: string[];
+}) => Promise<string | undefined>;
+/**
+ * Present the menu, descending into submenus, and answer with the chosen item's PATH.
+ *
+ * The loop is what makes a submenu a real submenu on a surface that has only one list:
+ * choosing a submenu row presents that submenu's rows, with the submenu's own label as
+ * the sheet title so the reader can see where they are. A dismissal at any depth ends
+ * the interaction — there is no "back" button on a platform sheet, and inventing one as
+ * a row would be a menu entry the model does not have.
+ */
+export declare function presentMenuSheet(present: MenuSheetPresenter, model: AdwMenuModel, options?: {
+    title?: string;
+    actions?: AdwMenuActions;
+    cancelLabel?: string;
+}): Promise<AdwMenuPath | null>;
+/**
+ * Refuse a JSON STRING where a menu model belongs, loudly.
+ *
+ * NativeScript's `Builder` assigns an XML attribute straight onto the property, so a
+ * `menuModel="[…]"` in a view file lands here as a string. The model does not accept one
+ * — the gallery probe that would have to prove the XML door compares a read-back by
+ * IDENTITY, which no structured value satisfies — and left to `normalizeMenuModel` a
+ * string is simply "not an array", so the author would get an EMPTY menu and no
+ * diagnostic at all.
+ *
+ * A door that is shut may not also be silent. This is the sentence that says which.
+ */
+export declare function refuseMenuString(value: unknown, widget: string): void;

package/lib/types/widgets/row-state.d.ts

@@ -37,7 +37,7 @@ export interface NsButtonRowIconVisuals {
  * title through a second state object would give one label two sources of truth.
  * {@link rowLabelVisuals} paints it.
  *
- * The icon payload is the symbolic SVG SOURCE, not GTK's icon name, because `AdwIcon`
+ * The icon payload is the symbolic SVG SOURCE, not GTK's icon name, because `GtkImage`
  * renders SVG rather than resolving a name. `ButtonRowState` is indifferent: its rule
  * is `string_is_not_empty`, which reads the first byte.
  */

package/lib/types/widgets/split-button.d.ts

@@ -1,30 +1,11 @@
-import type { AdwArrowIcon, AdwMenuEntry, SplitButtonDirection, SplitButtonState } from '@gjsify/adwaita-core';
-export type { AdwMenuEntry, SplitButtonDirection };
-/** Text of the sheet's dismiss button. */
-export declare const MENU_CANCEL_LABEL = "Cancel";
+import type { AdwArrowIcon, SplitButtonDirection, SplitButtonState } from '@gjsify/adwaita-core';
+export type { SplitButtonDirection };
 /**
  * The libadwaita arrow glyph names mapped to real Adwaita symbolic SVGs. Keyed by
  * {@link AdwArrowIcon} and therefore TOTAL: which glyph a direction gets is decided in
  * core, and a glyph with no SVG here is a compile error rather than a fallback arrow.
  */
 export declare const ARROW_SVGS: Readonly<Record<AdwArrowIcon, string>>;
-/**
- * Normalise a menu assigned from XML or app code into entries. A bare `string[]` is
- * accepted (the storybook passes one) and widens to the shared {@link AdwMenuEntry}.
- */
-export declare function toMenuEntries(value: readonly (string | AdwMenuEntry)[] | null | undefined): AdwMenuEntry[];
-/**
- * The strings handed to `Dialogs.action()`, one per entry and each unique: a label
- * that collides with another entry — or with the dismiss button — gets zero-width
- * spaces appended until it is distinct, so {@link resolveMenuChoice} can tell them
- * apart.
- */
-export declare function menuSheetActions(entries: readonly AdwMenuEntry[], cancelLabel?: string): string[];
-/**
- * The position the user chose, or `-1` when the sheet was dismissed. Feed it the SAME
- * array {@link menuSheetActions} produced, or the lookup is a guess.
- */
-export declare function resolveMenuChoice(sheetActions: readonly string[], chosen: string | null | undefined): number;
 /** The arrow SVG for a direction; the split button's `none` is the down caret, not a hamburger. */
 export declare function splitButtonArrowSvg(direction: SplitButtonDirection): string;
 /**

package/lib/types/widgets/status-page-content.d.ts

@@ -10,7 +10,7 @@ export declare function statusPageLabelVisibility(text: string | null | undefine
  * `has_image`, bound to the image's `visible`.
  *
  * C is `paintable || (icon_name && icon_name[0])`; this port has no `paintable`
- * counterpart (the icon is an SVG string handed to `AdwIcon`), so only the second
+ * counterpart (the icon is an SVG string handed to `GtkImage`), so only the second
  * half applies. Kept as its own predicate rather than folded into
  * {@link statusPageLabelVisibility} because upstream really are two closures, and
  * the missing half is a real gap rather than a simplification.

package/lib/types/widgets/view-switcher-model.d.ts

@@ -8,7 +8,7 @@ import type { AdwViewSwitcherPageInit, ViewSwitcherStateChange } from '@gjsify/a
  * `icon` are NULLABLE on purpose: a page with neither renders no button at all, and
  * an absent title flattened to `''` makes that rule inexpressible.
  *
- * `icon` is an Adwaita symbolic SVG DOCUMENT here, not a GTK icon name: `AdwIcon`
+ * `icon` is an Adwaita symbolic SVG DOCUMENT here, not a GTK icon name: `GtkImage`
  * rasterises the path data natively. The core treats the field as an opaque
  * handle and only ever interprets "absent or empty"; {@link nsIconSvg} resolves
  * the fallback sentinel it hands back.
@@ -48,7 +48,7 @@ export declare function viewSwitcherPageSpec(page: AdwViewPage, index: number):
 /** {@link viewSwitcherPageSpec} over a whole page list. */
 export declare function viewSwitcherPageSpecs(pages: readonly AdwViewPage[]): AdwViewSwitcherPageInit[];
 /**
- * Resolve the core's icon slot to something `AdwIcon` can rasterise.
+ * Resolve the core's icon slot to something `GtkImage` can rasterise.
  *
  * The core substitutes the NAME `image-missing` for an absent icon. On the browser
  * side that name becomes a CSS mask class; here it has to become the actual

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/adwaita-nativescript",
-    "version": "0.46.0",
+    "version": "0.48.0",
     "description": "Native Adwaita widgets for the NativeScript runtime — real NativeScript components (StackLayout/GridLayout/Switch/Label) styled like Libadwaita, not a webview",
     "type": "module",
     "module": "lib/esm/index.js",
@@ -10,9 +10,13 @@
             "types": "./lib/types/index.d.ts",
             "default": "./lib/esm/index.js"
         },
-        "./widgets": {
-            "types": "./lib/types/widgets/index.d.ts",
-            "default": "./lib/esm/widgets/index.js"
+        "./adw": {
+            "types": "./lib/types/namespace/adw.d.ts",
+            "default": "./lib/esm/namespace/adw.js"
+        },
+        "./gtk": {
+            "types": "./lib/types/namespace/gtk.d.ts",
+            "default": "./lib/esm/namespace/gtk.js"
         },
         "./theme/adwaita.css": "./src/theme/adwaita.css",
         "./fonts": {
@@ -47,10 +51,10 @@
         "design-system"
     ],
     "dependencies": {
-        "@gjsify/adwaita-core": "^0.46.0",
-        "@gjsify/adwaita-fonts": "^0.46.0",
-        "@gjsify/adwaita-icons": "^0.46.0",
-        "@gjsify/native-platform": "^0.46.0"
+        "@gjsify/adwaita-core": "^0.48.0",
+        "@gjsify/adwaita-fonts": "^0.48.0",
+        "@gjsify/adwaita-icons": "^0.48.0",
+        "@gjsify/native-platform": "^0.48.0"
     },
     "peerDependencies": {
         "@nativescript/core": "*"
@@ -61,8 +65,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.46.0",
-        "@gjsify/unit": "^0.46.0",
+        "@gjsify/cli": "^0.48.0",
+        "@gjsify/unit": "^0.48.0",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },

package/src/theme/adwaita.css

@@ -264,7 +264,7 @@ Page.adw-window {
  * Their 24×24 + 5 padding box (_lists.scss:194-198) is deliberately NOT
  * reproduced. It is a hit/alignment box around a 16 glyph, and NS would read a
  * `min-width` on an `Image` as room to SCALE the bitmap into — an icon half
- * again too large rather than a roomier one. The glyph size is AdwIcon's own. */
+ * again too large rather than a roomier one. The glyph size is GtkImage's own. */
 .adw-entry-indicator,
 .adw-entry-edit {
     margin: 0 0 0 6;
@@ -329,7 +329,7 @@ Page.adw-window {
 }
 
 .adw-combo-chevron {
-    /* An AdwIcon (Image) rendering `pan-down-symbolic`; size + dim colour are set
+    /* A GtkImage (Image) rendering `pan-down-symbolic`; size + dim colour are set
      * on the widget. Only the gap to the value label is styled here. */
     margin: 0 0 0 2;
     vertical-align: middle;
@@ -362,7 +362,7 @@ Page.adw-window {
 
 /* `dropdown > button > box { border-spacing: 6px }` (_dropdowns.scss:2-3) — the
  * gap between label and arrow. The arrow's 16px size (_dropdowns.scss:10-13) is
- * the AdwIcon default, and its colour follows the light/dark scheme, so neither
+ * the GtkImage default, and its colour follows the light/dark scheme, so neither
  * is set anywhere. */
 .adw-drop-down-chevron {
     margin: 0 0 0 6;
@@ -448,7 +448,7 @@ Page.adw-window {
  *
  * The `width: 32` / `height: 32` that used to be here NEVER APPLIED. NativeScript
  * ignores a CSS value for a property the widget has set as a LOCAL one
- * (properties/index.js:585-598), and `AdwIcon` assigns `width`/`height` in its
+ * (properties/index.js:585-598), and `GtkImage` assigns `width`/`height` in its
  * constructor — so the chevron has always been the 16 `expander`'s own minimum
  * asks for (_expanders.scss:2-3), which is right, while the stylesheet claimed
  * a 32 tap target it never got. `color` and `font-size` were dead for the other
@@ -911,7 +911,7 @@ Page.adw-window {
     padding: 24 32 24 32;
 }
 
-/* The symbolic icon (AdwIcon) — only spacing; size/colour are baked by AdwIcon. */
+/* The symbolic icon (GtkImage) — only spacing; size/colour are baked by GtkImage. */
 .adw-status-page-icon {
     margin: 0 0 12 0;
 }
@@ -961,7 +961,7 @@ Page.adw-window {
  * three children with `border-spacing: 6px` (_lists.scss:458-462), which the NS
  * subset has no property for — so the 6 rides on the icons, mirrored.
  *
- * MARGIN ONLY. Both are `AdwIcon`s, i.e. `Image`s showing a bitmap that was
+ * MARGIN ONLY. Both are `GtkImage`s, i.e. `Image`s showing a bitmap that was
  * rendered in its fill colour, so `color` here reaches nothing and `font-size`
  * has no text to size. They used to be declared anyway, which put a dead accent
  * declaration in the runtime-accent table as well; the colour now follows the
@@ -1012,7 +1012,7 @@ Page.adw-window {
 
 /* On a suggested/destructive button the label must take the button's foreground
  * (the explicit dark label colour above would otherwise win over the inherited
- * one). The matching ICON colour is pre-baked by the caller via AdwIcon.iconColor. */
+ * one). The matching ICON colour is pre-baked by the caller via GtkImage.iconColor. */
 .adw-button.suggested-action .adw-button-content-label {
     color: #ffffff;
 }
@@ -1711,7 +1711,7 @@ Page.ns-dark.adw-window {
 /* ===== Dark: expander row ===== */
 
 /* No dark counterpart for the chevron: the 70% is an alpha over whatever the
- * bitmap was rendered in, and AdwIcon re-renders that on a scheme change. The
+ * bitmap was rendered in, and GtkImage re-renders that on a scheme change. The
  * `color` this rule used to set reached an `Image` and did nothing. */
 
 .ns-dark .adw-expander-disclosure {