vasille-web 5.1.2 → 5.1.4

package/lib/dev.js

@@ -8,7 +8,7 @@ function createPortal(node, declaration, usage, name) {
     return portal;
 }
 export function devModal(modalFn, declaration, name) {
-    return (input, node, usage) => {
+    return (input, node, slot, usage) => {
         modal(modalFn, node => {
             const portal = createPortal(node, declaration, usage, name);
             const inspector = portal.runner.inspector;
@@ -29,7 +29,7 @@ export function devModal(modalFn, declaration, name) {
                 });
             });
             return portal;
-        })(input, node);
+        })(input, node, slot);
     };
 }
 export function devPrompt(modal, declaration, name) {
@@ -50,8 +50,7 @@ export function devPrompt(modal, declaration, name) {
                 target,
             });
             return portal;
-        })(node, {
-            ...input,
+        })(node, input, timeout, {
             resolve(data) {
                 if (inspector && target) {
                     inspector.eventTrigger({
@@ -64,7 +63,6 @@ export function devPrompt(modal, declaration, name) {
                         },
                     });
                 }
-                input.resolve(data);
             },
             reject(err) {
                 if (inspector && target) {
@@ -78,9 +76,8 @@ export function devPrompt(modal, declaration, name) {
                         },
                     });
                 }
-                input.reject(err);
             },
-        }, timeout);
+        });
     };
 }
 export function devMount(element, component, input, inspector) {

package/lib/index.js

@@ -15,11 +15,14 @@ function createPortal(node) {
     return portal;
 }
 export function modal(modal, create = createPortal) {
-    return function (props, node) {
+    return function (props, node, slot) {
         if (!node) {
             throw new Error("Vasille: Modal context is missing");
         }
         const portal = create(node);
+        if (!props.slot && slot) {
+            props.slot = slot;
+        }
         try {
             modal(portal, props);
         }
@@ -29,7 +32,7 @@ export function modal(modal, create = createPortal) {
     };
 }
 export function prompt(modal, create = createPortal) {
-    return function (node, input, timeout) {
+    return function (node, input, timeout, debugProps) {
         return new Promise((resolve, reject) => {
             const portal = create(node);
             const timer = timeout &&
@@ -46,10 +49,12 @@ export function prompt(modal, create = createPortal) {
                     ...input,
                     resolve(value) {
                         destroy();
+                        debugProps?.resolve(value);
                         resolve(value);
                     },
                     reject(error) {
                         destroy();
+                        debugProps?.reject(error);
                         reject(error);
                     },
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vasille-web",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "description": "The same framework which is designed to build bulletproof frontends.",
   "main": "index.js",
   "types": "./index.d.ts",
@@ -53,7 +53,7 @@
     "vasille": "^5.1.9",
     "vasille-context": "^5.0.0",
     "vasille-css": "^5.0.0",
-    "vasille-jsx": "^5.1.3",
+    "vasille-jsx": "^5.1.4",
     "vasille-router": "^5.0.0"
   },
   "devDependencies": {

package/types/dev.d.ts

@@ -3,7 +3,8 @@ import { TagOptions } from "vasille/web-runner";
 import { IDevRunner, Inspector, StaticPosition } from "vasille/dev";
 import { PromptProps } from "./index.js";
 import { WebRouterInitialization } from "vasille-router/web-router";
-export declare function devModal<T extends object>(modalFn: (node: Fragment<Node, Element, TagOptions>, input: T) => void, declaration: StaticPosition, name: string): (input: T, node: Fragment<Node, Element, TagOptions>, usage: StaticPosition | undefined) => void;
+import { CompositionProps } from "vasille-jsx";
+export declare function devModal<T extends CompositionProps>(modalFn: (node: Fragment<Node, Element, TagOptions>, input: T) => void, declaration: StaticPosition, name: string): (input: T, node: Fragment<Node, Element, TagOptions>, slot?: T["slot"], usage?: StaticPosition) => void;
 export declare function devPrompt<T extends PromptProps>(modal: (node: Fragment<Node, Element, TagOptions, IDevRunner<Node, Element, TagOptions>>, input: T) => void, declaration: StaticPosition, name: string): (node: Fragment<Node, Element, TagOptions, IDevRunner<Node, Element, TagOptions>>, input: T, timeout: number | undefined, usage: StaticPosition | undefined) => Promise<unknown>;
 export declare function devMount<T>(element: Element, component: ($: T) => void, input: T, inspector: Inspector): import("vasille").App<Node, Element, import("vasille/dev").DevTagOptions, import("vasille").Runner<Node, Element, import("vasille/dev").DevTagOptions>>;
 export declare function devRouterApp<Routes extends string>(init: WebRouterInitialization<Routes>, element: Element, inspector: Inspector): import("vasille").App<Node, Element, import("vasille/dev").DevTagOptions, import("vasille").Runner<Node, Element, import("vasille/dev").DevTagOptions>>;

package/types/index.d.ts

@@ -1,5 +1,6 @@
 import { App, Fragment, Portal } from "vasille";
 import { TagOptions } from "vasille/web-runner";
+import { CompositionProps } from "vasille-jsx";
 import { WebRouterInitialization } from "vasille-router/web-router";
 export { styleSheet } from "vasille-css";
 export type { RawStyleProps as StyleProps, StyleSheetProps } from "./spec/css.js";
@@ -10,11 +11,11 @@ export { type QueryParams, type ScreenProps, type RouteParameters, screen, scree
 export { Router, type WebRouterInitialization, type NavigationMode } from "vasille-router/web-router";
 export { setMobileMaxWidth, setTabletMaxWidth, setLaptopMaxWidth } from "vasille-css";
 export { context, impute, receive, share } from "vasille-context";
-export declare function modal<T extends object>(modal: (node: Fragment<Node, Element, TagOptions>, input: T) => void, create?: (node: Fragment<Node, Element, TagOptions>) => Portal<Node, Element, TagOptions>): (input: T, node: Fragment<Node, Element, TagOptions>) => void;
+export declare function modal<T extends CompositionProps>(modal: (node: Fragment<Node, Element, TagOptions>, input: T) => void, create?: (node: Fragment<Node, Element, TagOptions>) => Portal<Node, Element, TagOptions>): (input: T, node: Fragment<Node, Element, TagOptions>, slot?: T["slot"]) => void;
 export interface PromptProps {
     resolve(data: unknown): void;
     reject(err: unknown): void;
 }
-export declare function prompt<T extends PromptProps>(modal: (node: Fragment<Node, Element, TagOptions>, input: T) => void, create?: (node: Fragment<Node, Element, TagOptions>) => Portal<Node, Element, TagOptions>): (node: Fragment<Node, Element, TagOptions>, input: T, timeout?: number) => Promise<unknown>;
+export declare function prompt<T extends PromptProps>(modal: (node: Fragment<Node, Element, TagOptions>, input: T) => void, create?: (node: Fragment<Node, Element, TagOptions>) => Portal<Node, Element, TagOptions>): (node: Fragment<Node, Element, TagOptions>, input: T, timeout?: number, debugProps?: PromptProps) => Promise<unknown>;
 export declare function mount<T>(element: Element, component: ($: T) => void, input: T): App<Node, Element, TagOptions>;
 export declare function routerApp<Routes extends string>(init: WebRouterInitialization<Routes>, element?: Element): App<Node, Element, TagOptions>;