Skip to content

fix: resolve height overflow issues in AssetEditor sidebar #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zuhanit merged 1 commit into from
Jun 20, 2025
Merged

fix: resolve height overflow issues in AssetEditor sidebar #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 58 additions & 70 deletions frontend/components/core/asset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import { useAsseEditortStore } from "@/store/assetEditorStore";
import {
Sidebar,
SidebarContent,
SidebarFooter,
SidebarGroup,
SidebarHeader,
SidebarProvider,
} from "../ui/sidebar";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
import { ReactNode, useEffect, useState } from "react";
Expand All @@ -14,7 +13,7 @@ import { Button } from "../ui/button";
import { UsemapEditor } from "./usemap-editor";
import { useUsemapStore } from "@/components/pages/editor-page";
import { Toolbar } from "../ui/toolbar";
import { Save, X } from "lucide-react";
import { X } from "lucide-react";
import { Resizable } from "re-resizable";
import { useDraggableAsset } from "@/hooks/useDraggableAsset";
import { Asset } from "@/types/asset";
Expand Down Expand Up @@ -77,19 +76,6 @@ export function AssetEditor() {
setActivatedAsset(nextActivatedAsset);
};

const onClickSave = () => {
if (!activatedAsset) return;

// updateUsemap((draft: any) => {
// let target = draft;
// for (let i = 0; i < activatedAsset.path.length - 1; i++) {
// target = target[activatedAsset.path[i]];
// }
// target[activatedAsset.path[activatedAsset.path.length - 1]] =
// activatedAsset.properties;
// });
};

return (
<div
ref={setNodeRef}
Expand All @@ -109,62 +95,64 @@ export function AssetEditor() {
}}
minWidth={800}
minHeight={800}
className="flex flex-col"
>
<Sidebar>
<Toolbar
className="border-b border-text-muted"
{...listeners}
{...attributes}
>
<span className="absolute left-1/2 -translate-x-1/2 text-center text-lg font-medium">
Asset Editor
</span>
<div className="ml-auto flex items-center">
<Button variant="ghost" onClick={closeEditor}>
<X />
</Button>
</div>
</Toolbar>
<Tabs defaultValue={activatedAsset.name} className="w-full">
<SidebarHeader>
<TabsList>
{assets.map((asset) => (
<div key={asset.name} className="flex items-center gap-2">
<TabsTrigger
value={asset.name}
onClick={() => setActivatedAsset(asset)}
>
{asset.name}
</TabsTrigger>
<button onClick={() => onClickClose(asset)}>
<X />
</button>
</div>
))}
</TabsList>
</SidebarHeader>
<SidebarContent>
<SidebarGroup>
{assets.map((asset) => (
<TabsContent
className="flex"
key={asset.name}
value={asset.name}
>
<UsemapEditor kind="assets" asset={asset} />
<AssetEditorImage asset={asset} />
</TabsContent>
))}
</SidebarGroup>
</SidebarContent>
</Tabs>
<SidebarFooter>
<Button variant="ghost" onClick={onClickSave}>
<Save />
Save
<Toolbar
className="border-b border-text-muted"
{...listeners}
{...attributes}
>
<span className="absolute left-1/2 -translate-x-1/2 text-center text-lg font-medium">
Asset Editor
</span>
<div className="ml-auto flex items-center">
<Button variant="ghost" onClick={closeEditor}>
<X />
</Button>
</SidebarFooter>
</Sidebar>
</div>
</Toolbar>
<Tabs
defaultValue={activatedAsset.name}
className="flex flex-1 flex-col"
>
<TabsList>
{assets.map((asset) => (
<div key={asset.name} className="flex items-center gap-2">
<TabsTrigger
value={asset.name}
onClick={() => setActivatedAsset(asset)}
>
{asset.name}
</TabsTrigger>
<button onClick={() => onClickClose(asset)}>
<X />
</button>
</div>
))}
</TabsList>
<div className="flex h-full">
<SidebarProvider>
<Sidebar variant="floating">
<SidebarContent>
<SidebarGroup>
{assets.map((asset) => (
<TabsContent
className="flex h-0 min-h-0"
key={asset.name}
value={asset.name}
>
<UsemapEditor kind="assets" asset={asset} />
</TabsContent>
))}
</SidebarGroup>
</SidebarContent>
</Sidebar>
</SidebarProvider>
<div className="flex-1">
<AssetEditorImage asset={activatedAsset} />
</div>
</div>
</Tabs>
</Resizable>
</div>
);
Expand Down