@signal24/vue-foundation 4.3.5 → 4.3.7

package/dist/src/components/alert-modal.vue.d.ts

@@ -1,50 +1,27 @@
-declare const _default: import("vue").DefineComponent<{
-    isBare: {
-        type: import("vue").PropType<boolean>;
-    };
-    isHtml: {
-        type: import("vue").PropType<boolean>;
-    };
-    classes: {
-        type: import("vue").PropType<string[]>;
-    };
-    title: {
-        type: import("vue").PropType<string>;
-    };
-    message: {
-        type: import("vue").PropType<string | Error>;
-        required: true;
-    };
-    shouldConfirm: {
-        type: import("vue").PropType<boolean>;
-    };
-    callback: {
-        type: import("vue").PropType<(ok: boolean) => void>;
-        required: true;
-    };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    isBare: {
-        type: import("vue").PropType<boolean>;
-    };
-    isHtml: {
-        type: import("vue").PropType<boolean>;
-    };
-    classes: {
-        type: import("vue").PropType<string[]>;
-    };
-    title: {
-        type: import("vue").PropType<string>;
-    };
-    message: {
-        type: import("vue").PropType<string | Error>;
-        required: true;
-    };
-    shouldConfirm: {
-        type: import("vue").PropType<boolean>;
-    };
-    callback: {
-        type: import("vue").PropType<(ok: boolean) => void>;
+declare const _default: import("vue").DefineComponent<__VLS_TypePropsToRuntimeProps<{
+    isBare?: boolean | undefined;
+    isHtml?: boolean | undefined;
+    classes?: string[] | undefined;
+    title?: string | undefined;
+    message: string | Error;
+    shouldConfirm?: boolean | undefined;
+    callback: (ok: boolean) => void;
+}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
+    isBare?: boolean | undefined;
+    isHtml?: boolean | undefined;
+    classes?: string[] | undefined;
+    title?: string | undefined;
+    message: string | Error;
+    shouldConfirm?: boolean | undefined;
+    callback: (ok: boolean) => void;
+}>>>, {}, {}>;
+export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
         required: true;
     };
-}>>, {}, {}>;
-export default _default;
+};

package/dist/src/components/ez-smart-select.vue.d.ts

@@ -1,42 +1,27 @@
-declare const _default: import("vue").DefineComponent<{
-    modelValue: {
-        type: import("vue").PropType<string | null | undefined>;
-        required: true;
-    };
-    nullTitle: {
-        type: import("vue").PropType<string>;
-    };
-    placeholder: {
-        type: import("vue").PropType<string>;
-    };
-    options: {
-        type: import("vue").PropType<string[] | Record<string, string>>;
-        required: true;
-    };
-    formatter: {
-        type: import("vue").PropType<(value: any) => string>;
-    };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<__VLS_TypePropsToRuntimeProps<{
+    modelValue: string | null | undefined;
+    nullTitle?: string | undefined;
+    placeholder?: string | undefined;
+    options: string[] | Record<string, string>;
+    formatter?: ((value: any) => string) | undefined;
+}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: string | null) => void;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    modelValue: {
-        type: import("vue").PropType<string | null | undefined>;
-        required: true;
-    };
-    nullTitle: {
-        type: import("vue").PropType<string>;
-    };
-    placeholder: {
-        type: import("vue").PropType<string>;
-    };
-    options: {
-        type: import("vue").PropType<string[] | Record<string, string>>;
-        required: true;
-    };
-    formatter: {
-        type: import("vue").PropType<(value: any) => string>;
-    };
-}>> & {
+}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
+    modelValue: string | null | undefined;
+    nullTitle?: string | undefined;
+    placeholder?: string | undefined;
+    options: string[] | Record<string, string>;
+    formatter?: ((value: any) => string) | undefined;
+}>>> & {
     "onUpdate:modelValue"?: ((value: string | null) => any) | undefined;
 }, {}, {}>;
 export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};

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/dist/src/components/modal.vue.d.ts

@@ -1,41 +1,21 @@
 declare function mask(): void;
 declare function unmask(): void;
-declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
-    id: {
-        type: import("vue").PropType<string>;
-    };
-    closeOnMaskClick: {
-        type: import("vue").PropType<boolean>;
-    };
-    scrolls: {
-        type: import("vue").PropType<boolean>;
-    };
-    closeX: {
-        type: import("vue").PropType<boolean>;
-    };
-    class: {
-        type: import("vue").PropType<string>;
-    };
-}, {
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_TypePropsToRuntimeProps<{
+    id?: string | undefined;
+    closeOnMaskClick?: boolean | undefined;
+    scrolls?: boolean | undefined;
+    closeX?: boolean | undefined;
+    class?: string | undefined;
+}>, {
     mask: typeof mask;
     unmask: typeof unmask;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formSubmit"[], "formSubmit", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    id: {
-        type: import("vue").PropType<string>;
-    };
-    closeOnMaskClick: {
-        type: import("vue").PropType<boolean>;
-    };
-    scrolls: {
-        type: import("vue").PropType<boolean>;
-    };
-    closeX: {
-        type: import("vue").PropType<boolean>;
-    };
-    class: {
-        type: import("vue").PropType<string>;
-    };
-}>> & {
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formSubmit"[], "formSubmit", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
+    id?: string | undefined;
+    closeOnMaskClick?: boolean | undefined;
+    scrolls?: boolean | undefined;
+    closeX?: boolean | undefined;
+    class?: string | undefined;
+}>>> & {
     onFormSubmit?: ((...args: any[]) => any) | undefined;
 }, {}, {}>, {
     header?(_: {}): any;
@@ -43,6 +23,15 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     footer?(_: {}): any;
 }>;
 export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;

package/dist/vue-foundation.es.js

@@ -819,7 +819,7 @@ function Dn(e, t) {
       return;
     }
     const g = document.createElement("div");
-    g.classList.add("item"), g.style.userSelect = "none", g.innerText = f.title, i.appendChild(g), f.class && g.classList.add(f.class), f.shouldConfirm ? g.addEventListener("click", () => f.handler()) : g.addEventListener("click", () => E(g, f.handler));
+    g.classList.add("item"), g.style.userSelect = "none", g.innerText = f.title, i.appendChild(g), f.class && g.classList.add(f.class), f.shouldConfirm ? g.addEventListener("click", () => E(g, f.handler)) : g.addEventListener("click", () => f.handler());
   });
   const o = window.innerWidth - e.clientX, r = window.innerHeight - e.clientY, l = i.offsetHeight, a = i.offsetWidth, v = o < a ? e.clientX - a - 1 : e.clientX + 1, h = r < l ? e.clientY - l - 1 : e.clientY + 1;
   i.style.left = v + "px", i.style.top = h + "px", setTimeout(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@signal24/vue-foundation",
     "type": "module",
-    "version": "4.3.5",
+    "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);
     });
 }

package/src/helpers/context-menu.ts

@@ -53,9 +53,9 @@ export function showContextMenu(e: MouseEvent, config: ContextMenuConfig) {
         }
 
         if (item.shouldConfirm) {
-            itemEl.addEventListener('click', () => item.handler());
-        } else {
             itemEl.addEventListener('click', () => confirmAction(itemEl, item.handler));
+        } else {
+            itemEl.addEventListener('click', () => item.handler());
         }
     });
 
@@ -106,3 +106,4 @@ export function showContextMenu(e: MouseEvent, config: ContextMenuConfig) {
 }
 
 // TODO: actually de-select text rather than just using CSS to hide its selection
+// TODO: confirm isn't working