@bagelink/vue 0.0.1169 → 0.0.1174

package/dist/components/ModalForm.vue.d.ts

@@ -1,117 +1,26 @@
-import { BglFormSchemaFnT, BtnOptions } from '..';
-type __VLS_Props = {
-    side?: boolean;
-    title?: string;
-    width?: string;
-    dismissable?: boolean;
-    actions?: BtnOptions[];
-    schema: BglFormSchemaFnT<any>;
-    onSubmit?: (formData: any) => Promise<void>;
-    onDelete?: (id: string) => void;
-    visible?: boolean;
-    onError?: (err: any) => void;
-    modelValue?: {
-        [key: string]: any;
-    };
-};
-declare function setFormValues(values: {
+import { ModalFormOptions } from '../plugins/modalTypes';
+declare const _default: <T extends {
     [key: string]: any;
-}): void;
-type __VLS_PublicProps = {
-    'modelValue'?: {
-        [key: string]: any;
-    };
-} & __VLS_Props;
-declare const _default: import('vue').DefineComponent<__VLS_PublicProps, {
-    setFormValues: typeof setFormValues;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    "update:visible": (...args: any[]) => void;
-    "update:modelValue": (value: {
-        [key: string]: any;
-    }) => void;
-}, string, import('vue').PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
-    "onUpdate:modelValue"?: ((value: {
-        [key: string]: any;
-    }) => any) | undefined;
-    "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
-}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
-    modal: ({
-        $: import('vue').ComponentInternalInstance;
-        $data: {};
-        $props: {
-            readonly side?: boolean | undefined;
-            readonly title?: string | undefined;
-            readonly width?: string | undefined;
-            readonly dismissable?: boolean | undefined;
-            readonly actions?: BtnOptions[] | undefined;
-            readonly visible?: boolean | undefined;
-            readonly "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
-        } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps;
-        $attrs: {
-            [x: string]: unknown;
-        };
-        $refs: {
-            [x: string]: unknown;
-        };
-        $slots: Readonly<{
-            [name: string]: import('vue').Slot<any> | undefined;
-        }>;
-        $root: import('vue').ComponentPublicInstance | null;
-        $parent: import('vue').ComponentPublicInstance | null;
-        $host: Element | null;
-        $emit: (event: "update:visible", ...args: any[]) => void;
-        $el: HTMLDivElement;
-        $options: import('vue').ComponentOptionsBase<Readonly<{
-            side?: boolean;
-            title?: string;
-            width?: string;
-            dismissable?: boolean;
-            actions?: BtnOptions[];
-            visible?: boolean;
-        }> & Readonly<{
-            "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
-        }>, {
-            closeModal: () => void;
-        }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-            "update:visible": (...args: any[]) => void;
-        }, string, {}, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & {
-            beforeCreate?: (() => void) | (() => void)[];
-            created?: (() => void) | (() => void)[];
-            beforeMount?: (() => void) | (() => void)[];
-            mounted?: (() => void) | (() => void)[];
-            beforeUpdate?: (() => void) | (() => void)[];
-            updated?: (() => void) | (() => void)[];
-            activated?: (() => void) | (() => void)[];
-            deactivated?: (() => void) | (() => void)[];
-            beforeDestroy?: (() => void) | (() => void)[];
-            beforeUnmount?: (() => void) | (() => void)[];
-            destroyed?: (() => void) | (() => void)[];
-            unmounted?: (() => void) | (() => void)[];
-            renderTracked?: ((e: import('vue').DebuggerEvent) => void) | ((e: import('vue').DebuggerEvent) => void)[];
-            renderTriggered?: ((e: import('vue').DebuggerEvent) => void) | ((e: import('vue').DebuggerEvent) => void)[];
-            errorCaptured?: ((err: unknown, instance: import('vue').ComponentPublicInstance | null, info: string) => boolean | void) | ((err: unknown, instance: import('vue').ComponentPublicInstance | null, info: string) => boolean | void)[];
-        };
-        $forceUpdate: () => void;
-        $nextTick: typeof import('vue').nextTick;
-        $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (...args: [R, R, import('@vue/reactivity').OnCleanup]) => any : (...args: [any, any, import('@vue/reactivity').OnCleanup]) => any, options?: import('vue').WatchOptions): import('vue').WatchStopHandle;
-    } & Readonly<{}> & Omit<Readonly<{
-        side?: boolean;
-        title?: string;
-        width?: string;
-        dismissable?: boolean;
-        actions?: BtnOptions[];
-        visible?: boolean;
-    }> & Readonly<{
-        "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
-    }>, "closeModal"> & import('vue').ShallowUnwrapRef<{
-        closeModal: () => void;
-    }> & {} & import('vue').ComponentCustomProperties & {} & {
-        $slots: {
-            toolbar?(_: {}): any;
-            default?(_: {}): any;
-            footer?(_: {}): any;
-        };
-    }) | null;
-}, HTMLDivElement>;
+}>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
+        readonly "onUpdate:modelValue"?: ((...args: unknown[]) => any) | undefined;
+        readonly "onUpdate:visible"?: ((value: boolean) => any) | undefined;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onUpdate:modelValue" | "onUpdate:visible"> & ({
+        modelValue?: T;
+    } & ModalFormOptions<T>) & Partial<{}>> & import('vue').PublicProps;
+    expose(exposed: import('vue').ShallowUnwrapRef<{
+        setFormValues: (values: {
+            [key: string]: any;
+        }) => void;
+    }>): void;
+    attrs: any;
+    slots: {};
+    emit: (((evt: "update:modelValue", value: T) => void) & ((evt: "update:visible", value: boolean) => void)) & ((evt: "update:modelValue", value: T) => void);
+}>) => import('vue').VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
 export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};
 //# sourceMappingURL=ModalForm.vue.d.ts.map

package/dist/components/ModalForm.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModalForm.vue.d.ts","sourceRoot":"","sources":["../../src/components/ModalForm.vue"],"names":[],"mappings":"AAqHA,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAa,MAAM,eAAe,CAAA;AAG5E,KAAK,WAAW,GAAG;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,EAAE,UAAU,EAAE,CAAA;IACtB,MAAM,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAA;IAE7B,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAE3C,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IAE/B,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAA;IAE5B,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAA;CACnC,CAAC;AAyCF,iBAAS,aAAa,CAAC,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,QAEpD;AASD,KAAK,iBAAiB,GAAG;IACzB,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;CACrC,GAAG,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAuMkpc,GAAG,8CAA8C,GAAG,yBAAyB,GAAG,6DAAmC,GAAG;;;;;;;;;;;;;;;;;;;;AArBxxc,wBAaG"}
+{"version":3,"file":"ModalForm.vue.d.ts","sourceRoot":"","sources":["../../src/components/ModalForm.vue"],"names":[],"mappings":"AAsHA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;yBAG5C,CAAC,SAAS;IAAC,CAAC,GAAG,EAAC,MAAM,GAAE,GAAG,CAAA;CAAC,eAC/B,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA0S1D,mBAAmB,CAAC;;;;qBAtOb,CAAC;0CAsO8E,CAAC,4BAA2B;oBACzG,OAAO,KAAK,EAAE,gBAAgB;gCAxPhB;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE;MAwPgB,GAAG,IAAI;WACpE,GAAG;;UAEJ,qJAAoC;OAG/B,OAAO,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,CAAA;CAAE;AApTzE,wBAoT4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/components/form/BagelForm.vue.d.ts

@@ -1,47 +1,40 @@
 import { BglFormSchemaFnT } from '../..';
-interface Props {
-    modelValue?: Record<string, any>;
-    schema?: BglFormSchemaFnT;
+export interface BagelFormProps<T extends {
+    [key: string]: any;
+}> {
+    modelValue?: T;
+    schema?: BglFormSchemaFnT<T>;
 }
-declare function handleSubmit(): void;
-declare function validateForm(): boolean;
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
+declare const _default: <T extends {
+    [key: string]: any;
+}>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
+        readonly onSubmit?: ((value: T) => any) | undefined;
+        readonly "onUpdate:modelValue"?: ((value: T) => any) | undefined;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onSubmit" | "onUpdate:modelValue"> & BagelFormProps<T> & Partial<{}>> & import('vue').PublicProps;
+    expose(exposed: import('vue').ShallowUnwrapRef<{
+        form: import('vue').Ref<HTMLFormElement | undefined, HTMLFormElement | undefined>;
+        isDirty: import('@vue-macros/reactivity-transform/macros.js').ComputedVariable<false> | import('@vue-macros/reactivity-transform/macros.js').ComputedVariable<true>;
+        validateForm: () => boolean;
+    }>): void;
+    attrs: any;
     slots: {
         default?(_: {}): any;
         submit?(_: {
-            submit: typeof handleSubmit;
+            submit: () => void;
             isDirty: import('@vue-macros/reactivity-transform/macros.js').ComputedVariable<false> | import('@vue-macros/reactivity-transform/macros.js').ComputedVariable<true>;
-            validateForm: typeof validateForm;
+            validateForm: () => boolean;
         }): any;
     };
-    refs: {
-        form: HTMLFormElement;
+    emit: {
+        (e: "update:modelValue", value: T): void;
+        (e: "submit", value: T): void;
     };
-    rootEl: HTMLFormElement;
+}>) => import('vue').VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
 };
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<Props, {
-    form: import('@vue-macros/reactivity-transform/macros.js').ReactiveVariable<HTMLFormElement> | undefined;
-    isDirty: import('@vue-macros/reactivity-transform/macros.js').ComputedVariable<false> | import('@vue-macros/reactivity-transform/macros.js').ComputedVariable<true>;
-    validateForm: typeof validateForm;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
-    submit: (value: Record<string, any>) => any;
-    "update:modelValue": (value: Record<string, any>) => any;
-}, string, import('vue').PublicProps, Readonly<Props> & Readonly<{
-    onSubmit?: ((value: Record<string, any>) => any) | undefined;
-    "onUpdate:modelValue"?: ((value: Record<string, any>) => any) | undefined;
-}>, {
-    schema: BglFormSchemaFnT;
-    modelValue: Record<string, any>;
-}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
-    form: HTMLFormElement;
-}, HTMLFormElement>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};
 //# sourceMappingURL=BagelForm.vue.d.ts.map

package/dist/components/form/BagelForm.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BagelForm.vue.d.ts","sourceRoot":"","sources":["../../../src/components/form/BagelForm.vue"],"names":[],"mappings":"AAoGA,OAAO,KAAK,EAAkB,gBAAgB,EAAS,MAAM,eAAe,CAAA;AAK5E,UAAU,KAAK;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAChC,MAAM,CAAC,EAAE,gBAAgB,CAAA;CACzB;AA4CD,iBAAS,YAAY,SAGpB;AAUD,iBAAS,YAAY,YAGpB;AA0BD,iBAAS,cAAc;WA6CT,OAAO,IAA6B;;yBAZrB,GAAG;;;;;YACJ,GAAG;;;;;;EAgB9B;AAgBD,KAAK,oBAAoB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,QAAA,MAAM,eAAe;;;;;;;;;;;YA1JX,gBAAgB;gBADZ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;mBAsK/B,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAAnG,wBAAoG;AAapG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACxC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}
+{"version":3,"file":"BagelForm.vue.d.ts","sourceRoot":"","sources":["../../../src/components/form/BagelForm.vue"],"names":[],"mappings":"AA0GA,OAAO,KAAK,EAAE,gBAAgB,EAAS,MAAM,eAAe,CAAA;AAK5D,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;IAC/D,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;CAC5B;yBAEgB,CAAC,SAAS;IAAC,CAAC,GAAG,EAAC,MAAM,GAAE,GAAG,CAAA;CAAC,eAC/B,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WAqK1D,mBAAmB,CAAC;;;0LAAkE,CAAC,4BAA2B;oBACzG,OAAO,KAAK,EAAE,gBAAgB;;;;MAAsB,GAAG,IAAI;WACpE,GAAG;;yBArCkB,GAAG;;;;;YACJ,GAAG;;;YA1H1B,mBAAmB,SAAS,CAAC,GAAG,IAAI;YACpC,QAAQ,SAAS,CAAC,GAAG,IAAI;;OAkKlB,OAAO,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,CAAA;CAAE;AA/KzE,wBA+K4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/components/form/inputs/RichText/composables/useEditor.d.ts

@@ -76,18 +76,13 @@ export declare function useEditor(): {
             showModal: (options: import('../../../../..').ModalOptions, slots?: {
                 [key: string]: any;
             }) => import('../../../../..').ModalComponentProps | undefined;
-            showModalForm: (options: import('../../../../..').ModalFormOptions, slots?: {
+            showModalForm: <T extends {
                 [key: string]: any;
-            }) => import('../../../../../plugins/modal').ModalFormComponentProps | undefined;
+            }>(options: import('../../../../../plugins/modalTypes').ModalFormOptions<T>, slots?: {
+                [key: string]: any;
+            }) => import('../../../../../plugins/modalTypes').ModalFormComponentProps<T> | undefined;
             hideModal: (index?: number) => void;
-            confirmModal: (options: string | {
-                title: string;
-                message: string;
-                confirmText?: string;
-                cancelText?: string;
-                confirmBtnColor?: string;
-                cancelBtnColor?: string;
-            }) => Promise<boolean>;
+            confirmModal: (options: import('../../../../../plugins/modalTypes').ConfirmModalUserOptions) => Promise<boolean>;
         };
     };
     init: (doc: Document) => void;

package/dist/components/form/inputs/RichText/composables/useEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useEditor.d.ts","sourceRoot":"","sources":["../../../../../../src/components/form/inputs/RichText/composables/useEditor.ts"],"names":[],"mappings":"AAuBA,wBAAgB,SAAS;;iBAff,MAAM;aACV,QAAQ,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAGX,OAAO;qBACR,OAAO;oBACR,OAAO;iBACV,OAAO;mBACL,MAAM,EAAE;mBACR,MAAM,EAAE;oBACP,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EA6DR,CAAC;;;oFAG4B,CAAC;;;6BAMvB,CAAA;;;;;;;;;;;gBA4GE,QAAQ;kCAmCU,MAAM,UAAU,MAAM;4BAhK5B,MAAM,GAAG,MAAM;;;;;;;8BAwQjB,MAAM,UAAU,MAAM;0CACV,MAAM;;EAkB/C"}
+{"version":3,"file":"useEditor.d.ts","sourceRoot":"","sources":["../../../../../../src/components/form/inputs/RichText/composables/useEditor.ts"],"names":[],"mappings":"AAuBA,wBAAgB,SAAS;;iBAff,MAAM;aACV,QAAQ,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAGX,OAAO;qBACR,OAAO;oBACR,OAAO;iBACV,OAAO;mBACL,MAAM,EAAE;mBACR,MAAM,EAAE;oBACP,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EAVf,CAAC;;;;;8FAMA,CAAC;;;6BAIK,CAAC;;;;gBAkLQ,QAAQ;kCAmCU,MAAM,UAAU,MAAM;4BAhK5B,MAAM,GAAG,MAAM;;;;;;;8BAwQjB,MAAM,UAAU,MAAM;0CACV,MAAM;;EAkB/C"}

package/dist/index.cjs

@@ -11575,11 +11575,16 @@ const _sfc_main$R = /* @__PURE__ */ vue.defineComponent({
     const props2 = __props;
     const emit2 = __emit;
     const form = vue.ref();
-    let formData = vue.ref(props2.modelValue ? { ...props2.modelValue } : {});
-    let initialFormData = vue.ref(props2.modelValue ? { ...props2.modelValue } : {});
+    const formData = vue.ref(structuredClone(props2.modelValue ?? {}));
+    const initialFormData = vue.ref(structuredClone(props2.modelValue ?? {}));
+    vue.onMounted(() => {
+      if (props2.modelValue) {
+        initialFormData.value = structuredClone(props2.modelValue);
+      }
+    });
     vue.watch(() => props2.modelValue, (newValue) => {
       if (newValue !== void 0) {
-        formData.value = { ...newValue };
+        formData.value = structuredClone(newValue);
       }
     }, { immediate: true, deep: true });
     const resolvedSchema = vue.computed(() => {
@@ -11600,7 +11605,7 @@ const _sfc_main$R = /* @__PURE__ */ vue.defineComponent({
     }
     function handleSubmit() {
       emit2("submit", formData.value);
-      initialFormData.value = { ...formData.value };
+      initialFormData.value = structuredClone(formData.value);
     }
     function shouldRenderField(field) {
       const condition = field.vIf ?? field["v-if"];
@@ -11625,7 +11630,7 @@ const _sfc_main$R = /* @__PURE__ */ vue.defineComponent({
       if (!shouldRenderField(field)) return null;
       return renderField(field);
     }
-    __expose({ form: form.value, isDirty: isDirty.value, validateForm });
+    __expose({ form, isDirty: isDirty.value, validateForm });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("form", {
         ref_key: "form",
@@ -38185,38 +38190,36 @@ const _hoisted_2$4 = { class: "flex gap-05" };
 const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
   __name: "ModalForm",
   props: /* @__PURE__ */ vue.mergeModels({
-    side: { type: Boolean },
-    title: {},
-    width: {},
-    dismissable: { type: Boolean },
-    actions: {},
     schema: {},
+    modelValue: {},
+    "onUpdate:modelValue": { type: Function },
     onSubmit: { type: Function },
+    onDelete: { type: Function },
     onDuplicate: { type: Function },
     submitText: {},
     cancelText: {},
     deleteText: {},
     duplicateText: {},
-    onDelete: { type: Function },
-    visible: { type: Boolean },
     onError: { type: Function },
-    modelValue: {}
+    side: { type: Boolean },
+    title: {},
+    width: {},
+    dismissable: { type: Boolean },
+    visible: { type: Boolean },
+    actions: {},
+    class: {}
   }, {
     "modelValue": {
       default: {}
     },
     "modelModifiers": {}
   }),
-  emits: /* @__PURE__ */ vue.mergeModels(["update:visible"], ["update:modelValue"]),
+  emits: /* @__PURE__ */ vue.mergeModels(["update:modelValue", "update:visible"], ["update:modelValue"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props2 = __props;
     const emit2 = __emit;
     const bagel = useBagel();
     const modal = vue.ref();
-    const computedFormSchema = vue.computed(() => {
-      if (typeof props2.schema === "function") return props2.schema();
-      return props2.schema;
-    });
     const formData = vue.useModel(__props, "modelValue");
     const form = vue.ref();
     const closeModal = () => {
@@ -38256,7 +38259,7 @@ const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
         visible: _ctx.visible,
         dismissable: _ctx.dismissable,
         title: _ctx.title,
-        "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => emit2("update:visible", $event))
+        "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => emit2("update:visible", $event))
       }, vue.createSlots({
         default: vue.withCtx(() => [
           _ctx.visible ? (vue.openBlock(), vue.createBlock(vue.unref(_sfc_main$R), {
@@ -38264,8 +38267,11 @@ const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
             ref_key: "form",
             ref: form,
             modelValue: formData.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => formData.value = $event),
-            schema: computedFormSchema.value,
+            "onUpdate:modelValue": [
+              _cache[0] || (_cache[0] = ($event) => formData.value = $event),
+              _cache[1] || (_cache[1] = ($event) => emit2("update:modelValue", $event))
+            ],
+            schema: _ctx.schema,
             onSubmit: runSubmit
           }, null, 8, ["modelValue", "schema"])) : vue.createCommentVNode("", true)
         ]),
@@ -38299,8 +38305,11 @@ const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
                 icon: "copy_all",
                 flat: "",
                 value: _ctx.duplicateText || "Duplicate",
-                onClick: _ctx.onDuplicate
-              }, null, 8, ["value", "onClick"])) : vue.createCommentVNode("", true),
+                onClick: _cache[2] || (_cache[2] = ($event) => {
+                  var _a2;
+                  return (_a2 = _ctx.onDuplicate) == null ? void 0 : _a2.call(_ctx, formData.value);
+                })
+              }, null, 8, ["value"])) : vue.createCommentVNode("", true),
               _ctx.onSubmit ? (vue.openBlock(), vue.createBlock(vue.unref(Btn), {
                 key: 1,
                 value: _ctx.submitText || "Submit",
@@ -38314,7 +38323,7 @@ const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const ModalForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-7a736620"]]);
+const ModalForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-1c0f6894"]]);
 const _hoisted_1$5 = { class: "full-nav" };
 const _hoisted_2$3 = { class: "nav-scroll" };
 const _hoisted_3$2 = { class: "nav-links-wrapper" };

package/dist/index.mjs

@@ -11573,11 +11573,16 @@ const _sfc_main$R = /* @__PURE__ */ defineComponent({
     const props2 = __props;
     const emit2 = __emit;
     const form = ref();
-    let formData = ref(props2.modelValue ? { ...props2.modelValue } : {});
-    let initialFormData = ref(props2.modelValue ? { ...props2.modelValue } : {});
+    const formData = ref(structuredClone(props2.modelValue ?? {}));
+    const initialFormData = ref(structuredClone(props2.modelValue ?? {}));
+    onMounted(() => {
+      if (props2.modelValue) {
+        initialFormData.value = structuredClone(props2.modelValue);
+      }
+    });
     watch(() => props2.modelValue, (newValue) => {
       if (newValue !== void 0) {
-        formData.value = { ...newValue };
+        formData.value = structuredClone(newValue);
       }
     }, { immediate: true, deep: true });
     const resolvedSchema = computed(() => {
@@ -11598,7 +11603,7 @@ const _sfc_main$R = /* @__PURE__ */ defineComponent({
     }
     function handleSubmit() {
       emit2("submit", formData.value);
-      initialFormData.value = { ...formData.value };
+      initialFormData.value = structuredClone(formData.value);
     }
     function shouldRenderField(field) {
       const condition = field.vIf ?? field["v-if"];
@@ -11623,7 +11628,7 @@ const _sfc_main$R = /* @__PURE__ */ defineComponent({
       if (!shouldRenderField(field)) return null;
       return renderField(field);
     }
-    __expose({ form: form.value, isDirty: isDirty.value, validateForm });
+    __expose({ form, isDirty: isDirty.value, validateForm });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("form", {
         ref_key: "form",
@@ -38183,38 +38188,36 @@ const _hoisted_2$4 = { class: "flex gap-05" };
 const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   __name: "ModalForm",
   props: /* @__PURE__ */ mergeModels({
-    side: { type: Boolean },
-    title: {},
-    width: {},
-    dismissable: { type: Boolean },
-    actions: {},
     schema: {},
+    modelValue: {},
+    "onUpdate:modelValue": { type: Function },
     onSubmit: { type: Function },
+    onDelete: { type: Function },
     onDuplicate: { type: Function },
     submitText: {},
     cancelText: {},
     deleteText: {},
     duplicateText: {},
-    onDelete: { type: Function },
-    visible: { type: Boolean },
     onError: { type: Function },
-    modelValue: {}
+    side: { type: Boolean },
+    title: {},
+    width: {},
+    dismissable: { type: Boolean },
+    visible: { type: Boolean },
+    actions: {},
+    class: {}
   }, {
     "modelValue": {
       default: {}
     },
     "modelModifiers": {}
   }),
-  emits: /* @__PURE__ */ mergeModels(["update:visible"], ["update:modelValue"]),
+  emits: /* @__PURE__ */ mergeModels(["update:modelValue", "update:visible"], ["update:modelValue"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props2 = __props;
     const emit2 = __emit;
     const bagel = useBagel();
     const modal = ref();
-    const computedFormSchema = computed(() => {
-      if (typeof props2.schema === "function") return props2.schema();
-      return props2.schema;
-    });
     const formData = useModel(__props, "modelValue");
     const form = ref();
     const closeModal = () => {
@@ -38254,7 +38257,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         visible: _ctx.visible,
         dismissable: _ctx.dismissable,
         title: _ctx.title,
-        "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => emit2("update:visible", $event))
+        "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => emit2("update:visible", $event))
       }, createSlots({
         default: withCtx(() => [
           _ctx.visible ? (openBlock(), createBlock(unref(_sfc_main$R), {
@@ -38262,8 +38265,11 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
             ref_key: "form",
             ref: form,
             modelValue: formData.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => formData.value = $event),
-            schema: computedFormSchema.value,
+            "onUpdate:modelValue": [
+              _cache[0] || (_cache[0] = ($event) => formData.value = $event),
+              _cache[1] || (_cache[1] = ($event) => emit2("update:modelValue", $event))
+            ],
+            schema: _ctx.schema,
             onSubmit: runSubmit
           }, null, 8, ["modelValue", "schema"])) : createCommentVNode("", true)
         ]),
@@ -38297,8 +38303,11 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                 icon: "copy_all",
                 flat: "",
                 value: _ctx.duplicateText || "Duplicate",
-                onClick: _ctx.onDuplicate
-              }, null, 8, ["value", "onClick"])) : createCommentVNode("", true),
+                onClick: _cache[2] || (_cache[2] = ($event) => {
+                  var _a2;
+                  return (_a2 = _ctx.onDuplicate) == null ? void 0 : _a2.call(_ctx, formData.value);
+                })
+              }, null, 8, ["value"])) : createCommentVNode("", true),
               _ctx.onSubmit ? (openBlock(), createBlock(unref(Btn), {
                 key: 1,
                 value: _ctx.submitText || "Submit",
@@ -38312,7 +38321,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ModalForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-7a736620"]]);
+const ModalForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-1c0f6894"]]);
 const _hoisted_1$5 = { class: "full-nav" };
 const _hoisted_2$3 = { class: "nav-scroll" };
 const _hoisted_3$2 = { class: "nav-links-wrapper" };

package/dist/plugins/modal.d.ts

@@ -1,72 +1,18 @@
-import { BglFormSchemaFnT, BtnOptions, ThemeType } from '..';
 import { InjectionKey, Plugin } from 'vue';
-export interface ModalOptions {
-    title?: string;
-    dismissable?: boolean;
-    side?: boolean;
-    width?: string;
-    actions?: BtnOptions[];
-    class?: string;
-    visible?: boolean;
-}
-export interface ModalFormOptions extends ModalOptions {
-    'schema': BglFormSchemaFnT<any>;
-    'onSubmit'?: (formData: any) => any;
-    'submitText'?: string;
-    'cancelText'?: string;
-    'deleteText'?: string;
-    'duplicateText'?: string;
-    'onDelete'?: (formData: any) => Promise<void>;
-    'onDuplicate'?: (formData: any) => Promise<void>;
-    'onError'?: (err: any) => void;
-    'modelValue'?: {
-        [key: string]: any;
-    };
-    'onUpdate:modelValue'?: (val: any) => void;
-}
-export interface ModalConfirmOptions {
-    'title': string;
-    'message': string;
-    'confirmText'?: string;
-    'confirmBtnColor'?: ThemeType;
-    'cancelText'?: string;
-    'cancelBtnColor'?: ThemeType;
-    'resolve': (val: boolean) => void;
-    'onUpdate:visible': () => void;
-    'visible': boolean;
-}
-type ModalType = 'modal' | 'modalForm' | 'confirmModal';
-type ConfirmModalUserOptions = string | {
-    title: string;
-    message: string;
-    confirmText?: string;
-    cancelText?: string;
-    confirmBtnColor?: string;
-    cancelBtnColor?: string;
-};
-export interface ModalComponentProps {
-    componentSlots: {
-        [key: string]: any;
-    };
-    modalType: ModalType;
-    modalOptions: ModalOptions | ModalFormOptions | ModalConfirmOptions;
-}
-export interface ModalFormComponentProps extends ModalComponentProps {
-    modalType: 'modalForm';
-    modalOptions: ModalFormOptions;
-}
+import { ConfirmModalUserOptions, ModalComponentProps, ModalFormComponentProps, ModalFormOptions, ModalOptions } from './modalTypes';
 export interface ModalApi {
     showModal: (options: ModalOptions, slots?: {
         [key: string]: any;
     }) => ModalComponentProps | undefined;
-    showModalForm: (options: ModalFormOptions, slots?: {
+    showModalForm: <T extends {
+        [key: string]: any;
+    }>(options: ModalFormOptions<T>, slots?: {
         [key: string]: any;
-    }) => ModalFormComponentProps | undefined;
+    }) => ModalFormComponentProps<T> | undefined;
     hideModal: (index?: number) => void;
     confirmModal: (options: ConfirmModalUserOptions) => Promise<boolean>;
 }
 export declare const ModalSymbol: InjectionKey<ModalApi>;
 export declare function useModal(): ModalApi;
 export declare const ModalPlugin: Plugin;
-export {};
 //# sourceMappingURL=modal.d.ts.map

package/dist/plugins/modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../src/plugins/modal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../src/plugins/modal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC/C,OAAO,KAAK,EAAE,uBAAuB,EAAE,mBAAmB,EAAuB,uBAAuB,EAAE,gBAAgB,EAAE,YAAY,EAAa,MAAM,cAAc,CAAA;AAIzK,MAAM,WAAW,QAAQ;IACxB,SAAS,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,KAAK,mBAAmB,GAAG,SAAS,CAAA;IACrG,aAAa,EAAE,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,KAAK,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;IACzJ,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,YAAY,EAAE,CAAC,OAAO,EAAE,uBAAuB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACpE;AAED,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,CAAmB,CAAA;AAElE,wBAAgB,QAAQ,IAAI,QAAQ,CAInC;AAED,eAAO,MAAM,WAAW,EAAE,MAsEzB,CAAA"}

package/dist/plugins/modalTypes.d.ts

@@ -0,0 +1,66 @@
+import { BglFormSchemaFnT, BtnOptions, ThemeType } from '..';
+export interface ModalOptions {
+    title?: string;
+    dismissable?: boolean;
+    side?: boolean;
+    width?: string;
+    actions?: BtnOptions[];
+    class?: string;
+    visible?: boolean;
+}
+export interface ModalConfirmOptions {
+    'title': string;
+    'message': string;
+    'confirmText'?: string;
+    'confirmBtnColor'?: ThemeType;
+    'cancelText'?: string;
+    'cancelBtnColor'?: ThemeType;
+    'resolve': (val: boolean) => void;
+    'onUpdate:visible': () => void;
+    'visible': boolean;
+}
+export type ModalType = 'modal' | 'modalForm' | 'confirmModal';
+export type ConfirmModalUserOptions = string | {
+    title: string;
+    message: string;
+    confirmText?: string;
+    cancelText?: string;
+    confirmBtnColor?: string;
+    cancelBtnColor?: string;
+};
+export interface ModalComponentProps {
+    componentSlots: {
+        [key: string]: any;
+    };
+    modalType: ModalType;
+    modalOptions: ModalOptions | ModalFormOptions | ModalConfirmOptions;
+}
+export interface ModalFormComponentProps<T extends {
+    [key: string]: any;
+} = any> extends ModalComponentProps {
+    modalType: 'modalForm';
+    modalOptions: ModalFormOptions<T>;
+}
+export interface ModalFormOptions<T extends {
+    [key: string]: any;
+} = any> {
+    'schema': BglFormSchemaFnT<T>;
+    'modelValue'?: T;
+    'onUpdate:modelValue'?: (val: T) => void;
+    'onSubmit'?: (formData: T) => any;
+    'onDelete'?: (formData: T) => Promise<void>;
+    'onDuplicate'?: (formData: T) => Promise<void>;
+    'submitText'?: string;
+    'cancelText'?: string;
+    'deleteText'?: string;
+    'duplicateText'?: string;
+    'onError'?: (err: any) => void;
+    'side'?: boolean;
+    'title'?: string;
+    'width'?: string;
+    'dismissable'?: boolean;
+    'visible'?: boolean;
+    'actions'?: BtnOptions[];
+    'class'?: string;
+}
+//# sourceMappingURL=modalTypes.d.ts.map

package/dist/plugins/modalTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modalTypes.d.ts","sourceRoot":"","sources":["../../src/plugins/modalTypes.ts"],"names":[],"mappings":"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"}

package/dist/style.css

@@ -3437,11 +3437,11 @@ body:has(.bg-dark.is-active) {
 	border-radius: var(--card-border-radius);
 }
 
-.modal-title[data-v-7a736620] {
+.modal-title[data-v-1c0f6894] {
 	margin-top: 0.5rem;
 }
 @media screen and (max-width: 910px) {
-.modal-title[data-v-7a736620] {
+.modal-title[data-v-1c0f6894] {
 		margin-top: 1rem;
 }
 }

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 import { IconType, MaterialIcons } from '../components/Icon/types';
-export type { ModalApi, ModalComponentProps, ModalComponentProps as ModalFormComponentProps, ModalFormOptions, ModalOptions, } from '../plugins/modal';
+export type { ModalComponentProps, ModalComponentProps as ModalFormComponentProps, ModalOptions, } from '../plugins/modalTypes';
 export type { IconType, MaterialIcons };
 export * from './BagelForm';
 export * from './BtnOptions';

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,IAAI,uBAAuB,EAC9C,gBAAgB,EAChB,YAAY,GACZ,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAEvE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAA;AAEvC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,YAAY,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAEzC,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,YAAY,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAE/D,MAAM,MAAM,GAAG,GAAG;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,CAAC,EAAE,QAAQ,CAAA;CACf,GAAG,MAAM,CAAA;AAEV,MAAM,MAAM,SAAS,GACpB,OAAO,GACL,OAAO,GACP,KAAK,GACL,MAAM,GACN,YAAY,GACZ,OAAO,GACP,OAAO,GACP,QAAQ,GACR,SAAS,GACT,MAAM,CAAA;AAET,MAAM,MAAM,MAAM,GACf,MAAM,GACN,MAAM,GACN;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GACtB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAE5C,MAAM,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACX,mBAAmB,EACnB,mBAAmB,IAAI,uBAAuB,EAC9C,YAAY,GACZ,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAEvE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAA;AAEvC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,YAAY,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAEzC,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,YAAY,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAE/D,MAAM,MAAM,GAAG,GAAG;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,CAAC,EAAE,QAAQ,CAAA;CACf,GAAG,MAAM,CAAA;AAEV,MAAM,MAAM,SAAS,GACpB,OAAO,GACL,OAAO,GACP,KAAK,GACL,MAAM,GACN,YAAY,GACZ,OAAO,GACP,OAAO,GACP,QAAQ,GACR,SAAS,GACT,MAAM,CAAA;AAET,MAAM,MAAM,MAAM,GACf,MAAM,GACN,MAAM,GACN;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GACtB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAE5C,MAAM,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA"}

package/dist/utils/BagelFormUtils.d.ts

@@ -29,7 +29,9 @@ interface NumFieldOptions extends InputOptions {
     center?: boolean;
 }
 type RichTextOptions = InputOptions;
-export declare function getBaseField<T>(id?: string, labelOrRest?: string | Partial<Field<T>>, rest?: Partial<Field<T>>): Field<T>;
+export declare function getBaseField<T extends {
+    [key: string]: any;
+}>(id?: keyof T extends string ? keyof T : string, labelOrRest?: string | Partial<Field<T>>, rest?: Partial<Field<T>>): Field<T>;
 export declare function richText(id: string, label?: string, options?: RichTextOptions): {
     $el: string;
     class: string | undefined;

package/dist/utils/BagelFormUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BagelFormUtils.d.ts","sourceRoot":"","sources":["../../src/utils/BagelFormUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAIlE,UAAU,YAAY;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,CAAA;CAClD;AAED,KAAK,WAAW,GAAG,YAAY,CAAA;AAE/B,UAAU,gBAAiB,SAAQ,YAAY;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,CAAA;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,UAAU,gBAAiB,SAAQ,YAAY;IAC9C,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,CAAA;CAClC;AAED,UAAU,eAAgB,SAAQ,YAAY;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,YAAY,CAAA;IAC9C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,KAAK,eAAe,GAAG,YAAY,CAAA;AAEnC,wBAAgB,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAM,EAAE,IAAI,GAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAIjI;AAED,wBAAgB,QAAQ,CACvB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,eAAe;;;;;;2BAtCD,GAAG,OAAO,GAAG,KAAK,OAAO;;;EAkDjD;AAED,wBAAgB,QAAQ,CACvB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,gBAAgB,GACxB,KAAK,CAiBP;AAED,wBAAgB,SAAS,CACxB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,MAAM,EAAE,CAAC,EACrC,MAAM,CAAC,EAAE,gBAAgB,GAEvB,KAAK,CAmBP;AAED,wBAAgB,UAAU,CACzB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,YAAY,GACpB,KAAK,CAQP;AAED,wBAAgB,SAAS,CACxB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,WAAW,GACnB,KAAK,CAcP;AAED,wBAAgB,QAAQ,CACvB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,eAAe,GACvB,KAAK,CAqBP;AAED,wBAAgB,MAAM,CAAC,GAAG,QAAQ,EAAE,KAAK,EAAE;;;;EAM1C;AAED,UAAU,aAAc,SAAQ,YAAY;IAC3C,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa;;;;2BA/KtD,GAAG,OAAO,GAAG,KAAK,OAAO;;mBA4KtC,OAAO;mBAlLP,OAAO;sBACJ,MAAM;gBACZ,MAAM;uBACC,MAAM;mBACV,OAAO;mBACP,MAAM;cACX,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;;EAyLlD;AAED,wBAAgB,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE;;;;;;;;;;;;;;;;EAgBrE;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,KAAK,CAQ5F;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS,CASvF;AAED,UAAU,iBAAkB,SAAQ,YAAY;IAC/C,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,CAAA;CACb;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,iBAAiB;;;;2BAvO9E,GAAG,OAAO,GAAG,KAAK,OAAO;;gBAmOxC,OAAO;aACV,OAAO;mBA1OF,OAAO;sBACJ,MAAM;gBACZ,MAAM;uBACC,MAAM;mBACV,OAAO;mBACP,MAAM;cACX,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;;;EA+OlD"}
+{"version":3,"file":"BagelFormUtils.d.ts","sourceRoot":"","sources":["../../src/utils/BagelFormUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/vue",
   "type": "module",
-  "version": "0.0.1169",
+  "version": "0.0.1174",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Neveh Allon",

package/src/components/ModalForm.vue

@@ -1,42 +1,31 @@
-<script lang="ts" setup>
-import type { BglFormSchemaFnT, BtnOptions } from '@bagelink/vue'
+<script lang="ts" setup generic="T extends {[key:string]:any}">
+import type { ModalFormOptions } from '../plugins/modalTypes'
 import { Btn, Modal, useBagel, BagelForm } from '@bagelink/vue'
 
-const props = defineProps<{
-	side?: boolean
-	title?: string
-	width?: string
-	dismissable?: boolean
-	actions?: BtnOptions[]
-	schema: BglFormSchemaFnT<any>
+// eslint-disable-next-line vue/prop-name-casing
+const props = defineProps<ModalFormOptions<T>>()
 
-	onSubmit?: (formData: any) => Promise<void>
-	onDuplicate?: (formData: any) => Promise<void>
-	submitText?: string
-	cancelText?: string
-	deleteText?: string
-	duplicateText?: string
-	onDelete?: (formData: any) => void
-	visible?: boolean
-	onError?: (err: any) => void
-	modelValue?: { [key: string]: any }
+const emit = defineEmits<{
+	'update:modelValue': [value: T]
+	'update:visible': [value: boolean]
 }>()
 
-const emit = defineEmits(['update:visible'])
-
 const bagel = useBagel()
 
 const modal = $ref<InstanceType<typeof Modal>>()
 
-const computedFormSchema = $computed(() => {
-	if (typeof props.schema === 'function') return props.schema()
-	return props.schema
+const formData = defineModel<T>('modelValue', {
+	default: {} as Partial<T>,
 })
 
-const formData = defineModel<{ [key: string]: any }>('modelValue', {
-	default: {},
-})
-const form = $ref<InstanceType<typeof BagelForm>>()
+interface BagelFormInstance<T> {
+	validateForm: () => boolean
+	deleteItem?: () => void
+	isDirty?: boolean
+	clearForm?: () => void
+}
+
+const form = $ref<BagelFormInstance<T>>()
 const closeModal = () => modal?.closeModal()
 
 let submitting = $ref(false)
@@ -81,7 +70,8 @@ defineExpose({ setFormValues })
 			v-if="visible"
 			ref="form"
 			v-model="formData"
-			:schema="computedFormSchema"
+			:schema="schema"
+			@update:modelValue="emit('update:modelValue', $event)"
 			@submit="runSubmit"
 		/>
 		<template v-if="onDelete || onSubmit" #footer>
@@ -105,7 +95,7 @@ defineExpose({ setFormValues })
 					icon="copy_all"
 					flat
 					:value="duplicateText || 'Duplicate'"
-					@click="onDuplicate"
+					@click="onDuplicate?.(formData)"
 				/>
 				<Btn v-if="onSubmit" :value="submitText || 'Submit'" @click="runSubmit" />
 			</div>

package/src/components/form/BagelForm.vue

@@ -1,79 +1,85 @@
-<script setup lang="ts">
-import type { BglFormSchemaT, BglFormSchemaFnT, Field } from '@bagelink/vue'
+<script setup lang="ts" generic="T extends {[key:string]:any}">
+import type { BglFormSchemaFnT, Field } from '@bagelink/vue'
 import type { VNode } from 'vue'
-import { watch } from 'vue'
+import { onMounted, watch, ref } from 'vue'
 import { useSchemaField } from '../../composables/useSchemaField'
 
-interface Props {
-	modelValue?: Record<string, any>
-	schema?: BglFormSchemaFnT
+export interface BagelFormProps<T extends { [key: string]: any }> {
+	modelValue?: T
+	schema?: BglFormSchemaFnT<T>
 }
 
-const props = withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<BagelFormProps<T>>(), {
 	modelValue: undefined,
 	schema: undefined
 })
 
 const emit = defineEmits<{
-	(e: 'update:modelValue', value: Record<string, any>): void
-	(e: 'submit', value: Record<string, any>): void
+	(e: 'update:modelValue', value: T): void
+	(e: 'submit', value: T): void
 }>()
 
-const form = $ref<HTMLFormElement>()
-let formData = $ref(props.modelValue ? { ...props.modelValue } : {})
-let initialFormData = $ref(props.modelValue ? { ...props.modelValue } : {})
+const form = ref<HTMLFormElement>()
+const formData = ref<T>(structuredClone(props.modelValue ?? {} as T))
+const initialFormData = ref<T>(structuredClone(props.modelValue ?? {} as T))
+
+onMounted(() => {
+	if (props.modelValue) {
+		initialFormData.value = structuredClone(props.modelValue)
+	}
+})
 
 // Keep formData in sync with modelValue prop only if it's provided
 watch(() => props.modelValue, (newValue) => {
 	if (newValue !== undefined) {
-		formData = { ...newValue }
+		formData.value = structuredClone(newValue)
 	}
 }, { immediate: true, deep: true })
 
-const resolvedSchema = $computed<BglFormSchemaT | undefined>(() => {
+const resolvedSchema = $computed<BglFormSchemaFnT<T> | undefined>(() => {
 	if (!props.schema) return undefined
 	return typeof props.schema === 'function' ? props.schema() : props.schema
 })
 
 const isDirty = $computed(() => {
-	const current = JSON.stringify(formData)
-	const initial = JSON.stringify(initialFormData)
+	const current = JSON.stringify(formData.value)
+	const initial = JSON.stringify(initialFormData.value)
 	return current !== initial
 })
 
 function updateFormData(fieldId: string, value: any) {
-	formData = {
-		...formData,
+	formData.value = {
+		...formData.value,
 		[fieldId]: value
 	}
-	emit('update:modelValue', formData)
+	emit('update:modelValue', formData.value)
 }
 
 function handleSubmit() {
-	emit('submit', formData)
-	initialFormData = { ...formData }
+	emit('submit', formData.value)
+	initialFormData.value = structuredClone(formData.value)
 }
 
 function shouldRenderField(field: Field): boolean {
 	const condition = field.vIf ?? field['v-if']
 	if (condition === undefined) return true
 	return typeof condition === 'function'
-		? condition(formData[field.id as string], formData)
+		? condition(formData.value[field.id as keyof T], formData.value)
 		: !!condition
 }
 
 function validateForm() {
-	if (!form) return false
-	return form.reportValidity()
+	if (!form.value) return false
+	return form.value.reportValidity()
 }
 
-const { renderField } = useSchemaField<Record<string, any>>({
+const { renderField } = useSchemaField<T>({
 	mode: 'form',
-	getRowData: () => formData,
+	getRowData: () => formData.value,
 	onUpdate: (field, value) => {
 		if (!field.id) return
 		updateFormData(field.id, value)
-		field.onUpdate?.(value, formData)
+		field.onUpdate?.(value, formData.value)
 	}
 })
 
@@ -88,7 +94,7 @@ defineExpose({ form, isDirty, validateForm })
 <template>
 	<form ref="form" @submit.prevent="handleSubmit">
 		<template v-if="resolvedSchema">
-			<template v-for="(field) in resolvedSchema" :key="field.id">
+			<template v-for="field in (resolvedSchema as Field[])" :key="field.id">
 				<component :is="renderSchemaField(field)" />
 			</template>
 		</template>

package/src/plugins/modal.ts

@@ -1,62 +1,11 @@
-import type { BglFormSchemaFnT, BtnOptions, ThemeType } from '@bagelink/vue'
 import type { InjectionKey, Plugin } from 'vue'
+import type { ConfirmModalUserOptions, ModalComponentProps, ModalConfirmOptions, ModalFormComponentProps, ModalFormOptions, ModalOptions, ModalType } from './modalTypes'
 import { Modal, ModalConfirm, ModalForm } from '@bagelink/vue'
 import { defineComponent, h, inject } from 'vue'
 
-// Interface Definitions
-export interface ModalOptions {
-	title?: string
-	dismissable?: boolean
-	side?: boolean
-	width?: string
-	actions?: BtnOptions[]
-	class?: string
-	visible?: boolean
-}
-
-export interface ModalFormOptions extends ModalOptions {
-	'schema': BglFormSchemaFnT<any>
-	'onSubmit'?: (formData: any) => any
-	'submitText'?: string
-	'cancelText'?: string
-	'deleteText'?: string
-	'duplicateText'?: string
-	'onDelete'?: (formData: any) => Promise<void>
-	'onDuplicate'?: (formData: any) => Promise<void>
-	'onError'?: (err: any) => void
-	'modelValue'?: { [key: string]: any }
-	'onUpdate:modelValue'?: (val: any) => void
-}
-
-export interface ModalConfirmOptions {
-	'title': string
-	'message': string
-	'confirmText'?: string
-	'confirmBtnColor'?: ThemeType
-	'cancelText'?: string
-	'cancelBtnColor'?: ThemeType
-	'resolve': (val: boolean) => void
-	'onUpdate:visible': () => void
-	'visible': boolean
-}
-
-type ModalType = 'modal' | 'modalForm' | 'confirmModal'
-type ConfirmModalUserOptions = string | { title: string, message: string, confirmText?: string, cancelText?: string, confirmBtnColor?: string, cancelBtnColor?: string }
-
-export interface ModalComponentProps {
-	componentSlots: { [key: string]: any }
-	modalType: ModalType
-	modalOptions: ModalOptions | ModalFormOptions | ModalConfirmOptions
-}
-
-export interface ModalFormComponentProps extends ModalComponentProps {
-	modalType: 'modalForm'
-	modalOptions: ModalFormOptions
-}
-
 export interface ModalApi {
 	showModal: (options: ModalOptions, slots?: { [key: string]: any }) => ModalComponentProps | undefined
-	showModalForm: (options: ModalFormOptions, slots?: { [key: string]: any }) => ModalFormComponentProps | undefined
+	showModalForm: <T extends { [key: string]: any }>(options: ModalFormOptions<T>, slots?: { [key: string]: any }) => ModalFormComponentProps<T> | undefined
 	hideModal: (index?: number) => void
 	confirmModal: (options: ConfirmModalUserOptions) => Promise<boolean>
 }
@@ -88,11 +37,11 @@ export const ModalPlugin: Plugin = {
 			})
 		}
 
-		const showModal = (
+		const showModal = <T extends { [key: string]: any } = any>(
 			modalType: ModalType,
-			options: ModalOptions | ModalFormOptions,
+			options: ModalOptions | ModalFormOptions<T>,
 			slots: { [key: string]: any } = {}
-		): ModalComponentProps | ModalFormComponentProps | undefined => {
+		): ModalComponentProps | ModalFormComponentProps<T> | undefined => {
 			const modalComponent = {
 				modalOptions: options,
 				modalType,
@@ -101,7 +50,7 @@ export const ModalPlugin: Plugin = {
 			modalStack.push(modalComponent)
 
 			if (modalType === 'modalForm') {
-				return modalComponent as ModalFormComponentProps
+				return modalComponent as ModalFormComponentProps<T>
 			}
 			return modalComponent
 		}
@@ -109,7 +58,7 @@ export const ModalPlugin: Plugin = {
 		app.provide(ModalSymbol, {
 			showModal: (options: ModalOptions, slots?: { [key: string]: any }) => showModal('modal', options, slots),
 
-			showModalForm: (options: ModalFormOptions, slots?: { [key: string]: any }) => showModal('modalForm', options, slots) as ModalFormComponentProps,
+			showModalForm: <T extends { [key: string]: any }>(options: ModalFormOptions<T>, slots?: { [key: string]: any }) => showModal<T>('modalForm', options, slots) as ModalFormComponentProps<T>,
 
 			confirmModal: (options: ConfirmModalUserOptions) => confirmModal(options),
 
@@ -137,7 +86,6 @@ export const ModalPlugin: Plugin = {
 				})
 			},
 		})
-
 		app.component('ModalContainer', ModalComponent)
 	},
 }

package/src/plugins/modalTypes.ts

@@ -0,0 +1,58 @@
+import type { BglFormSchemaFnT, BtnOptions, ThemeType } from '@bagelink/vue'
+
+export interface ModalOptions {
+	title?: string
+	dismissable?: boolean
+	side?: boolean
+	width?: string
+	actions?: BtnOptions[]
+	class?: string
+	visible?: boolean
+}
+
+export interface ModalConfirmOptions {
+	'title': string
+	'message': string
+	'confirmText'?: string
+	'confirmBtnColor'?: ThemeType
+	'cancelText'?: string
+	'cancelBtnColor'?: ThemeType
+	'resolve': (val: boolean) => void
+	'onUpdate:visible': () => void
+	'visible': boolean
+}
+
+export type ModalType = 'modal' | 'modalForm' | 'confirmModal'
+export type ConfirmModalUserOptions = string | { title: string, message: string, confirmText?: string, cancelText?: string, confirmBtnColor?: string, cancelBtnColor?: string }
+
+export interface ModalComponentProps {
+	componentSlots: { [key: string]: any }
+	modalType: ModalType
+	modalOptions: ModalOptions | ModalFormOptions | ModalConfirmOptions
+}
+
+export interface ModalFormComponentProps<T extends { [key: string]: any } = any> extends ModalComponentProps {
+	modalType: 'modalForm'
+	modalOptions: ModalFormOptions<T>
+}
+
+export interface ModalFormOptions<T extends { [key: string]: any } = any> {
+	'schema': BglFormSchemaFnT<T>
+	'modelValue'?: T
+	'onUpdate:modelValue'?: (val: T) => void
+	'onSubmit'?: (formData: T) => any
+	'onDelete'?: (formData: T) => Promise<void>
+	'onDuplicate'?: (formData: T) => Promise<void>
+	'submitText'?: string
+	'cancelText'?: string
+	'deleteText'?: string
+	'duplicateText'?: string
+	'onError'?: (err: any) => void
+	'side'?: boolean
+	'title'?: string
+	'width'?: string
+	'dismissable'?: boolean
+	'visible'?: boolean
+	'actions'?: BtnOptions[]
+	'class'?: string
+}

package/src/types/index.ts

@@ -1,10 +1,8 @@
 export type {
-	ModalApi,
 	ModalComponentProps,
 	ModalComponentProps as ModalFormComponentProps,
-	ModalFormOptions,
 	ModalOptions,
-} from '../plugins/modal'
+} from '../plugins/modalTypes'
 
 import type { IconType, MaterialIcons } from '../components/Icon/types'
 

package/src/utils/BagelFormUtils.ts

@@ -38,9 +38,12 @@ interface NumFieldOptions extends InputOptions {
 
 type RichTextOptions = InputOptions
 
-export function getBaseField<T>(id?: string, labelOrRest: string | Partial<Field<T>> = {}, rest: Partial<Field<T>> = {}): Field<T> {
+export function getBaseField<T extends { [key: string]: any }>(
+	id?: keyof T extends string ? keyof T : string,
+	labelOrRest: string | Partial<Field<T>> = {},
+	rest: Partial<Field<T>> = {}
+): Field<T> {
 	if (typeof labelOrRest === 'object') return { id, ...labelOrRest }
-
 	return { id, label: labelOrRest, ...rest }
 }