Skip to content

fix(studio): prevent mixing active files between media and content pages #63

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
merged 2 commits into from
Nov 6, 2025
Merged

fix(studio): prevent mixing active files between media and content pages #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
784000a
fix(studio): prevent mixing active files between media and content pages
farnabaz Nov 6, 2025
8535de2
expose trees from useStudio and remove keepalive
larbish Nov 6, 2025
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
20 changes: 8 additions & 12 deletions src/app/src/app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,10 @@ router.beforeEach((to, from) => {
leave-from-class="translate-y-0"
leave-to-class="-translate-y-full"
>
<KeepAlive>
<component
:is="Component"
class="w-full h-full"
/>
</KeepAlive>
<component
:is="Component"
class="w-full h-full"
/>
</Transition>
<Transition
v-else
Expand All @@ -108,12 +106,10 @@ router.beforeEach((to, from) => {
leave-from-class="translate-x-0"
:leave-to-class="direction === 'right' ? '-translate-x-full' : 'translate-x-full'"
>
<KeepAlive>
<component
:is="Component"
class="w-full h-full"
/>
</KeepAlive>
<component
:is="Component"
class="w-full h-full"
/>
</Transition>
</RouterView>
</AppLayout>
Expand Down
1 change: 1 addition & 0 deletions src/app/src/composables/useStudio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export const useStudio = createSharedComposable(() => {
git,
ui,
context,
documentTree,
mediaTree,
}
})
Expand Down
12 changes: 6 additions & 6 deletions src/app/src/pages/content.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { computed } from 'vue'
import { useStudio } from '../composables/useStudio'
import { StudioItemActionId, TreeStatus, StudioFeature } from '../types'

const { context } = useStudio()
const { context, documentTree } = useStudio()

const folderTree = computed(() => (context.activeTree.value.current.value || []).filter(f => f.type === 'directory'))
const fileTree = computed(() => (context.activeTree.value.current.value || []).filter(f => f.type === 'file'))
const folderTree = computed(() => (documentTree.current.value || []).filter(f => f.type === 'directory'))
const fileTree = computed(() => (documentTree.current.value || []).filter(f => f.type === 'file'))

const currentTreeItem = computed(() => context.activeTree.value.currentItem.value)
const currentDraftItem = computed(() => context.activeTree.value.draft.current.value)
const currentTreeItem = computed(() => documentTree.currentItem.value)
const currentDraftItem = computed(() => documentTree.draft.current.value)

const showFolderForm = computed(() => {
return context.actionInProgress.value?.id === StudioItemActionId.CreateDocumentFolder
Expand All @@ -36,7 +36,7 @@ const showFileForm = computed(() => {

<div class="flex-1 relative">
<div
v-if="context.activeTree.value.draft.isLoading.value"
v-if="documentTree.draft.isLoading.value"
class="absolute inset-0 bg-primary/3 animate-pulse z-10 pointer-events-none"
/>
<template v-else>
Expand Down
12 changes: 6 additions & 6 deletions src/app/src/pages/media.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { computed, ref } from 'vue'
import { useStudio } from '../composables/useStudio'
import { StudioItemActionId, StudioFeature } from '../types'

const { context } = useStudio()
const { context, mediaTree } = useStudio()
const isUploading = ref(false)

const folderTree = computed(() => (context.activeTree.value.current.value || []).filter(f => f.type === 'directory'))
const fileTree = computed(() => (context.activeTree.value.current.value || []).filter(f => f.type === 'file' && !f.fsPath.endsWith('.gitkeep')))
const folderTree = computed(() => (mediaTree.current.value || []).filter(f => f.type === 'directory'))
const fileTree = computed(() => (mediaTree.current.value || []).filter(f => f.type === 'file' && !f.fsPath.endsWith('.gitkeep')))

const currentTreeItem = computed(() => context.activeTree.value.currentItem.value)
const currentDraftItem = computed(() => context.activeTree.value.draft.current.value)
const currentTreeItem = computed(() => mediaTree.currentItem.value)
const currentDraftItem = computed(() => mediaTree.draft.current.value)

const showFolderForm = computed(() => {
return context.actionInProgress.value?.id === StudioItemActionId.CreateMediaFolder
Expand Down Expand Up @@ -56,7 +56,7 @@ async function onFileDrop(event: DragEvent) {

<div class="flex-1 relative">
<div
v-if="context.activeTree.value.draft.isLoading.value"
v-if="mediaTree.draft.isLoading.value"
class="absolute inset-0 bg-primary/3 animate-pulse pointer-events-none"
/>

Expand Down
Loading