From c3e07d792abf6e81e09ba6205e87e33a4ef7c8ee Mon Sep 17 00:00:00 2001
From: Noel Simbolon <84700640+noelsimbolon@users.noreply.github.com>
Date: Fri, 17 Nov 2023 11:48:44 +0700
Subject: [PATCH] fix: TS error in utils
---
src/lib/utils.ts | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index df89bdd..c10ddbc 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,13 +1,28 @@
-import { type ClassValue, clsx } from "clsx"
-import { twMerge } from "tailwind-merge"
+import { type ClassValue, clsx } from "clsx";
+import { twMerge } from "tailwind-merge";
import flattenDeep from "lodash.flattendeep";
-
+import React from "react";
+
export function cn(...inputs: ClassValue[]) {
- return twMerge(clsx(inputs))
+ return twMerge(clsx(inputs));
+}
+
+interface Route {
+ name: string;
+ title: string;
+ hasSiderLink?: boolean;
+ routes?: Route[];
+ component?: React.ComponentType<any>;
+ path?: string;
+ isPublic?: boolean;
}
-export const generateFlattenRoutes = (routes) => {
+export const generateFlattenRoutes = (routes: Route[] | undefined): Route[] => {
if (!routes) return [];
- return flattenDeep(routes.map(({ routes: subRoutes, ...rest }) => [rest, generateFlattenRoutes(subRoutes)]));
+ return flattenDeep(
+ routes.map(({ routes: subRoutes, ...rest }) => [
+ rest,
+ generateFlattenRoutes(subRoutes),
+ ]),
+ );
};
-
--
GitLab