Skip to content

Commit

Permalink
refactor: ✏️ update types to qwik 1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
diecodev committed Apr 2, 2024
1 parent aa8eb67 commit 3be9392
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 22 deletions.
25 changes: 14 additions & 11 deletions src/utils/state.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { JSXNode } from "@builder.io/qwik";
import { JSXOutput } from "@builder.io/qwik";
import {
ExternalToast,
PromiseData,
Expand Down Expand Up @@ -27,10 +27,10 @@ export function createToastState() {

function create(
data: ExternalToast & {
message?: string | JSXNode;
message?: string | JSXOutput;
type?: ToastTypes;
promise?: PromiseT;
jsx?: JSXNode;
jsx?: JSXOutput;
}
) {
const { message, ...rest } = data;
Expand Down Expand Up @@ -92,27 +92,27 @@ export function createToastState() {
return id;
}

function message(message: string | JSXNode, data?: ExternalToast) {
function message(message: string | JSXOutput, data?: ExternalToast) {
return create({ ...data, message });
}

function error(message: string | JSXNode, data?: ExternalToast) {
function error(message: string | JSXOutput, data?: ExternalToast) {
return create({ ...data, type: "error", message });
}

function success(message: string | JSXNode, data?: ExternalToast) {
function success(message: string | JSXOutput, data?: ExternalToast) {
return create({ ...data, type: "success", message });
}

function info(message: string | JSXNode, data?: ExternalToast) {
function info(message: string | JSXOutput, data?: ExternalToast) {
return create({ ...data, type: "info", message });
}

function warning(message: string | JSXNode, data?: ExternalToast) {
function warning(message: string | JSXOutput, data?: ExternalToast) {
return create({ ...data, type: "warning", message });
}

function loading(message: string | JSXNode, data?: ExternalToast) {
function loading(message: string | JSXOutput, data?: ExternalToast) {
return create({ ...data, type: "loading", message });
}

Expand Down Expand Up @@ -171,7 +171,10 @@ export function createToastState() {
return id;
}

function custom(jsx: (id: number | string) => JSXNode, data?: ExternalToast) {
function custom(
jsx: (id: number | string) => JSXOutput,
data?: ExternalToast
) {
const id = data?.id || toastsCounter++;
create({ jsx: jsx(id), id, ...data });
return { id };
Expand Down Expand Up @@ -199,7 +202,7 @@ export function createToastState() {
export const toastState = createToastState();

// bind this to the toast function
function toastFunction(message: string | JSXNode, data?: ExternalToast) {
function toastFunction(message: string | JSXOutput, data?: ExternalToast) {
return toastState.create({
message,
...data,
Expand Down
20 changes: 10 additions & 10 deletions src/utils/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CSSProperties, JSXNode, PropsOf, QRL } from "@builder.io/qwik";
import type { CSSProperties, JSXOutput, PropsOf, QRL } from "@builder.io/qwik";

export type ToastTypes =
| "normal"
Expand All @@ -13,9 +13,9 @@ export type ToastTypes =
export type PromiseT<Data = any> = QRL<() => Promise<Data>>;

export type PromiseData<ToastData = any> = ExternalToast & {
loading?: string | JSXNode;
success?: string | JSXNode | QRL<(data: ToastData) => JSXNode | string>;
error?: string | JSXNode | ((error: any) => JSXNode | string);
loading?: string | JSXOutput;
success?: string | JSXOutput | QRL<(data: ToastData) => JSXOutput | string>;
error?: string | JSXOutput | ((error: any) => JSXOutput | string);
finally?: () => void | Promise<void>;
};

Expand All @@ -36,13 +36,13 @@ export interface ToastClassnames {

export interface ToastT {
id: number | string;
title?: string | JSXNode;
title?: string | JSXOutput;
type?: ToastTypes;
icon?: JSXNode;
jsx?: JSXNode;
icon?: JSXOutput;
jsx?: JSXOutput;
invert?: boolean;
dismissible?: boolean;
description?: string | JSXNode;
description?: string | JSXOutput;
duration?: number;
delete?: boolean;
important?: boolean;
Expand Down Expand Up @@ -105,7 +105,7 @@ export interface ToasterProps extends PropsOf<"ol"> {
style?: CSSProperties;
offset?: string | number;
dir?: "rtl" | "ltr" | "auto";
loadingIcon?: JSXNode;
loadingIcon?: JSXOutput;
containerAriaLabel?: string;
}

Expand Down Expand Up @@ -135,7 +135,7 @@ export interface ToastProps {
className?: string;
unstyled?: boolean;
descriptionClassName?: string;
loadingIcon?: JSXNode;
loadingIcon?: JSXOutput;
classNames?: ToastClassnames;
closeButtonAriaLabel?: string;
}
Expand Down
7 changes: 6 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
"skipLibCheck": true,
"incremental": true,
"isolatedModules": true,
"types": ["vite/client"]
"types": ["vite/client"],
"baseUrl": ".",
"paths": {
"@/*": ["src/*"]
},
"outDir": "lib",
},
"include": ["src"]
}

0 comments on commit 3be9392

Please sign in to comment.