Update i18n settings and upgrade dependencies in lockfile

This commit refactors the i18n settings in `i18n.settings.ts` to improve language handling. In addition, it updates the `pnpm-lock.yaml` file to upgrade the lockfile version and several package dependencies. Most notably, it integrates `tailwind-merge` and `@tanstack/react-table` into various packages.
This commit is contained in:
giancarlo
2024-04-20 13:17:38 +08:00
parent 6ff82ec5ef
commit 8281de12a0
34 changed files with 8128 additions and 6138 deletions

View File

@@ -175,7 +175,7 @@ export function SidebarItem({
<If condition={collapsed} fallback={Icon}>
<TooltipProvider>
<Tooltip>
<TooltipTrigger>{Icon}</TooltipTrigger>
<TooltipTrigger asChild>{Icon}</TooltipTrigger>
<TooltipContent side={'right'} sideOffset={20}>
{children}
@@ -184,13 +184,7 @@ export function SidebarItem({
</TooltipProvider>
</If>
<span
className={cn({
hidden: collapsed,
})}
>
{children}
</span>
<span className={cn({ hidden: collapsed })}>{children}</span>
</Button>
</Link>
);