Skip to content

fix(app): persist project edit metadata #24745

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

Open
kzekiue wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −6
Open

fix(app): persist project edit metadata #24745

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion packages/app/src/context/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,11 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
const metadata = projectID
? globalSync.data.project.find((x) => x.id === projectID)
: globalSync.data.project.find((x) => x.worktree === project.worktree)
const local = !metadata || metadata.id === "global" ? childStore.projectMeta : undefined
const icon = local?.icon ? { ...metadata?.icon, ...local.icon } : metadata?.icon
const commands = local?.commands ? { ...metadata?.commands, ...local.commands } : metadata?.commands

return { ...metadata, ...project }
return { ...metadata, ...local, ...project, icon, commands }
}

const roots = createMemo(() => {
Expand Down
9 changes: 4 additions & 5 deletions packages/ui/src/components/avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,23 @@ export function Avatar(props: AvatarProps) {
"classList",
"style",
])
const src = split.src // did this so i can zero it out to test fallback
return (
<div
{...rest}
data-component="avatar"
data-size={split.size || "normal"}
data-has-image={src ? "" : undefined}
data-has-image={split.src ? "" : undefined}
classList={{
...split.classList,
[split.class ?? ""]: !!split.class,
}}
style={{
...(typeof split.style === "object" ? split.style : {}),
...(!src && split.background ? { "--avatar-bg": split.background } : {}),
...(!src && split.foreground ? { "--avatar-fg": split.foreground } : {}),
...(!split.src && split.background ? { "--avatar-bg": split.background } : {}),
...(!split.src && split.foreground ? { "--avatar-fg": split.foreground } : {}),
}}
>
<Show when={src} fallback={first(split.fallback)}>
<Show when={split.src} fallback={first(split.fallback)}>
{(src) => <img src={src()} draggable={false} data-slot="avatar-image" />}
</Show>
</div>
Expand Down
Loading