@spartan-ng/cli 0.0.1-alpha.716 → 0.0.1-alpha.718

package/src/generators/ui/libs/calendar/files/lib/hlm-calendar.ts.template

@@ -1,197 +1,146 @@
-import type { BooleanInput, NumberInput } from '@angular/cdk/coercion';
 import { NgTemplateOutlet } from '@angular/common';
-import {
-	booleanAttribute,
-	ChangeDetectionStrategy,
-	Component,
-	computed,
-	input,
-	model,
-	numberAttribute,
-	viewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core';
 import { NgIcon, provideIcons } from '@ng-icons/core';
 import { lucideChevronLeft, lucideChevronRight } from '@ng-icons/lucide';
-import { BrnCalendar, BrnCalendarImports, injectBrnCalendarI18n, type Weekday } from '@spartan-ng/brain/calendar';
+import { BrnCalendar, BrnCalendarImports, injectBrnCalendarI18n } from '@spartan-ng/brain/calendar';
 import { injectDateAdapter } from '@spartan-ng/brain/date-time';
-import { buttonVariants } from '<%- importAlias %>/button';
-import { HlmIcon } from '<%- importAlias %>/icon';
+import { buttonVariants, HlmButtonImports } from '<%- importAlias %>/button';
 import { HlmSelectImports } from '<%- importAlias %>/select';
-import { hlm } from '<%- importAlias %>/utils';
-import type { ClassValue } from 'clsx';
+import { classes, hlm } from '<%- importAlias %>/utils';
 
 @Component({
 	selector: 'hlm-calendar',
-	imports: [BrnCalendarImports, NgIcon, HlmIcon, HlmSelectImports, NgTemplateOutlet],
+	imports: [BrnCalendarImports, NgIcon, HlmSelectImports, NgTemplateOutlet, HlmButtonImports],
 	viewProviders: [provideIcons({ lucideChevronLeft, lucideChevronRight })],
 	changeDetection: ChangeDetectionStrategy.OnPush,
+	hostDirectives: [
+		{
+			directive: BrnCalendar,
+			inputs: ['min', 'max', 'disabled', 'date', 'dateDisabled', 'weekStartsOn', 'highlightDays', 'defaultFocusedDate'],
+			outputs: ['dateChange'],
+		},
+	],
 	host: { 'data-slot': 'calendar' },
 	template: `
-		<div
-			brnCalendar
-			[min]="min()"
-			[max]="max()"
-			[disabled]="disabled()"
-			[(date)]="date"
-			[dateDisabled]="dateDisabled()"
-			[weekStartsOn]="weekStartsOn()"
-			[highlightDays]="highlightDays()"
-			[defaultFocusedDate]="defaultFocusedDate()"
-			[class]="_computedCalenderClass()"
-		>
-			<div class="inline-flex flex-col space-y-4">
-				<!-- Header -->
-				<div class="space-y-4">
-					<div class="relative flex items-center justify-center pt-1">
-						<div class="flex w-full items-center justify-center gap-1.5">
-							<ng-template #month>
-								<hlm-select brnCalendarMonthSelect>
-									<hlm-select-trigger size="sm" [class]="_selectClass">
-										<hlm-select-value />
-									</hlm-select-trigger>
-									<hlm-select-content *hlmSelectPortal class="max-h-80">
-										<hlm-select-group>
-											@for (month of _i18n.config().months(); track month) {
-												<hlm-select-item [value]="month">{{ month }}</hlm-select-item>
-											}
-										</hlm-select-group>
-									</hlm-select-content>
-								</hlm-select>
-							</ng-template>
-							<ng-template #year>
-								<hlm-select brnCalendarYearSelect>
-									<hlm-select-trigger size="sm" [class]="_selectClass">
-										<hlm-select-value />
-									</hlm-select-trigger>
-									<hlm-select-content *hlmSelectPortal class="max-h-80">
-										<hlm-select-group>
-											@for (year of _i18n.config().years(); track year) {
-												<hlm-select-item [value]="year">{{ year }}</hlm-select-item>
-											}
-										</hlm-select-group>
-									</hlm-select-content>
-								</hlm-select>
-							</ng-template>
-							@let heading = _heading();
-							@switch (captionLayout()) {
-								@case ('dropdown') {
-									<ng-container [ngTemplateOutlet]="month" />
-									<ng-container [ngTemplateOutlet]="year" />
+		<div class="inline-flex flex-col gap-4">
+			<!-- Header -->
+			<div class="flex w-full items-center justify-between gap-1.5">
+				<ng-template #month>
+					<hlm-select brnCalendarMonthSelect class="order-1">
+						<hlm-select-trigger size="sm" [class]="_selectClass">
+							<hlm-select-value />
+						</hlm-select-trigger>
+						<hlm-select-content *hlmSelectPortal class="max-h-80">
+							<hlm-select-group>
+								@for (month of _i18n.config().months(); track month) {
+									<hlm-select-item [value]="month">{{ month }}</hlm-select-item>
 								}
-								@case ('dropdown-months') {
-									<ng-container [ngTemplateOutlet]="month" />
-									<div brnCalendarHeader class="text-sm font-medium">{{ heading.year }}</div>
+							</hlm-select-group>
+						</hlm-select-content>
+					</hlm-select>
+				</ng-template>
+				<ng-template #year>
+					<hlm-select brnCalendarYearSelect class="order-3">
+						<hlm-select-trigger size="sm" [class]="_selectClass">
+							<hlm-select-value />
+						</hlm-select-trigger>
+						<hlm-select-content *hlmSelectPortal class="max-h-80">
+							<hlm-select-group>
+								@for (year of _i18n.config().years(); track year) {
+									<hlm-select-item [value]="year">{{ year }}</hlm-select-item>
 								}
-								@case ('dropdown-years') {
-									<div brnCalendarHeader class="text-sm font-medium">{{ heading.month }}</div>
-									<ng-container [ngTemplateOutlet]="year" />
-								}
-								@case ('label') {
-									<div brnCalendarHeader class="text-sm font-medium">{{ heading.header }}</div>
-								}
-							}
-						</div>
-
-						<div class="flex items-center space-x-1">
-							<button
-								brnCalendarPreviousButton
-								class="focus-visible:ring-ring hover:bg-accent hover:text-accent-foreground text-popover-foreground absolute left-1 inline-flex size-8 items-center justify-center rounded-md bg-transparent p-0 text-sm font-medium whitespace-nowrap transition-colors hover:opacity-100 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50"
-							>
-								<ng-icon hlm name="lucideChevronLeft" size="sm" />
-							</button>
-
-							<button
-								brnCalendarNextButton
-								class="focus-visible:ring-ring hover:bg-accent hover:text-accent-foreground text-popover-foreground absolute right-1 inline-flex size-8 items-center justify-center rounded-md bg-transparent p-0 text-sm font-medium whitespace-nowrap transition-colors hover:opacity-100 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50"
-							>
-								<ng-icon hlm name="lucideChevronRight" size="sm" />
-							</button>
-						</div>
-					</div>
-				</div>
+							</hlm-select-group>
+						</hlm-select-content>
+					</hlm-select>
+				</ng-template>
+				@let heading = _heading();
+
+				<button
+					brnCalendarPreviousButton
+					variant="ghost"
+					hlmBtn
+					class="order-first size-(--cell-size) p-0 select-none aria-disabled:opacity-50"
+				>
+					<ng-icon name="lucideChevronLeft" class="rtl:rotate-180" />
+				</button>
+
+				@switch (captionLayout()) {
+					@case ('dropdown') {
+						<ng-container [ngTemplateOutlet]="month" />
+						<ng-container [ngTemplateOutlet]="year" />
+					}
+					@case ('dropdown-months') {
+						<ng-container [ngTemplateOutlet]="month" />
+						<div brnCalendarHeader class="order-4 text-sm font-medium">{{ heading.year }}</div>
+					}
+					@case ('dropdown-years') {
+						<div brnCalendarHeader class="order-2 text-sm font-medium">{{ heading.month }}</div>
+						<ng-container [ngTemplateOutlet]="year" />
+					}
+					@case ('label') {
+						<div brnCalendarHeader class="order-5 text-sm font-medium">{{ heading.header }}</div>
+					}
+				}
+
+				<button
+					brnCalendarNextButton
+					hlmBtn
+					variant="ghost"
+					class="order-last size-(--cell-size) p-0 select-none aria-disabled:opacity-50"
+				>
+					<ng-icon name="lucideChevronRight" class="rtl:rotate-180" />
+				</button>
+			</div>
 
-				<table class="w-full border-collapse space-y-1" brnCalendarGrid>
-					<thead>
-						<tr class="flex">
-							<th
-								*brnCalendarWeekday="let weekday"
-								scope="col"
-								class="text-muted-foreground w-8 rounded-md text-[0.8rem] font-normal"
-								[attr.aria-label]="_i18n.config().labelWeekday(weekday)"
+			<table class="w-full border-collapse space-y-1" brnCalendarGrid>
+				<thead aria-hidden="true">
+					<tr class="flex">
+						<th
+							*brnCalendarWeekday="let weekday"
+							scope="col"
+							class="text-muted-foreground flex-1 rounded-(--cell-radius) text-[0.8rem] font-normal select-none"
+							[attr.aria-label]="_i18n.config().labelWeekday(weekday)"
+						>
+							{{ _i18n.config().formatWeekdayName(weekday) }}
+						</th>
+					</tr>
+				</thead>
+
+				<tbody role="rowgroup">
+					<tr *brnCalendarWeek="let week" class="mt-2 flex w-full">
+						@for (date of week; track _dateAdapter.getTime(date)) {
+							<td
+								brnCalendarCell
+								class="group/day relative aspect-square h-full w-full rounded-(--cell-radius) p-0 text-center select-none [&:first-child[data-selected=true]_button]:rounded-s-(--cell-radius) [&:last-child[data-selected=true]_button]:rounded-e-(--cell-radius)"
 							>
-								{{ _i18n.config().formatWeekdayName(weekday) }}
-							</th>
-						</tr>
-					</thead>
-
-					<tbody role="rowgroup">
-						<tr *brnCalendarWeek="let week" class="mt-2 flex w-full">
-							@for (date of week; track _dateAdapter.getTime(date)) {
-								<td
-									brnCalendarCell
-									class="data-[selected]:data-[outside]:bg-accent/50 data-[selected]:bg-accent relative size-8 p-0 text-center text-sm focus-within:relative focus-within:z-20 first:data-[selected]:rounded-l-md last:data-[selected]:rounded-r-md [&:has([aria-selected].day-range-end)]:rounded-r-md"
-								>
-									<button brnCalendarCellButton [date]="date" [class]="_btnClass">
-										{{ _dateAdapter.getDate(date) }}
-									</button>
-								</td>
-							}
-						</tr>
-					</tbody>
-				</table>
-			</div>
+								<button brnCalendarCellButton [date]="date" [class]="_btnClass">
+									{{ _dateAdapter.getDate(date) }}
+								</button>
+							</td>
+						}
+					</tr>
+				</tbody>
+			</table>
 		</div>
 	`,
 })
 export class HlmCalendar<T> {
-	public readonly calendarClass = input<ClassValue>('');
-
-	protected readonly _computedCalenderClass = computed(() => hlm('rounded-md border p-3', this.calendarClass()));
-
 	/** Access the calendar i18n */
 	protected readonly _i18n = injectBrnCalendarI18n();
 
 	/** Access the date time adapter */
 	protected readonly _dateAdapter = injectDateAdapter<T>();
 
-	/** The days to highlight. */
-	public readonly highlightDays = input<T[]>([]);
-
-	/** The minimum date that can be selected.*/
-	public readonly min = input<T>();
-
-	/** The maximum date that can be selected. */
-	public readonly max = input<T>();
-
 	/** Show dropdowns to navigate between months or years. */
 	public readonly captionLayout = input<'dropdown' | 'label' | 'dropdown-months' | 'dropdown-years'>('label');
 
-	/** Determine if the date picker is disabled. */
-	public readonly disabled = input<boolean, BooleanInput>(false, {
-		transform: booleanAttribute,
-	});
-
-	/** The selected value. */
-	public readonly date = model<T>();
-
-	/** Whether a specific date is disabled. */
-	public readonly dateDisabled = input<(date: T) => boolean>(() => false);
-
-	/** The day the week starts on */
-	public readonly weekStartsOn = input<Weekday, NumberInput>(undefined, {
-		transform: (v: unknown) => numberAttribute(v) as Weekday,
-	});
-
-	/** The default focused date. */
-	public readonly defaultFocusedDate = input<T>();
-
 	/** Access the calendar directive */
-	private readonly _calendar = viewChild.required(BrnCalendar);
+	private readonly _calendar = inject(BrnCalendar);
 
 	/** Get the heading for the current month and year */
 	protected readonly _heading = computed(() => {
 		const config = this._i18n.config();
-		const date = this._calendar().focusedDate();
+		const date = this._calendar.focusedDate();
 
 		return {
 			header: config.formatHeader(this._dateAdapter.getMonth(date), this._dateAdapter.getYear(date)),
@@ -201,17 +150,13 @@ export class HlmCalendar<T> {
 	});
 
 	protected readonly _btnClass = hlm(
-		buttonVariants({ variant: 'ghost' }),
-		'size-8 p-0 font-normal aria-selected:opacity-100',
-		'data-[outside]:text-muted-foreground data-[outside]:aria-selected:bg-accent/50 data-[outside]:aria-selected:text-muted-foreground data-[outside]:opacity-50 data-[outside]:aria-selected:opacity-30',
-		'data-[today]:bg-accent data-[today]:text-accent-foreground',
-		'data-[selected]:bg-primary data-[selected]:text-primary-foreground data-[selected]:hover:bg-primary dark:hover:text-accent-foreground data-[selected]:focus:bg-primary data-[selected]:focus:text-primary-foreground',
-		'data-[disabled]:text-muted-foreground data-[disabled]:opacity-50',
-		'dark:hover:text-accent-foreground',
+		buttonVariants({ variant: 'ghost', size: 'icon' }),
+		'data-[today=true]:bg-muted group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-ring/50 data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground data-[range-middle=true]:bg-muted data-[range-middle=true]:text-foreground data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground dark:hover:text-foreground relative isolate z-10 flex aspect-square size-auto w-full min-w-(--cell-size) flex-col gap-1 border-0 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:ring-[3px] data-[range-end=true]:rounded-(--cell-radius) data-[range-end=true]:rounded-e-(--cell-radius) data-[range-middle=true]:rounded-none data-[range-start=true]:rounded-(--cell-radius) data-[range-start=true]:rounded-s-(--cell-radius) [&>span]:text-xs [&>span]:opacity-70',
+		'data-[outside=true]:opacity-50',
 		"data-[highlighted]:before:content-['']",
 		'data-[highlighted]:before:absolute',
 		'data-[highlighted]:before:bottom-1',
-		'data-[highlighted]:before:left-1/2',
+		'data-[highlighted]:before:start-1/2',
 		'data-[highlighted]:before:h-1',
 		'data-[highlighted]:before:w-1',
 		'data-[highlighted]:before:-translate-x-1/2',
@@ -219,5 +164,12 @@ export class HlmCalendar<T> {
 		'data-[highlighted]:before:bg-destructive',
 	);
 
-	protected readonly _selectClass = 'gap-0 px-1.5 py-2 [&>ng-icon]:ml-1';
+	protected readonly _selectClass = 'gap-0 px-1.5 py-2 [&>ng-icon]:ms-1';
+
+	constructor() {
+		classes(
+			() =>
+				'spartan-calendar group/calendar bg-background block in-data-[slot=card-content]:bg-transparent in-data-[slot=popover-content]:bg-transparent',
+		);
+	}
 }

package/src/generators/ui/libs/combobox/files/lib/hlm-combobox-multiple.ts.template

@@ -1,7 +1,6 @@
 import { Directive } from '@angular/core';
 import { BrnComboboxMultiple } from '@spartan-ng/brain/combobox';
-import { provideBrnDialogDefaultOptions } from '@spartan-ng/brain/dialog';
-import { BrnPopover, provideBrnPopoverConfig } from '@spartan-ng/brain/popover';
+import { BrnPopover, provideBrnPopoverConfig, provideBrnPopoverDefaultOptions } from '@spartan-ng/brain/popover';
 import { classes } from '<%- importAlias %>/utils';
 
 @Directive({
@@ -11,9 +10,7 @@ import { classes } from '<%- importAlias %>/utils';
 			align: 'start',
 			sideOffset: 6,
 		}),
-		provideBrnDialogDefaultOptions({
-			autoFocus: 'first-heading',
-		}),
+		provideBrnPopoverDefaultOptions({ role: null }),
 	],
 	hostDirectives: [
 		{
@@ -32,16 +29,7 @@ import { classes } from '<%- importAlias %>/utils';
 		},
 		{
 			directive: BrnPopover,
-			inputs: [
-				'align',
-				'autoFocus',
-				'closeDelay',
-				'closeOnOutsidePointerEvents',
-				'sideOffset',
-				'state',
-				'offsetX',
-				'restoreFocus',
-			],
+			inputs: ['align', 'closeOnOutsidePointerEvents', 'sideOffset', 'state', 'offsetX'],
 			outputs: ['stateChanged', 'closed'],
 		},
 	],

package/src/generators/ui/libs/combobox/files/lib/hlm-combobox.ts.template

@@ -1,7 +1,6 @@
 import { Directive } from '@angular/core';
 import { BrnCombobox } from '@spartan-ng/brain/combobox';
-import { provideBrnDialogDefaultOptions } from '@spartan-ng/brain/dialog';
-import { BrnPopover, provideBrnPopoverConfig } from '@spartan-ng/brain/popover';
+import { BrnPopover, provideBrnPopoverConfig, provideBrnPopoverDefaultOptions } from '@spartan-ng/brain/popover';
 import { classes } from '<%- importAlias %>/utils';
 
 @Directive({
@@ -11,9 +10,7 @@ import { classes } from '<%- importAlias %>/utils';
 			align: 'start',
 			sideOffset: 6,
 		}),
-		provideBrnDialogDefaultOptions({
-			autoFocus: 'first-heading',
-		}),
+		provideBrnPopoverDefaultOptions({ role: null }),
 	],
 	hostDirectives: [
 		{
@@ -32,16 +29,7 @@ import { classes } from '<%- importAlias %>/utils';
 		},
 		{
 			directive: BrnPopover,
-			inputs: [
-				'align',
-				'autoFocus',
-				'closeDelay',
-				'closeOnOutsidePointerEvents',
-				'sideOffset',
-				'state',
-				'offsetX',
-				'restoreFocus',
-			],
+			inputs: ['align', 'closeOnOutsidePointerEvents', 'sideOffset', 'state', 'offsetX'],
 			outputs: ['stateChanged', 'closed'],
 		},
 	],

package/src/generators/ui/libs/date-picker/files/lib/hlm-date-picker-anchor.ts.template

@@ -1,11 +1,11 @@
-import { Directive, effect, ElementRef, inject, input, untracked } from '@angular/core';
-import { BrnDialog } from '@spartan-ng/brain/dialog';
+import { Directive, effect, ElementRef, inject, input } from '@angular/core';
+import { BrnOverlay } from '@spartan-ng/brain/overlay';
 import { BrnPopover } from '@spartan-ng/brain/popover';
 
 @Directive({ selector: '[hlmDatePickerAnchor]' })
 export class HlmDatePickerAnchor {
 	private readonly _host = inject(ElementRef, { host: true });
-	private readonly _brnDialog = inject(BrnDialog, { optional: true });
+	private readonly _brnOverlay = inject(BrnOverlay, { optional: true });
 
 	public readonly hlmDatePickerAnchorFor = input<BrnPopover | undefined>(undefined, {
 		alias: 'hlmDatePickerAnchorFor',
@@ -13,16 +13,9 @@ export class HlmDatePickerAnchor {
 
 	constructor() {
 		effect(() => {
-			const brnDialog = this.hlmDatePickerAnchorFor();
-			untracked(() => {
-				if (!brnDialog) return;
-				brnDialog.mutableAttachTo.set(this._host.nativeElement);
-				brnDialog.mutableCloseOnOutsidePointerEvents.set(true);
-			});
+			this.hlmDatePickerAnchorFor()?.setOrigin(this._host.nativeElement);
 		});
 
-		if (!this._brnDialog) return;
-		this._brnDialog.mutableAttachTo.set(this._host.nativeElement);
-		this._brnDialog.mutableCloseOnOutsidePointerEvents.set(true);
+		this._brnOverlay?.setOrigin(this._host.nativeElement);
 	}
 }

package/src/generators/ui/libs/date-picker/files/lib/hlm-date-picker-multi.ts.template

@@ -14,9 +14,9 @@ import {
 	viewChild,
 } from '@angular/core';
 import { type ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import type { BrnDialogState } from '@spartan-ng/brain/dialog';
 import { BrnFieldControl, provideBrnLabelable } from '@spartan-ng/brain/field';
 import type { ChangeFn, TouchFn } from '@spartan-ng/brain/forms';
+import type { BrnOverlayState } from '@spartan-ng/brain/overlay';
 import { BrnPopover } from '@spartan-ng/brain/popover';
 import { HlmCalendarMulti } from '<%- importAlias %>/calendar';
 import { HlmPopoverImports } from '<%- importAlias %>/popover';
@@ -53,7 +53,7 @@ export const HLM_DATE_PICKER_MUTLI_VALUE_ACCESSOR = {
 			<hlm-popover-content class="w-fit p-0" *hlmPopoverPortal="let ctx">
 				<ng-content select="[hlmDatePickerHeader]" />
 				<hlm-calendar-multi
-					calendarClass="border-0 rounded-none"
+					class="rounded-none border-0"
 					[date]="_mutableDate()"
 					[captionLayout]="captionLayout()"
 					[min]="min()"
@@ -115,7 +115,7 @@ export class HlmDatePickerMulti<T> implements HlmDatePickerBase<T>, ControlValue
 	/** Defines how the date should be transformed before saving to model/form. */
 	public readonly transformDates = input<(date: T[]) => T[]>(this._config.transformDates);
 
-	protected readonly _popoverState = signal<BrnDialogState | null>(null);
+	protected readonly _popoverState = signal<BrnOverlayState | null>(null);
 
 	protected readonly _disabled = linkedSignal(this.disabled);
 

package/src/generators/ui/libs/date-picker/files/lib/hlm-date-picker.ts.template

@@ -13,9 +13,9 @@ import {
 	viewChild,
 } from '@angular/core';
 import { type ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import type { BrnDialogState } from '@spartan-ng/brain/dialog';
 import { BrnFieldControl, provideBrnLabelable } from '@spartan-ng/brain/field';
 import type { ChangeFn, TouchFn } from '@spartan-ng/brain/forms';
+import type { BrnOverlayState } from '@spartan-ng/brain/overlay';
 import { BrnPopover } from '@spartan-ng/brain/popover';
 import { HlmCalendar } from '<%- importAlias %>/calendar';
 import { HlmPopoverImports } from '<%- importAlias %>/popover';
@@ -38,7 +38,6 @@ export const HLM_DATE_PICKER_VALUE_ACCESSOR = {
 	template: `
 		<hlm-popover
 			sideOffset="5"
-			autoFocus="first-heading"
 			[state]="_popoverState()"
 			(stateChanged)="_popoverState.set($event)"
 			(closed)="_onTouched?.()"
@@ -48,7 +47,7 @@ export const HLM_DATE_PICKER_VALUE_ACCESSOR = {
 			<hlm-popover-content class="w-fit p-0" *hlmPopoverPortal="let ctx">
 				<ng-content select="[hlmDatePickerHeader]" />
 				<hlm-calendar
-					calendarClass="rounded-none border-0"
+					class="rounded-none border-0"
 					[captionLayout]="captionLayout()"
 					[date]="_mutableDate()"
 					[defaultFocusedDate]="_mutableDate() ?? defaultFocusedDate()"
@@ -102,7 +101,7 @@ export class HlmDatePicker<T> implements HlmDatePickerBase<T>, ControlValueAcces
 	/** Defines how the date should be transformed before saving to model/form. */
 	public readonly transformDate = input<(date: T) => T>(this._config.transformDate);
 
-	protected readonly _popoverState = signal<BrnDialogState | null>(null);
+	protected readonly _popoverState = signal<BrnOverlayState | null>(null);
 
 	protected readonly _disabled = linkedSignal(this.disabled);
 

package/src/generators/ui/libs/date-picker/files/lib/hlm-date-range-picker.ts.template

@@ -14,9 +14,9 @@ import {
 	viewChild,
 } from '@angular/core';
 import { type ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import type { BrnDialogState } from '@spartan-ng/brain/dialog';
 import { BrnFieldControl, provideBrnLabelable } from '@spartan-ng/brain/field';
 import type { ChangeFn, TouchFn } from '@spartan-ng/brain/forms';
+import type { BrnOverlayState } from '@spartan-ng/brain/overlay';
 import { BrnPopover } from '@spartan-ng/brain/popover';
 import { HlmCalendarRange } from '<%- importAlias %>/calendar';
 import { HlmPopoverImports } from '<%- importAlias %>/popover';
@@ -53,7 +53,7 @@ export const HLM_DATE_RANGE_PICKER_VALUE_ACCESSOR = {
 			<hlm-popover-content class="w-fit p-0" *hlmPopoverPortal="let ctx">
 				<ng-content select="[hlmDatePickerHeader]" />
 				<hlm-calendar-range
-					calendarClass="border-0 rounded-none"
+					class="rounded-none border-0"
 					[startDate]="_start()"
 					[captionLayout]="captionLayout()"
 					[endDate]="_end()"
@@ -108,7 +108,7 @@ export class HlmDateRangePicker<T> implements HlmDatePickerBase<T>, ControlValue
 	/** Defines how the date should be transformed before saving to model/form. */
 	public readonly transformDates = input<(date: [T, T]) => [T, T]>(this._config.transformDates);
 
-	protected readonly _popoverState = signal<BrnDialogState | null>(null);
+	protected readonly _popoverState = signal<BrnOverlayState | null>(null);
 
 	protected readonly _disabled = linkedSignal(this.disabled);
 

package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-close.ts.template

@@ -3,7 +3,7 @@ import { BrnDialogClose } from '@spartan-ng/brain/dialog';
 
 @Directive({
 	selector: 'button[hlmDialogClose]',
-	hostDirectives: [{ directive: BrnDialogClose, inputs: ['delay'] }],
+	hostDirectives: [BrnDialogClose],
 	host: { 'data-slot': 'dialog-close' },
 })
 export class HlmDialogClose {}

package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-content.ts.template

@@ -1,4 +1,5 @@
 import type { BooleanInput } from '@angular/cdk/coercion';
+import type { ComponentType } from '@angular/cdk/portal';
 import { NgComponentOutlet } from '@angular/common';
 import { booleanAttribute, ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core';
 import { provideIcons } from '@ng-icons/core';
@@ -9,6 +10,12 @@ import { HlmIconImports } from '<%- importAlias %>/icon';
 import { classes } from '<%- importAlias %>/utils';
 import { HlmDialogClose } from './hlm-dialog-close';
 
+type HlmDialogContentContext = {
+	$component?: ComponentType<unknown>;
+	$dynamicComponentClass?: string;
+	$showCloseButton?: boolean;
+};
+
 @Component({
 	selector: 'hlm-dialog-content',
 	imports: [NgComponentOutlet, HlmIconImports, HlmButton, HlmDialogClose],
@@ -35,7 +42,7 @@ import { HlmDialogClose } from './hlm-dialog-close';
 })
 export class HlmDialogContent {
 	private readonly _dialogRef = inject(BrnDialogRef);
-	private readonly _dialogContext = injectBrnDialogContext({ optional: true });
+	private readonly _dialogContext = injectBrnDialogContext<HlmDialogContentContext | null>({ optional: true });
 
 	public readonly showCloseButton = input<boolean, BooleanInput>(this._dialogContext?.$showCloseButton ?? true, {
 		transform: booleanAttribute,

package/src/generators/ui/libs/drawer/files/lib/hlm-drawer-close.ts.template

@@ -3,7 +3,7 @@ import { BrnDrawerClose } from '@spartan-ng/brain/drawer';
 
 @Directive({
 	selector: 'button[hlmDrawerClose]',
-	hostDirectives: [{ directive: BrnDrawerClose, inputs: ['delay'] }],
+	hostDirectives: [BrnDrawerClose],
 	host: { 'data-slot': 'drawer-close' },
 })
 export class HlmDrawerClose {}

package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu-content.ts.template

@@ -1,17 +1,24 @@
-import { Directive } from '@angular/core';
+import { type NumberInput } from '@angular/cdk/coercion';
+import { Directive, input, numberAttribute } from '@angular/core';
 import { classes } from '<%- importAlias %>/utils';
 
 @Directive({
 	selector: '[hlmNavigationMenuContent],hlm-navigation-menu-content',
-	host: { 'data-slot': 'navigation-menu-content' },
+	host: {
+		'data-slot': 'navigation-menu-content',
+		'[style.--nav-offset]': 'navOffset()',
+	},
 })
 export class HlmNavigationMenuContent {
+	public readonly navOffset = input<number, NumberInput>(1.5, { transform: numberAttribute });
+
 	constructor() {
 		classes(() => [
 			'data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out top-0 left-0 w-full p-2 pr-2.5 md:w-auto',
 			'data-[orientation=horizontal]:data-[motion=from-end]:slide-in-from-right-52 data-[orientation=horizontal]:data-[motion=from-start]:slide-in-from-left-52 data-[orientation=horizontal]:data-[motion=to-end]:slide-out-to-right-52 data-[orientation=horizontal]:data-[motion=to-start]:slide-out-to-left-52',
 			'data-[orientation=vertical]:data-[motion=from-end]:slide-in-from-bottom-52 data-[orientation=vertical]:data-[motion=from-start]:slide-in-from-top-52 data-[orientation=vertical]:data-[motion=to-end]:slide-out-to-bottom-52 data-[orientation=vertical]:data-[motion=to-start]:slide-out-to-top-52',
-			'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=open]:fade-in-0 data-[state=closed]:fade-out-0 top-full overflow-hidden rounded-md border shadow duration-200 data-[orientation=horizontal]:mt-1.5 data-[orientation=vertical]:mx-1.5 **:data-[slot=navigation-menu-link]:focus:ring-0 **:data-[slot=navigation-menu-link]:focus:outline-none',
+			'data-[orientation=horizontal]:mt-[--spacing(var(--nav-offset))] data-[orientation=vertical]:mx-[--spacing(var(--nav-offset))]',
+			'spartan-navigation-menu-popup block',
 		]);
 	}
 }

package/src/generators/ui/libs/navigation-menu/files/lib/hlm-navigation-menu-item.ts.template

@@ -5,9 +5,12 @@ import { classes } from '<%- importAlias %>/utils';
 @Directive({
 	selector: 'li[hlmNavigationMenuItem]',
 	hostDirectives: [{ directive: BrnNavigationMenuItem, inputs: ['id'] }],
+	host: {
+		'data-slot': 'navigation-menu-item',
+	},
 })
 export class HlmNavigationMenuItem {
 	constructor() {
-		classes(() => 'relative');
+		classes(() => 'relative has-[:focus]:z-10 data-active:z-10');
 	}
 }