ng-primitives 0.120.4 → 0.121.0

package/{popover/index.d.ts → types/ng-primitives-popover.d.ts}

@@ -1,12 +1,12 @@
-import * as ng_primitives_portal from 'ng-primitives/portal';
-import { NgpOffset, NgpFlip, NgpDismissGuard, NgpShift, NgpOverlayArrowState, NgpOverlayArrowProps, NgpOverlayContent, NgpOffsetInput, NgpFlipInput, NgpShiftInput, NgpDismissGuardInput, NgpOverlay } from 'ng-primitives/portal';
+import { NgpOffset, NgpFlip, NgpDismissGuard, NgpShift, NgpOverlayArrowState, NgpOverlayArrowProps, NgpOverlayContent, NgpOverlay, NgpOffsetInput, NgpFlipInput, NgpShiftInput, NgpDismissGuardInput } from 'ng-primitives/portal';
 export { NgpOverlayArrowProps as NgpPopoverArrowProps, NgpOverlayArrowState as NgpPopoverArrowState, injectOverlayContext as injectPopoverContext } from 'ng-primitives/portal';
 import * as _angular_core from '@angular/core';
-import { Provider, OnDestroy, InjectOptions, Signal } from '@angular/core';
+import { Provider, WritableSignal, ElementRef, Signal, OnDestroy } from '@angular/core';
 import { Placement } from '@floating-ui/dom';
 import { NumberInput, BooleanInput } from '@angular/cdk/coercion';
 import * as ng_primitives_state from 'ng-primitives/state';
-import { State } from 'ng-primitives/state';
+import { StateInjectionOptions } from 'ng-primitives/state';
+import * as ng_primitives_popover from 'ng-primitives/popover';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i1 from 'ng-primitives/focus-trap';
 
@@ -105,37 +105,220 @@ declare const NgpPopoverArrowStateToken: _angular_core.InjectionToken<_angular_c
 declare const ngpPopoverArrow: ({ padding }: NgpOverlayArrowProps) => NgpOverlayArrowState;
 declare const injectPopoverArrowState: {
     (): _angular_core.Signal<NgpOverlayArrowState>;
-    (options: {
-        hoisted: true;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): _angular_core.Signal<NgpOverlayArrowState | null>;
-    (options?: {
-        hoisted?: boolean;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): _angular_core.Signal<NgpOverlayArrowState> | _angular_core.Signal<NgpOverlayArrowState | null>;
+    (options: ng_primitives_state.StateInjectionOptions): _angular_core.Signal<NgpOverlayArrowState | null>;
+    (options?: ng_primitives_state.StateInjectionOptions): _angular_core.Signal<NgpOverlayArrowState> | _angular_core.Signal<NgpOverlayArrowState | null>;
 };
 declare const providePopoverArrowState: (opts?: {
     inherit?: boolean;
 }) => _angular_core.FactoryProvider;
 
-/**
- * Apply the `ngpPopoverTrigger` directive to an element that triggers the popover to show.
- */
-declare class NgpPopoverTrigger<T = null> implements OnDestroy {
+interface NgpPopoverTriggerState<T> {
+    /** Access the trigger element. */
+    readonly elementRef: ElementRef;
+    /** Access the popover template ref. */
+    readonly popover: WritableSignal<NgpOverlayContent<T> | undefined>;
+    /**
+     * Define if the trigger should be disabled.
+     * @default false
+     */
+    readonly disabled: Signal<boolean>;
+    /**
+     * Define the placement of the popover relative to the trigger.
+     * @default 'top'
+     */
+    readonly placement: Signal<NgpPopoverPlacement>;
+    /**
+     * Define the offset of the popover relative to the trigger.
+     * Can be a number (applies to mainAxis) or an object with mainAxis, crossAxis, and alignmentAxis.
+     * @default 0
+     */
+    readonly offset: Signal<NgpOffset>;
+    /**
+     * Define the delay before the popover is displayed.
+     * @default 0
+     */
+    readonly showDelay: Signal<number>;
+    /**
+     * Define the delay before the popover is hidden.
+     * @default 0
+     */
+    readonly hideDelay: Signal<number>;
+    /**
+     * Define whether the popover should flip when there is not enough space for the popover.
+     * Can be a boolean to enable/disable, or an object with padding and fallbackPlacements options.
+     * @default true
+     */
+    readonly flip: Signal<NgpFlip>;
+    /**
+     * Configure shift behavior to keep the popover in view.
+     * Can be a boolean to enable/disable, or an object with padding and limiter options.
+     * @default undefined (enabled by default in overlay)
+     */
+    readonly shift: Signal<NgpShift>;
+    /**
+     * Define the container in which the popover should be attached.
+     * @default document.body
+     */
+    readonly container: Signal<HTMLElement | string | null>;
+    /**
+     * Define whether the popover should close when clicking outside of it, or a guard function.
+     * @default true
+     */
+    readonly closeOnOutsideClick: Signal<NgpDismissGuard<Element>>;
+    /**
+     * Define whether the popover should close when the escape key is pressed, or a guard function.
+     * @default true
+     */
+    readonly closeOnEscape: Signal<NgpDismissGuard<KeyboardEvent>>;
+    /**
+     * Defines how the popover behaves when the window is scrolled.
+     * @default 'reposition'
+     */
+    readonly scrollBehavior: Signal<'reposition' | 'block' | 'close'>;
+    /**
+     * Provide context to the popover. This can be used to pass data to the popover content.
+     */
+    readonly context: Signal<T | undefined>;
+    /**
+     * Define an anchor element for positioning the popover.
+     * If provided, the popover will be positioned relative to this element instead of the trigger.
+     */
+    readonly anchor: Signal<HTMLElement | null>;
+    /**
+     * Define whether to track the trigger element position on every animation frame.
+     * Useful for moving elements like slider thumbs.
+     * @default false
+     */
+    readonly trackPosition: Signal<boolean>;
+    /**
+     * Define the cooldown duration in milliseconds.
+     * When moving from one popover to another within this duration,
+     * the showDelay is skipped for the new popover.
+     * @default 0
+     */
+    readonly cooldown: Signal<number>;
+    /**
+     * The overlay that manages the popover
+     * @internal
+     */
+    readonly overlay: Signal<NgpOverlay<T> | null>;
+    /**
+     * The open state of the popover.
+     * @internal
+     */
+    readonly open: Signal<boolean>;
+    /** @internal onDestroy callback */
+    destroy: () => void;
+    /**
+     * Show the popover.
+     * @returns A promise that resolves when the popover has been shown
+     */
+    show: () => Promise<void>;
+    /**
+     * @internal
+     * Hide the popover.
+     * @returns A promise that resolves when the popover has been hidden
+     */
+    hide: (origin: FocusOrigin) => Promise<void>;
+}
+interface NgpPopoverTriggerProps<T> {
+    /** Access the popover template ref. */
+    readonly popover?: Signal<NgpOverlayContent<T> | undefined>;
+    /**
+     * Define if the trigger should be disabled.
+     * @default false
+     */
+    readonly disabled?: Signal<boolean>;
+    /**
+     * Define the placement of the popover relative to the trigger.
+     * @default 'top'
+     */
+    readonly placement?: Signal<NgpPopoverPlacement>;
+    /**
+     * Define the offset of the popover relative to the trigger.
+     * Can be a number (applies to mainAxis) or an object with mainAxis, crossAxis, and alignmentAxis.
+     * @default 0
+     */
+    readonly offset?: Signal<NgpOffset>;
+    /**
+     * Define the delay before the popover is displayed.
+     * @default 0
+     */
+    readonly showDelay?: Signal<number>;
+    /**
+     * Define the delay before the popover is hidden.
+     * @default 0
+     */
+    readonly hideDelay?: Signal<number>;
+    /**
+     * Define whether the popover should flip when there is not enough space for the popover.
+     * Can be a boolean to enable/disable, or an object with padding and fallbackPlacements options.
+     * @default true
+     */
+    readonly flip?: Signal<NgpFlip>;
+    /**
+     * Configure shift behavior to keep the popover in view.
+     * Can be a boolean to enable/disable, or an object with padding and limiter options.
+     * @default undefined (enabled by default in overlay)
+     */
+    readonly shift?: Signal<NgpShift>;
+    /**
+     * Define the container in which the popover should be attached.
+     * @default document.body
+     */
+    readonly container?: Signal<HTMLElement | string | null>;
+    /**
+     * Define whether the popover should close when clicking outside of it, or a guard function.
+     * @default true
+     */
+    readonly closeOnOutsideClick?: Signal<NgpDismissGuard<Element>>;
+    /**
+     * Define whether the popover should close when the escape key is pressed, or a guard function.
+     * @default true
+     */
+    readonly closeOnEscape?: Signal<NgpDismissGuard<KeyboardEvent>>;
+    /**
+     * Defines how the popover behaves when the window is scrolled.
+     * @default 'reposition'
+     */
+    readonly scrollBehavior?: Signal<'reposition' | 'block' | 'close'>;
+    /**
+     * Provide context to the popover. This can be used to pass data to the popover content.
+     */
+    readonly context?: Signal<T | undefined>;
     /**
-     * Access the trigger element
+     * Define an anchor element for positioning the popover.
+     * If provided, the popover will be positioned relative to this element instead of the trigger.
      */
-    private readonly trigger;
+    readonly anchor?: Signal<HTMLElement | null>;
     /**
-     * Access the injector.
+     * Define whether to track the trigger element position on every animation frame.
+     * Useful for moving elements like slider thumbs.
+     * @default false
      */
-    private readonly injector;
+    readonly trackPosition?: Signal<boolean>;
     /**
-     * Access the view container reference.
+     * Define the cooldown duration in milliseconds.
+     * When moving from one popover to another within this duration,
+     * the showDelay is skipped for the new popover.
+     * @default 0
      */
-    private readonly viewContainerRef;
+    readonly cooldown?: Signal<number>;
+    /** Callback fired when the open state changes.  */
+    readonly onOpenChange?: (value: boolean) => void;
+}
+declare const NgpPopoverTriggerStateToken: _angular_core.InjectionToken<WritableSignal<NgpPopoverTriggerState<unknown>>>;
+declare const ngpPopoverTrigger: <T>({ popover: _popover, disabled, placement, offset, showDelay, hideDelay, flip, shift, container, closeOnOutsideClick, closeOnEscape, scrollBehavior, context, anchor, trackPosition, cooldown, onOpenChange, }: NgpPopoverTriggerProps<T>) => NgpPopoverTriggerState<T>;
+declare const providePopoverTriggerState: (opts?: {
+    inherit?: boolean;
+}) => _angular_core.FactoryProvider;
+declare function injectPopoverTriggerState<T>(options?: StateInjectionOptions): Signal<NgpPopoverTriggerState<T>>;
+type NgpPopoverPlacement = 'top' | 'right' | 'bottom' | 'left' | 'top-start' | 'top-end' | 'right-start' | 'right-end' | 'bottom-start' | 'bottom-end' | 'left-start' | 'left-end';
+
+/**
+ * Apply the `ngpPopoverTrigger` directive to an element that triggers the popover to show.
+ */
+declare class NgpPopoverTrigger<T = null> implements OnDestroy {
     /**
      * Access the global popover configuration.
      */
@@ -224,16 +407,6 @@ declare class NgpPopoverTrigger<T = null> implements OnDestroy {
      * @default 0
      */
     readonly cooldown: _angular_core.InputSignalWithTransform<number, NumberInput>;
-    /**
-     * The overlay that manages the popover
-     * @internal
-     */
-    readonly overlay: _angular_core.WritableSignal<NgpOverlay<T> | null>;
-    /**
-     * The open state of the popover.
-     * @internal
-     */
-    readonly open: _angular_core.Signal<boolean>;
     /**
      * Event emitted when the popover open state changes.
      */
@@ -241,9 +414,8 @@ declare class NgpPopoverTrigger<T = null> implements OnDestroy {
     /**
      * The popover trigger state.
      */
-    readonly state: ng_primitives_state.CreatedState<NgpPopoverTrigger<T>>;
+    protected readonly state: ng_primitives_popover.NgpPopoverTriggerState<T>;
     ngOnDestroy(): void;
-    protected toggle(event: MouseEvent): void;
     /**
      * Show the popover.
      * @returns A promise that resolves when the popover has been shown
@@ -255,40 +427,55 @@ declare class NgpPopoverTrigger<T = null> implements OnDestroy {
      * @returns A promise that resolves when the popover has been hidden
      */
     hide(origin?: FocusOrigin): Promise<void>;
-    /**
-     * Create the overlay that will contain the popover
-     */
-    private createOverlay;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<NgpPopoverTrigger<any>, never>;
     static ɵdir: _angular_core.ɵɵDirectiveDeclaration<NgpPopoverTrigger<any>, "[ngpPopoverTrigger]", ["ngpPopoverTrigger"], { "popover": { "alias": "ngpPopoverTrigger"; "required": false; "isSignal": true; }; "disabled": { "alias": "ngpPopoverTriggerDisabled"; "required": false; "isSignal": true; }; "placement": { "alias": "ngpPopoverTriggerPlacement"; "required": false; "isSignal": true; }; "offset": { "alias": "ngpPopoverTriggerOffset"; "required": false; "isSignal": true; }; "showDelay": { "alias": "ngpPopoverTriggerShowDelay"; "required": false; "isSignal": true; }; "hideDelay": { "alias": "ngpPopoverTriggerHideDelay"; "required": false; "isSignal": true; }; "flip": { "alias": "ngpPopoverTriggerFlip"; "required": false; "isSignal": true; }; "shift": { "alias": "ngpPopoverTriggerShift"; "required": false; "isSignal": true; }; "container": { "alias": "ngpPopoverTriggerContainer"; "required": false; "isSignal": true; }; "closeOnOutsideClick": { "alias": "ngpPopoverTriggerCloseOnOutsideClick"; "required": false; "isSignal": true; }; "closeOnEscape": { "alias": "ngpPopoverTriggerCloseOnEscape"; "required": false; "isSignal": true; }; "scrollBehavior": { "alias": "ngpPopoverTriggerScrollBehavior"; "required": false; "isSignal": true; }; "context": { "alias": "ngpPopoverTriggerContext"; "required": false; "isSignal": true; }; "anchor": { "alias": "ngpPopoverTriggerAnchor"; "required": false; "isSignal": true; }; "trackPosition": { "alias": "ngpPopoverTriggerTrackPosition"; "required": false; "isSignal": true; }; "cooldown": { "alias": "ngpPopoverTriggerCooldown"; "required": false; "isSignal": true; }; }, { "openChange": "ngpPopoverTriggerOpenChange"; }, never, never, true, never>;
 }
-type NgpPopoverPlacement = 'top' | 'right' | 'bottom' | 'left' | 'top-start' | 'top-end' | 'right-start' | 'right-end' | 'bottom-start' | 'bottom-end' | 'left-start' | 'left-end';
-
-/**
- * Provides the PopoverTrigger state.
- */
-declare const providePopoverTriggerState: (options?: ng_primitives_state.CreateStateProviderOptions) => _angular_core.FactoryProvider;
-/**
- * Injects the PopoverTrigger state.
- */
-declare const injectPopoverTriggerState: <T>(options?: InjectOptions) => Signal<State<NgpPopoverTrigger<T>>>;
 
 /**
  * Apply the `ngpPopover` directive to an element that represents the popover. This typically would be a `div` inside an `ng-template`.
  */
 declare class NgpPopover {
-    /**
-     * Access the overlay.
-     */
-    protected readonly overlay: ng_primitives_portal.NgpOverlay<unknown>;
     /**
      * The unique id of the tooltip.
      */
     readonly id: _angular_core.InputSignal<string>;
-    constructor();
+    protected readonly state: {
+        id: _angular_core.WritableSignal<string>;
+    };
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<NgpPopover, never>;
     static ɵdir: _angular_core.ɵɵDirectiveDeclaration<NgpPopover, "[ngpPopover]", ["ngpPopover"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; }, {}, never, never, true, [{ directive: typeof i1.NgpFocusTrap; inputs: {}; outputs: {}; }]>;
 }
 
-export { NgpPopover, NgpPopoverArrow, NgpPopoverArrowStateToken, NgpPopoverTrigger, injectPopoverArrowState, injectPopoverTriggerState, ngpPopoverArrow, providePopoverArrowState, providePopoverConfig, providePopoverTriggerState };
-export type { NgpPopoverConfig, NgpPopoverPlacement };
+interface NgpPopoverState {
+    /** The unique id of the tooltip. */
+    readonly id: Signal<string>;
+}
+interface NgpPopoverProps {
+    /** The unique id of the tooltip. */
+    readonly id?: Signal<string>;
+}
+declare const NgpPopoverStateToken: _angular_core.InjectionToken<_angular_core.WritableSignal<{
+    id: _angular_core.WritableSignal<string>;
+}>>;
+declare const ngpPopover: ({ id: _id }: NgpPopoverProps) => {
+    id: _angular_core.WritableSignal<string>;
+};
+declare const injectPopoverState: {
+    (): Signal<{
+        id: _angular_core.WritableSignal<string>;
+    }>;
+    (options: ng_primitives_state.StateInjectionOptions): Signal<{
+        id: _angular_core.WritableSignal<string>;
+    } | null>;
+    (options?: ng_primitives_state.StateInjectionOptions): Signal<{
+        id: _angular_core.WritableSignal<string>;
+    }> | Signal<{
+        id: _angular_core.WritableSignal<string>;
+    } | null>;
+};
+declare const providePopoverState: (opts?: {
+    inherit?: boolean;
+}) => _angular_core.FactoryProvider;
+
+export { NgpPopover, NgpPopoverArrow, NgpPopoverArrowStateToken, NgpPopoverStateToken, NgpPopoverTrigger, NgpPopoverTriggerStateToken, injectPopoverArrowState, injectPopoverState, injectPopoverTriggerState, ngpPopover, ngpPopoverArrow, ngpPopoverTrigger, providePopoverArrowState, providePopoverConfig, providePopoverState, providePopoverTriggerState };
+export type { NgpPopoverConfig, NgpPopoverPlacement, NgpPopoverProps, NgpPopoverState, NgpPopoverTriggerProps, NgpPopoverTriggerState };

package/{portal/index.d.ts → types/ng-primitives-portal.d.ts}

@@ -1,11 +1,28 @@
+import * as _angular_core from '@angular/core';
+import { Provider, WritableSignal, TemplateRef, Type, Injector, ViewContainerRef, Signal, ValueProvider, ApplicationRef } from '@angular/core';
 import * as _floating_ui_dom from '@floating-ui/dom';
 import { Placement, Strategy, Middleware } from '@floating-ui/dom';
-import * as _angular_core from '@angular/core';
-import { WritableSignal, TemplateRef, Type, Injector, ViewContainerRef, Signal, Provider, ValueProvider, ApplicationRef } from '@angular/core';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import { Subject } from 'rxjs';
+import * as ng_primitives_state from 'ng-primitives/state';
 import { ViewportRuler } from '@angular/cdk/scrolling';
 
+/**
+ * Provide a null `ControlContainer` at the element level of an overlay-content root directive
+ * (e.g. `NgpPopover`, `NgpTooltip`, `NgpMenu`).
+ *
+ * Overlay content is portaled but its template is often declared inside a form, so its
+ * element-injector chain can reach that outer form's `ControlContainer` and leak it into the
+ * overlay (ngp#677 / angular#57390). This backstop resolves `ControlContainer` to `null` at the
+ * content root: a form declared *inside* the content sits closer in the injector chain and still
+ * wins, while a control with no inner form resolves to `null` here instead of escaping to the
+ * outer form.
+ *
+ * Pairs with the `EmbeddedViewInjector` in `overlay.ts`, which returns `notFoundValue` for the
+ * `Host`/`SkipSelf` `ControlContainer` lookup so the element-injector walk runs and reaches this.
+ */
+declare function provideControlContainerIsolation(): Provider;
+
 /**
  * Options for configuring flip behavior to keep the floating element in view.
  * The flip middleware ensures the floating element flips to the opposite side
@@ -745,22 +762,14 @@ declare const injectOverlayArrowState: {
         padding: WritableSignal<number | undefined>;
         setPadding: (value: number | undefined) => void;
     }>;
-    (options: {
-        hoisted: true;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<{
+    (options: ng_primitives_state.StateInjectionOptions): Signal<{
         x: Signal<number | undefined>;
         y: Signal<number | undefined>;
         placement: Signal<_floating_ui_dom.Placement | undefined>;
         padding: WritableSignal<number | undefined>;
         setPadding: (value: number | undefined) => void;
     } | null>;
-    (options?: {
-        hoisted?: boolean;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<{
+    (options?: ng_primitives_state.StateInjectionOptions): Signal<{
         x: Signal<number | undefined>;
         y: Signal<number | undefined>;
         placement: Signal<_floating_ui_dom.Placement | undefined>;
@@ -940,5 +949,5 @@ declare class NoopScrollStrategy implements ScrollStrategy {
     disable(): void;
 }
 
-export { BlockScrollStrategy, CloseScrollStrategy, NgpComponentPortal, NgpOverlay, NgpOverlayArrowStateToken, NgpOverlayCooldownManager, NgpOverlayRegistry, NgpPortal, NgpTemplatePortal, NoopScrollStrategy, coerceFlip, coerceOffset, coerceShift, createOverlay, createPortal, dismissGuardAttribute, injectOverlay, injectOverlayArrowState, injectOverlayContext, ngpOverlayArrow, provideOverlayArrowState, provideOverlayContext };
+export { BlockScrollStrategy, CloseScrollStrategy, NgpComponentPortal, NgpOverlay, NgpOverlayArrowStateToken, NgpOverlayCooldownManager, NgpOverlayRegistry, NgpPortal, NgpTemplatePortal, NoopScrollStrategy, coerceFlip, coerceOffset, coerceShift, createOverlay, createPortal, dismissGuardAttribute, injectOverlay, injectOverlayArrowState, injectOverlayContext, ngpOverlayArrow, provideControlContainerIsolation, provideOverlayArrowState, provideOverlayContext };
 export type { NgpDismissGuard, NgpDismissGuardInput, NgpDismissPolicy, NgpFlip, NgpFlipInput, NgpFlipOptions, NgpOffset, NgpOffsetInput, NgpOffsetOptions, NgpOverlayArrowProps, NgpOverlayArrowState, NgpOverlayConfig, NgpOverlayContent, NgpOverlayEntry, NgpOverlayRef, NgpOverlayTemplateContext, NgpPosition, NgpShift, NgpShiftInput, NgpShiftOptions, ScrollStrategy };

package/{progress/index.d.ts → types/ng-primitives-progress.d.ts}

@@ -1,6 +1,7 @@
 import * as _angular_core from '@angular/core';
 import { Signal, WritableSignal } from '@angular/core';
 import { NumberInput } from '@angular/cdk/coercion';
+import * as ng_primitives_state from 'ng-primitives/state';
 
 /**
  * Apply the `ngpProgressIndicator` directive to an element that represents the current progress.
@@ -222,11 +223,7 @@ declare const injectProgressState: {
         setMin: (newMin: number) => void;
         setMax: (newMax: number) => void;
     }>;
-    (options: {
-        hoisted: true;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<{
+    (options: ng_primitives_state.StateInjectionOptions): Signal<{
         max: WritableSignal<number>;
         min: WritableSignal<number>;
         value: WritableSignal<number | null>;
@@ -241,11 +238,7 @@ declare const injectProgressState: {
         setMin: (newMin: number) => void;
         setMax: (newMax: number) => void;
     } | null>;
-    (options?: {
-        hoisted?: boolean;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<{
+    (options?: ng_primitives_state.StateInjectionOptions): Signal<{
         max: WritableSignal<number>;
         min: WritableSignal<number>;
         value: WritableSignal<number | null>;

package/{roving-focus/index.d.ts → types/ng-primitives-roving-focus.d.ts}

@@ -1,8 +1,68 @@
+import * as ng_primitives_roving_focus from 'ng-primitives/roving-focus';
 import * as _angular_core from '@angular/core';
 import { Signal, ElementRef, InjectionToken, Type, FactoryProvider } from '@angular/core';
 import { FocusOrigin } from '@angular/cdk/a11y';
-import { NgpOrientation } from 'ng-primitives/common';
 import { BooleanInput } from '@angular/cdk/coercion';
+import { NgpOrientation } from 'ng-primitives/common';
+import * as ng_primitives_state from 'ng-primitives/state';
+
+/**
+ * Apply the `ngpRovingFocusItem` directive to an element within a roving focus group to automatically manage focus.
+ */
+declare class NgpRovingFocusItem {
+    /**
+     * Define if the item is disabled.
+     */
+    readonly disabled: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
+    private readonly state;
+    /**
+     * Expose the internal id of the roving focus item.
+     * @internal
+     */
+    readonly id: _angular_core.Signal<string>;
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<NgpRovingFocusItem, never>;
+    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<NgpRovingFocusItem, "[ngpRovingFocusItem]", ["ngpRovingFocusItem"], { "disabled": { "alias": "ngpRovingFocusItemDisabled"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
+}
+
+/**
+ * Apply the `ngpRovingFocusGroup` directive to an element to manage focus for a group of child elements.
+ */
+declare class NgpRovingFocusGroup {
+    /**
+     * Determine the orientation of the roving focus group.
+     * @default 'vertical'
+     */
+    readonly orientation: _angular_core.InputSignal<NgpOrientation>;
+    /**
+     * Determine if focus should wrap when the end or beginning is reached.
+     */
+    readonly wrap: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
+    /**
+     * Determine if the home and end keys should navigate to the first and last items.
+     */
+    readonly homeEnd: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
+    /**
+     * Determine if the roving focus group is disabled.
+     */
+    readonly disabled: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
+    /**
+     * Store the active item in the roving focus group.
+     * @internal
+     */
+    readonly activeItem: _angular_core.WritableSignal<NgpRovingFocusItem | null>;
+    /**
+     * The state of the roving focus group.
+     */
+    readonly state: ng_primitives_roving_focus.NgpRovingFocusGroupState;
+    /**
+     * Activate an item in the roving focus group.
+     * @param item The item to activate
+     * @param origin The origin of the focus change
+     */
+    setActiveItem(item: NgpRovingFocusItem | null, origin?: FocusOrigin): void;
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<NgpRovingFocusGroup, never>;
+    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<NgpRovingFocusGroup, "[ngpRovingFocusGroup]", ["ngpRovingFocusGroup"], { "orientation": { "alias": "ngpRovingFocusGroupOrientation"; "required": false; "isSignal": true; }; "wrap": { "alias": "ngpRovingFocusGroupWrap"; "required": false; "isSignal": true; }; "homeEnd": { "alias": "ngpRovingFocusGroupHomeEnd"; "required": false; "isSignal": true; }; "disabled": { "alias": "ngpRovingFocusGroupDisabled"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
+}
 
 /**
  * The state interface for the RovingFocusItem pattern.
@@ -43,16 +103,8 @@ declare const NgpRovingFocusItemStateToken: _angular_core.InjectionToken<_angula
 declare const ngpRovingFocusItem: ({ disabled }: NgpRovingFocusItemProps) => NgpRovingFocusItemState;
 declare const injectRovingFocusItemState: {
     (): Signal<NgpRovingFocusItemState>;
-    (options: {
-        hoisted: true;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<NgpRovingFocusItemState | null>;
-    (options?: {
-        hoisted?: boolean;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<NgpRovingFocusItemState> | Signal<NgpRovingFocusItemState | null>;
+    (options: ng_primitives_state.StateInjectionOptions): Signal<NgpRovingFocusItemState | null>;
+    (options?: ng_primitives_state.StateInjectionOptions): Signal<NgpRovingFocusItemState> | Signal<NgpRovingFocusItemState | null>;
 };
 declare const provideRovingFocusItemState: (opts?: {
     inherit?: boolean;
@@ -143,79 +195,13 @@ declare const NgpRovingFocusGroupStateToken: _angular_core.InjectionToken<_angul
 declare const ngpRovingFocusGroup: ({ orientation: _orientation, wrap, homeEnd, disabled, inherit, }: NgpRovingFocusGroupProps) => NgpRovingFocusGroupState;
 declare const injectRovingFocusGroupState: {
     (): Signal<NgpRovingFocusGroupState>;
-    (options: {
-        hoisted: true;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<NgpRovingFocusGroupState | null>;
-    (options?: {
-        hoisted?: boolean;
-        optional?: boolean;
-        skipSelf?: boolean;
-    }): Signal<NgpRovingFocusGroupState> | Signal<NgpRovingFocusGroupState | null>;
+    (options: ng_primitives_state.StateInjectionOptions): Signal<NgpRovingFocusGroupState | null>;
+    (options?: ng_primitives_state.StateInjectionOptions): Signal<NgpRovingFocusGroupState> | Signal<NgpRovingFocusGroupState | null>;
 };
 declare const provideRovingFocusGroupState: (opts?: {
     inherit?: boolean;
 }) => _angular_core.FactoryProvider;
 
-/**
- * Apply the `ngpRovingFocusItem` directive to an element within a roving focus group to automatically manage focus.
- */
-declare class NgpRovingFocusItem {
-    /**
-     * Define if the item is disabled.
-     */
-    readonly disabled: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
-    private readonly state;
-    /**
-     * Expose the internal id of the roving focus item.
-     * @internal
-     */
-    readonly id: _angular_core.Signal<string>;
-    static ɵfac: _angular_core.ɵɵFactoryDeclaration<NgpRovingFocusItem, never>;
-    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<NgpRovingFocusItem, "[ngpRovingFocusItem]", ["ngpRovingFocusItem"], { "disabled": { "alias": "ngpRovingFocusItemDisabled"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
-}
-
-/**
- * Apply the `ngpRovingFocusGroup` directive to an element to manage focus for a group of child elements.
- */
-declare class NgpRovingFocusGroup {
-    /**
-     * Determine the orientation of the roving focus group.
-     * @default 'vertical'
-     */
-    readonly orientation: _angular_core.InputSignal<NgpOrientation>;
-    /**
-     * Determine if focus should wrap when the end or beginning is reached.
-     */
-    readonly wrap: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
-    /**
-     * Determine if the home and end keys should navigate to the first and last items.
-     */
-    readonly homeEnd: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
-    /**
-     * Determine if the roving focus group is disabled.
-     */
-    readonly disabled: _angular_core.InputSignalWithTransform<boolean, BooleanInput>;
-    /**
-     * Store the active item in the roving focus group.
-     * @internal
-     */
-    readonly activeItem: _angular_core.WritableSignal<NgpRovingFocusItem | null>;
-    /**
-     * The state of the roving focus group.
-     */
-    readonly state: NgpRovingFocusGroupState;
-    /**
-     * Activate an item in the roving focus group.
-     * @param item The item to activate
-     * @param origin The origin of the focus change
-     */
-    setActiveItem(item: NgpRovingFocusItem | null, origin?: FocusOrigin): void;
-    static ɵfac: _angular_core.ɵɵFactoryDeclaration<NgpRovingFocusGroup, never>;
-    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<NgpRovingFocusGroup, "[ngpRovingFocusGroup]", ["ngpRovingFocusGroup"], { "orientation": { "alias": "ngpRovingFocusGroupOrientation"; "required": false; "isSignal": true; }; "wrap": { "alias": "ngpRovingFocusGroupWrap"; "required": false; "isSignal": true; }; "homeEnd": { "alias": "ngpRovingFocusGroupHomeEnd"; "required": false; "isSignal": true; }; "disabled": { "alias": "ngpRovingFocusGroupDisabled"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
-}
-
 declare const NgpRovingFocusGroupToken: InjectionToken<NgpRovingFocusGroup>;
 /**
  * Inject the RovingFocusGroup directive instance