@signal24/vue-foundation 4.3.6 → 4.3.7

package/dist/src/components/modal-container.d.ts

@@ -1,9 +1,9 @@
 import type { Writable } from 'type-fest';
 import { type AllowedComponentProps, type ComponentInternalInstance, type ComponentPublicInstance, type ComputedOptions, type MethodOptions, type Raw, type VNode, type VNodeProps } from 'vue';
-interface ModalInjection<C extends Vue__ComponentPublicInstanceConstructor> {
+interface ModalInjection<C extends ModalComponent> {
     id: string;
-    component: Raw<C>;
-    props: ComponentProps<C>;
+    component: ModalComponentUnwrapped<C>;
+    props: ModalComponentProps<C>;
     vnode: VNode;
 }
 export declare const ModalContainer: import("vue").DefineComponent<{}, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -15,19 +15,30 @@ export type Vue__ComponentPublicInstanceConstructor<T extends ComponentPublicIns
     __isSuspense?: never;
     new (...args: any[]): T;
 };
-export type ComponentConfig<T extends Vue__ComponentPublicInstanceConstructor> = T extends Vue__ComponentPublicInstanceConstructor<infer P> ? P : never;
-export type ComponentProps<T extends Vue__ComponentPublicInstanceConstructor> = Writable<Omit<ComponentConfig<T>['$props'], keyof VNodeProps | keyof AllowedComponentProps>>;
-export type AnyComponentPublicInstance = {
-    $: ComponentInternalInstance;
-};
+export type ObjectComponentConfig<T extends Vue__ComponentPublicInstanceConstructor> = T extends Vue__ComponentPublicInstanceConstructor<infer P> ? P : never;
+export type ObjectComponentProps<T extends Vue__ComponentPublicInstanceConstructor> = Writable<Omit<ObjectComponentConfig<T>['$props'], keyof VNodeProps | keyof AllowedComponentProps>>;
+type ObjectOrDefault<T> = T extends object ? T : PropsWithCallback<{}>;
+export type ModalComponent = Vue__ComponentPublicInstanceConstructor | ((props: any) => any);
+export type ModalComponentConfig<T> = T extends Vue__ComponentPublicInstanceConstructor ? {
+    props: ObjectComponentProps<T>;
+    component: Raw<T>;
+} : T extends (props: infer P) => any ? {
+    props: Omit<ObjectOrDefault<P>, keyof VNodeProps | keyof AllowedComponentProps>;
+    component: T;
+} : never;
+export type ModalComponentUnwrapped<T extends ModalComponent> = ModalComponentConfig<T>['component'];
+export type ModalComponentProps<T extends ModalComponent> = ModalComponentConfig<T>['props'];
 interface PropsWithCallback<T> {
     callback?: (result: T) => void;
 }
-type ComponentReturn<C extends Vue__ComponentPublicInstanceConstructor> = ComponentProps<C> extends PropsWithCallback<infer R> ? R : never;
-export declare function createModalInjection<C extends Vue__ComponentPublicInstanceConstructor>(component: C, props: ComponentProps<C>): ModalInjection<C>;
+type ComponentReturn<M extends ModalComponent> = ModalComponentProps<M> extends PropsWithCallback<infer R> ? R : never;
+export type AnyComponentPublicInstance = {
+    $: ComponentInternalInstance;
+};
+export declare function createModalInjection<C extends ModalComponent>(component: C, props: ModalComponentProps<C>): ModalInjection<C>;
 export declare function removeModalInjection(injection: ModalInjection<any>): void;
 export declare function removeModalInjectionByInstance(instance: AnyComponentPublicInstance): void;
 export declare function removeModalInjectionByInternalInstance(instance: ComponentInternalInstance): void;
 export declare function removeModalInjectionByVnode(vnode: VNode): boolean;
-export declare function presentModal<C extends Vue__ComponentPublicInstanceConstructor, R extends ComponentReturn<C>>(component: C, props: Omit<ComponentProps<C>, 'callback'>): Promise<R | undefined>;
+export declare function presentModal<C extends ModalComponent, R extends ComponentReturn<C>>(component: C, props: Omit<ModalComponentProps<C>, 'callback'>): Promise<R | undefined>;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@signal24/vue-foundation",
     "type": "module",
-    "version": "4.3.6",
+    "version": "4.3.7",
     "description": "Common components, directives, and helpers for Vue 3 apps",
     "module": "./dist/vue-foundation.es.js",
     "bin": {

package/src/components/modal-container.ts

@@ -15,10 +15,10 @@ import {
     type VNodeProps
 } from 'vue';
 
-interface ModalInjection<C extends Vue__ComponentPublicInstanceConstructor> {
+interface ModalInjection<C extends ModalComponent> {
     id: string;
-    component: Raw<C>;
-    props: ComponentProps<C>;
+    component: ModalComponentUnwrapped<C>;
+    props: ModalComponentProps<C>;
     vnode: VNode;
 }
 
@@ -51,21 +51,37 @@ export type Vue__ComponentPublicInstanceConstructor<
     new (...args: any[]): T;
 };
 
-export type ComponentConfig<T extends Vue__ComponentPublicInstanceConstructor> = T extends Vue__ComponentPublicInstanceConstructor<infer P>
+export type ObjectComponentConfig<T extends Vue__ComponentPublicInstanceConstructor> = T extends Vue__ComponentPublicInstanceConstructor<infer P>
     ? P
     : never;
-export type ComponentProps<T extends Vue__ComponentPublicInstanceConstructor> = Writable<
-    Omit<ComponentConfig<T>['$props'], keyof VNodeProps | keyof AllowedComponentProps>
+export type ObjectComponentProps<T extends Vue__ComponentPublicInstanceConstructor> = Writable<
+    Omit<ObjectComponentConfig<T>['$props'], keyof VNodeProps | keyof AllowedComponentProps>
 >;
 
-export type AnyComponentPublicInstance = { $: ComponentInternalInstance };
+type ObjectOrDefault<T> = T extends object ? T : PropsWithCallback<{}>;
+export type ModalComponent = Vue__ComponentPublicInstanceConstructor | ((props: any) => any);
+export type ModalComponentConfig<T> = T extends Vue__ComponentPublicInstanceConstructor
+    ? {
+          props: ObjectComponentProps<T>;
+          component: Raw<T>;
+      }
+    : T extends (props: infer P) => any
+    ? {
+          props: Omit<ObjectOrDefault<P>, keyof VNodeProps | keyof AllowedComponentProps>;
+          component: T;
+      }
+    : never;
+export type ModalComponentUnwrapped<T extends ModalComponent> = ModalComponentConfig<T>['component'];
+export type ModalComponentProps<T extends ModalComponent> = ModalComponentConfig<T>['props'];
 
 interface PropsWithCallback<T> {
     callback?: (result: T) => void;
 }
-type ComponentReturn<C extends Vue__ComponentPublicInstanceConstructor> = ComponentProps<C> extends PropsWithCallback<infer R> ? R : never;
+type ComponentReturn<M extends ModalComponent> = ModalComponentProps<M> extends PropsWithCallback<infer R> ? R : never;
+
+export type AnyComponentPublicInstance = { $: ComponentInternalInstance };
 
-export function createModalInjection<C extends Vue__ComponentPublicInstanceConstructor>(component: C, props: ComponentProps<C>): ModalInjection<C> {
+export function createModalInjection<C extends ModalComponent>(component: C, props: ModalComponentProps<C>): ModalInjection<C> {
     // create or reconfigure the existing modal target
     // re-injecting every time keeps the modal container at the very end of the DOM
     const targetEl = document.getElementById('vf-modal-target') ?? document.createElement('div');
@@ -115,9 +131,9 @@ export function removeModalInjectionByVnode(vnode: VNode) {
     return false;
 }
 
-export async function presentModal<C extends Vue__ComponentPublicInstanceConstructor, R extends ComponentReturn<C>>(
+export async function presentModal<C extends ModalComponent, R extends ComponentReturn<C>>(
     component: C,
-    props: Omit<ComponentProps<C>, 'callback'>
+    props: Omit<ModalComponentProps<C>, 'callback'>
 ): Promise<R | undefined> {
     return new Promise<R>(resolve => {
         let modalInjection: ModalInjection<C> | null = null;
@@ -125,7 +141,7 @@ export async function presentModal<C extends Vue__ComponentPublicInstanceConstru
             removeModalInjection(modalInjection!);
             resolve(result);
         };
-        const resolvedProps = { ...props, callback } as ComponentProps<C>;
+        const resolvedProps = { ...props, callback } as ModalComponentProps<C>;
         modalInjection = createModalInjection(component, resolvedProps);
     });
 }