@bagelink/vue 1.3.5 → 1.3.7

package/src/styles/scrollbar.css

@@ -1,6 +1,6 @@
 body>div ::-webkit-scrollbar {
-    width: 0.5em;
-    height: 0.5rem;
+    width: var(--bgl-scrollbar-size);
+    height: var(--bgl-scrollbar-size);
 }
 
 body>div ::-webkit-scrollbar-track {}

package/src/styles/theme.css

@@ -33,6 +33,7 @@
     --bgl-selection-bg: var(--bgl-blue-dark);
     --bgl-selection-color: var(--bgl-white);
     --bgl-scrollbar-thumb: var(--bgl-gray);
+    --bgl-scrollbar-size: 0.5rem;
     --pill-btn-color: var(--bgl-white);
     --pill-btn-bg: var(--placeholder-color);
     --bgl-selected: var(--bgl-gray-light);

package/src/types/BagelForm.ts

@@ -75,13 +75,13 @@ export type VNodeFn<T, P extends Path<T>> = (props: {
 
 export type SchemaChild<
 	T,
-	P extends Path<T>,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 > = Field<T, PO> | VNode | VNodeFn<T, P> | string
 
 export interface BaseBagelField<
 	T,
-	P extends Path<T>,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 > {
 	'$el'?: any
@@ -113,13 +113,13 @@ export type _MappedBaseBagelField<
 
 export type MappedBaseBagelFieldP<
 	T,
-	P extends Path<T>,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 > = _MappedBaseBagelField<T, PO>[P]
 
 export type FieldByP<
 	T,
-	P extends Path<T>,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 > = MappedBaseBagelFieldP<T, P, PO>
 
@@ -143,14 +143,22 @@ export type ShallowBglFormSchemaT<
 	PO extends PathsOptions = ShallowPathsOptions,
 > = Field<T, PO>[]
 
-export interface InputBagelField<T, P extends Path<T>>
-	extends BaseBagelField<T, P> {
+export interface InputBagelField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = ShallowPathsOptions
+>
+	extends BaseBagelField<T, P, PO> {
 	$el: 'text' | ComponentExposed<typeof TextInput>
 	type?: string
 }
 
-export interface SelectBagelField<T, P extends Path<T>>
-	extends BaseBagelField<T, P> {
+export interface SelectBagelField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = ShallowPathsOptions,
+>
+	extends BaseBagelField<T, P, PO> {
 	$el: 'select' | ComponentExposed<typeof SelectInput>
 	type?: string
 }

package/src/utils/BagelFormUtils.ts

@@ -1,7 +1,10 @@
 import type { ArrayFieldVal, Attributes, BaseBagelField, BglFormSchemaT, FieldByP, IconType, InputBagelField, Option, Path, SchemaChild, SelectBagelField, ShallowBglFormSchemaT, UploadInputProps } from '@bagelink/vue'
 import type { DefaultPathsOptions, PathsOptions } from 'type-fest/source/paths'
 
-interface InputOptions<T, P extends Path<T>> extends Partial<BaseBagelField<T, P>> {
+interface InputOptions<
+	T,
+	P extends Path<T>
+> extends Partial<BaseBagelField<T, P>> {
 	defaultValue?: string | number
 	autocomplete?: AutoFillField
 }
@@ -41,22 +44,33 @@ interface NumFieldOptions<T, K extends Path<T>> extends InputOptions<T, K> {
 	useGrouping?: boolean
 }
 
-type RichTextOptions<T, P extends Path<T>> = InputOptions<T, P>
+type RichTextOptions<
+	T,
+	P extends Path<T>
+> = InputOptions<T, P>
 
-export function getBaseField<T, P extends Path<T>>(
+export function getBaseField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	labelOrRest: string | Partial<BaseBagelField<T, P>> = {},
 	rest: Partial<BaseBagelField<T, P>> = {}
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	if (typeof labelOrRest === 'object') return { id, ...labelOrRest }
 	return { id, label: labelOrRest, ...rest }
 }
 
-export function richText<T, P extends Path<T>>(
+export function richText<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: RichTextOptions<T, P>,
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'richtext',
 		class: options?.class,
@@ -71,11 +85,15 @@ export function richText<T, P extends Path<T>>(
 	}
 }
 
-export function txtField<T, P extends Path<T>>(
+export function txtField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: TextInputOptions<T, P>,
-): InputBagelField<T, P> {
+): InputBagelField<T, P, PO> {
 	return {
 		$el: 'text',
 		id,
@@ -102,12 +120,16 @@ export function txtField<T, P extends Path<T>>(
 	}
 }
 
-export function selectField<T, P extends Path<T>>(
+export function selectField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: Option[] | (() => Option[]),
 	config?: SlctInputOptions<T, P>,
-): SelectBagelField<T, P> {
+): SelectBagelField<T, P, PO> {
 	return {
 		$el: 'select',
 		id,
@@ -135,11 +157,15 @@ interface CheckInputOptions<T, K extends Path<T>> extends InputOptions<T, K> {
 	value?: string
 }
 
-export function checkField<T, P extends Path<T>>(
+export function checkField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: CheckInputOptions<T, P>,
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'check',
 		class: options?.class,
@@ -152,14 +178,21 @@ export function checkField<T, P extends Path<T>>(
 	}
 }
 
-interface EmailInputOptions<T, P extends Path<T>> extends InputOptions<T, P> {
+interface EmailInputOptions<
+	T,
+	P extends Path<T>
+> extends InputOptions<T, P> {
 	autocorrect?: boolean
 	serverValidate?: boolean
 	preventFakeEmails?: boolean
 	pattern?: string
 }
 
-export function emailField<T, P extends Path<T>>(id?: P, label?: string, options?: EmailInputOptions<T, P>): BaseBagelField<T, P> {
+export function emailField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(id?: P, label?: string, options?: EmailInputOptions<T, P>): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'email',
 		id,
@@ -176,11 +209,15 @@ export function emailField<T, P extends Path<T>>(id?: P, label?: string, options
 	}
 }
 
-export function dateField<T, P extends Path<T>>(
+export function dateField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: DateOptions<T, P>,
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'date',
 		class: options?.class,
@@ -201,11 +238,15 @@ export function dateField<T, P extends Path<T>>(
 	}
 }
 
-export function numField<T, P extends Path<T>>(
+export function numField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: NumFieldOptions<T, P>,
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'number',
 		class: options?.class,
@@ -230,7 +271,11 @@ export function numField<T, P extends Path<T>>(
 	}
 }
 
-export function frmRow<T, P extends Path<T>, PO extends PathsOptions = DefaultPathsOptions>(
+export function frmRow<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	...children: SchemaChild<T, P, PO>[]
 ): FieldByP<T, P, PO> {
 	return {
@@ -242,11 +287,15 @@ export function frmRow<T, P extends Path<T>, PO extends PathsOptions = DefaultPa
 
 export interface UploadOptions<T, K extends Path<T>> extends Omit<UploadInputProps, 'id'>, InputOptions<T, K> {}
 
-export function uploadField<T, P extends Path<T>>(
+export function uploadField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: UploadOptions<T, P>
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'upload',
 		id,
@@ -267,11 +316,15 @@ interface RangeOptions<T, K extends Path<T>> extends InputOptions<T, K> {
 	formatValue?: (value: number) => string
 }
 
-export function rangeField<T, P extends Path<T>>(
+export function rangeField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: RangeOptions <T, P>
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'range',
 		id,
@@ -307,11 +360,15 @@ export function bglForm<T>(idOrField?: string | FieldByP<T, Path<T>>, ...schema:
 	}
 }
 
-export function telField<T, P extends Path<T>>(
+export function telField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: { [key: string]: any }
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'tel',
 		id,
@@ -322,11 +379,15 @@ export function telField<T, P extends Path<T>>(
 	}
 }
 
-export function colorField<T, P extends Path<T>>(
+export function colorField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id?: P,
 	label?: string,
 	options?: { [key: string]: any }
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'color',
 		id,
@@ -358,12 +419,16 @@ export interface ArrayFieldOptions<T, K extends Path<T>> extends InputOptions<T,
 
 export type ArrayType = 'number' | 'text'
 
-export function arrField<T, P extends Path<T>>(
+export function arrField<
+	T,
+	P extends Path<T, PO>,
+	PO extends PathsOptions = DefaultPathsOptions,
+>(
 	id: P,
 	label: string,
 	schemaOrType: BglFormSchemaT<ArrayFieldVal<T, P>> | ArrayType,
 	options?: ArrayFieldOptions<T, P>
-): BaseBagelField<T, P> {
+): BaseBagelField<T, P, PO> {
 	const attrs: Attributes<T, P> = { delete: true, add: true, ...options }
 
 	if (typeof schemaOrType === 'string') {