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

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

@@ -1,153 +1,142 @@
-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 { BrnCalendarImports, BrnCalendarRange, injectBrnCalendarI18n, type Weekday } from '@spartan-ng/brain/calendar';
+import { BrnCalendarImports, BrnCalendarRange, 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-range',
-	imports: [BrnCalendarImports, NgIcon, HlmIcon, HlmSelectImports, NgTemplateOutlet],
+	imports: [BrnCalendarImports, NgIcon, HlmSelectImports, NgTemplateOutlet, HlmButtonImports],
 	viewProviders: [provideIcons({ lucideChevronLeft, lucideChevronRight })],
 	changeDetection: ChangeDetectionStrategy.OnPush,
+	hostDirectives: [
+		{
+			directive: BrnCalendarRange,
+			inputs: [
+				'min',
+				'max',
+				'disabled',
+				'startDate',
+				'endDate',
+				'dateDisabled',
+				'weekStartsOn',
+				'highlightDays',
+				'defaultFocusedDate',
+			],
+			outputs: ['endDateChange', 'startDateChange'],
+		},
+	],
 	host: { 'data-slot': 'calendar' },
 	template: `
-		<div
-			brnCalendarRange
-			[min]="min()"
-			[max]="max()"
-			[disabled]="disabled()"
-			[(startDate)]="startDate"
-			[(endDate)]="endDate"
-			[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 space-y-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="ring-offset-background focus-visible:ring-ring border-input hover:bg-accent hover:text-accent-foreground absolute left-1 inline-flex h-7 w-7 items-center justify-center rounded-md border bg-transparent p-0 text-sm font-medium whitespace-nowrap opacity-50 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="ring-offset-background focus-visible:ring-ring border-input hover:bg-accent hover:text-accent-foreground absolute right-1 inline-flex h-7 w-7 items-center justify-center rounded-md border bg-transparent p-0 text-sm font-medium whitespace-nowrap opacity-50 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 has-[button[data-range-start=true]]:bg-muted has-[button[data-range-start=true]]:after:bg-muted has-[button[data-range-end=true]]:bg-muted has-[button[data-range-end=true]]:after:bg-muted relative isolate z-0 aspect-square h-full w-full rounded-(--cell-radius) p-0 text-center select-none has-[button[data-range-end=true]]:rounded-e-(--cell-radius) has-[button[data-range-end=true]]:after:absolute has-[button[data-range-end=true]]:after:inset-y-0 has-[button[data-range-end=true]]:after:start-0 has-[button[data-range-end=true]]:after:w-4 has-[button[data-range-start=true]]:rounded-s-(--cell-radius) has-[button[data-range-start=true]]:after:absolute has-[button[data-range-start=true]]:after:inset-y-0 has-[button[data-range-start=true]]:after:end-0 has-[button[data-range-start=true]]:after:w-4 [&: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 has-data-[range-start]:after:bg-accent has-data-[range-end]:after:bg-accent relative h-8 w-8 p-0 text-center text-sm focus-within:relative focus-within:z-20 has-data-[range-end]:after:absolute has-data-[range-end]:after:inset-y-0 has-data-[range-end]:after:left-0 has-data-[range-end]:after:w-4 has-data-[range-start]:after:absolute has-data-[range-start]:after:inset-y-0 has-data-[range-start]:after:right-0 has-data-[range-start]:after:w-4 [&:first-child:has([data-range-between])>button]:rounded-l-md [&:last-child:has([data-range-between])>button]: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 HlmCalendarRange<T> {
-	public readonly calendarClass = input<ClassValue>('');
-
-	protected readonly _computedCalenderClass = computed(() => hlm('rounded-md border p-3', this.calendarClass()));
+	/** Show dropdowns to navigate between months or years. */
+	public readonly captionLayout = input<'dropdown' | 'label' | 'dropdown-months' | 'dropdown-years'>('label');
 
 	/** Access the calendar i18n */
 	protected readonly _i18n = injectBrnCalendarI18n();
@@ -155,47 +144,13 @@ export class HlmCalendarRange<T> {
 	/** 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 start date of the range. */
-	public readonly startDate = model<T>();
-
-	/** The end date of the range. */
-	public readonly endDate = 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(BrnCalendarRange);
+	private readonly _calendar = inject(BrnCalendarRange);
 
 	/** 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)),
@@ -205,18 +160,13 @@ export class HlmCalendarRange<T> {
 	});
 
 	protected readonly _btnClass = hlm(
-		buttonVariants({ variant: 'ghost' }),
-		'relative z-10 size-8 border-0 p-0 font-normal aria-selected:opacity-100',
-		'data-[outside]:text-muted-foreground data-[outside]:aria-selected:text-muted-foreground',
-		'data-[today]:bg-accent data-[today]:text-accent-foreground',
-		'data-[selected]:bg-primary data-[selected]:text-primary-foreground data-[selected]:focus:bg-primary data-[selected]:focus:text-primary-foreground',
-		'data-[disabled]:text-muted-foreground data-[disabled]:opacity-50',
-		'data-[range-between]:bg-accent data-[range-between]:text-accent-foreground data-[range-between]:rounded-none',
-		'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',
@@ -224,5 +174,12 @@ export class HlmCalendarRange<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',
+		);
+	}
 }