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:
@@ -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>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user