Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions packages/web-pkg/src/components/FilesList/ResourceTiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ import {
useGetMatchingSpace,
embedModeFilePickMessageData,
routeToContextQuery,
useRouter
useRouter,
useSideBar
} from '../../composables'
import { useInterceptModifierClick } from '../../composables/keyboardActions'
import { SizeType } from '@opencloud-eu/design-system/helpers'
Expand Down Expand Up @@ -267,6 +268,7 @@ const viewSizeMax = useViewSizeMax()
const viewSizeCurrent = computed(() => {
return Math.min(unref(viewSizeMax), viewSize)
})
const { isSideBarOpen } = useSideBar()

// Disable lazy loading during E2E tests to avoid having to scroll in tests
const areTilesLazy = (window as any).__E2E__ === true ? false : lazy
Expand Down Expand Up @@ -654,14 +656,19 @@ const isResourceInDeleteQueue = (id: string): boolean => {

watch(
tileSizePixels,
(px: number) => {
document.documentElement.style.setProperty(`--oc-size-tiles-actual`, `${px}px`)
(px: number | undefined) => {
if (px && !isNaN(px)) {
document.documentElement.style.setProperty(`--oc-size-tiles-actual`, `${px}px`)
}
},
{ immediate: true }
)
watch(maxTilesAll, (all) => {
viewSizeMax.value = Math.max(all.length, 1)
})
watch(isSideBarOpen, () => {
updateViewWidth()
})

onMounted(() => {
window.addEventListener('resize', updateViewWidth)
Expand Down
2 changes: 2 additions & 0 deletions packages/web-pkg/src/composables/sideBar/useSideBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ interface SideBarOptions {
bus?: EventBus
}

// FIXME: this should be global store to avoid registering multiple event listeners on the same topics
// https://github.com/opencloud-eu/web/issues/1397
export const useSideBar = (options?: SideBarOptions): SideBarResult => {
const { isEnabled: isEmbedModeEnabled } = useEmbedMode()
const eventBus = options?.bus || defaultEventBus
Expand Down