@sqrzro/ui 4.0.0-alpha.22 → 4.0.0-alpha.25

package/dist/components/utility/Action/index.d.ts

@@ -4,7 +4,7 @@ export interface ActionProps<Data extends object | null = null> extends Omit<Act
     readonly label?: React.ReactNode;
     readonly render: (props: ActionComponentProps<Data>) => React.ReactElement;
 }
-export interface ActionComponentProps<Data extends object | null = null> extends Pick<ActionProps<Data>, 'href' | 'icon' | 'isDisabled' | 'isLoading' | 'isSubmittable' | 'onClick' | 'searchParams' | 'variant'> {
+export interface ActionComponentProps<Data extends object | null = null> extends Pick<ActionProps<Data>, 'action' | 'confirmable' | 'data' | 'href' | 'icon' | 'isDisabled' | 'isLoading' | 'isSubmittable' | 'onClick' | 'searchParams' | 'variant'> {
     children: React.ReactNode;
 }
 declare function Action<Data extends object | null = null>(props: ActionProps<Data>): React.ReactElement;

package/dist/components/utility/Page/index.d.ts

@@ -1,18 +1,19 @@
-import React from 'react';
 import type { NavigationObject } from '../../../navigation/interfaces';
 import type { NextPageProps } from '../../../utility/interfaces';
+type Fn = (params?: Promise<Record<string, string>> | null) => Promise<any>;
+type FnReturn<T extends Fn> = T extends (...args: any[]) => Promise<infer R> ? R : never;
 interface PageTemplateProps {
     children: React.ReactNode;
     tabs: NavigationObject[] | null;
     title: React.ReactNode;
 }
-export interface PageProps<T> {
-    readonly children: React.ReactNode | ((data: T) => React.ReactNode);
-    readonly fn?: (params?: Promise<Record<string, string>> | null) => Promise<T>;
+export type PageProps<T extends Fn | undefined = undefined> = {
+    readonly fn?: T;
+    readonly children: React.ReactNode | ((data: T extends Fn ? FnReturn<T> : null, pageProps?: NextPageProps) => React.ReactNode);
     readonly pageProps?: NextPageProps;
-    readonly tabs?: NavigationObject[] | ((data: T) => NavigationObject[] | null);
+    readonly tabs?: NavigationObject[] | ((data: T extends Fn ? FnReturn<T> : null, pageProps?: NextPageProps) => NavigationObject[] | null);
     readonly template?: (props: PageTemplateProps) => React.ReactElement;
-    readonly title?: React.ReactNode | ((data: T) => React.ReactNode);
-}
-declare function Page<T>(props: PageProps<T>): React.ReactElement;
+    readonly title?: React.ReactNode | ((data: T extends Fn ? FnReturn<T> : null, pageProps?: NextPageProps) => React.ReactNode);
+};
+declare function Page<T extends Fn | undefined = undefined>(props: PageProps<T>): import("react/jsx-runtime").JSX.Element;
 export default Page;

package/dist/components/utility/Page/index.js

@@ -1,30 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Suspense } from 'react';
-function getChildren(props, data) {
-    if (typeof props.children === 'function') {
-        return data ? props.children(data) : null;
-    }
-    return props.children;
-}
-function getTabs(props, data) {
-    if (typeof props.tabs === 'function') {
-        return data ? props.tabs(data) : null;
-    }
-    return props.tabs ?? null;
-}
-function getTitle(props, data) {
-    if (typeof props.title === 'function') {
-        return data ? props.title(data) : null;
-    }
-    return props.title;
-}
 async function PageComponent(props) {
     const data = props.fn ? await props.fn(props.pageProps?.params) : null;
-    const children = getChildren(props, data);
-    const tabs = getTabs(props, data);
-    const title = getTitle(props, data);
+    const children = typeof props.children === 'function'
+        ? props.children(data, props.pageProps)
+        : props.children;
+    const tabs = typeof props.tabs === 'function' ? props.tabs(data, props.pageProps) : props.tabs;
+    const title = typeof props.title === 'function' ? props.title(data, props.pageProps) : props.title;
     if (props.template) {
-        return props.template({ children, tabs, title });
+        return props.template({ children, tabs: tabs ?? null, title });
     }
     return children;
 }

package/dist/utility/interfaces.d.ts

@@ -1,3 +1,11 @@
+import type { NavigationObject } from '../navigation';
+export interface AppConfigObject {
+    app: {
+        name: string;
+        url: string;
+    };
+    navigation: NavigationObject[];
+}
 export interface ConfirmableObject {
     actions?: Omit<ActionObject, 'confirmable'>[];
     confirmText?: string;
@@ -33,6 +41,10 @@ export interface NextLayoutProps {
     children: React.ReactNode;
     params?: Promise<Record<string, string>> | null;
 }
+export interface AwaitedNextPageProps {
+    params?: Record<string, string> | null;
+    searchParams?: Record<string, string> | null;
+}
 export interface NextPageProps {
     params?: Promise<Record<string, string>> | null;
     searchParams?: Promise<Record<string, string>> | null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqrzro/ui",
   "type": "module",
-  "version": "4.0.0-alpha.22",
+  "version": "4.0.0-alpha.25",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "ISC",