Skip to content

Commit

Permalink
Merge pull request #43222 from nextcloud/backport/43172/stable28
Browse files Browse the repository at this point in the history
[stable28] fix(files): selected files actions position on scroll/with readme block
  • Loading branch information
susnux authored Feb 3, 2024
2 parents 7a7f6c8 + 4b8f25c commit 8bf8074
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
15 changes: 11 additions & 4 deletions apps/files/src/components/FilesListVirtual.vue
Original file line number Diff line number Diff line change
Expand Up @@ -339,14 +339,21 @@ export default defineComponent({

.files-list__table {
display: block;

&.files-list__table--with-thead-overlay {
// Hide the table header below the overlay
margin-top: calc(-1 * var(--row-height));
}
}

.files-list__thead-overlay {
position: absolute;
// Pinned on top when scrolling
position: sticky;
top: 0;
left: var(--row-height); // Save space for a row checkbox
right: 0;
z-index: 1000;
// Save space for a row checkbox
margin-left: var(--row-height);
// More than .files-list__thead
z-index: 20;

display: flex;
align-items: center;
Expand Down
10 changes: 5 additions & 5 deletions apps/files/src/components/VirtualList.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<template>
<div class="files-list" data-cy-files-list>
<div v-if="!!$scopedSlots['header-overlay']" class="files-list__thead-overlay">
<slot name="header-overlay" />
</div>

<!-- Header -->
<div ref="before" class="files-list__before">
<slot name="before" />
</div>

<table class="files-list__table">
<div v-if="!!$scopedSlots['header-overlay']" class="files-list__thead-overlay">
<slot name="header-overlay" />
</div>

<table class="files-list__table" :class="{ 'files-list__table--with-thead-overlay': !!$scopedSlots['header-overlay'] }">
<!-- Accessibility table caption for screen readers -->
<caption v-if="caption" class="hidden-visually">
{{ caption }}
Expand Down
4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

0 comments on commit 8bf8074

Please sign in to comment.