Skip to content

Commit 0dc2ea6

Browse files
committed
Make file list semantically correct
Signed-off-by: Louis Chemineau <louis@chmn.me>
1 parent 23f2c46 commit 0dc2ea6

19 files changed

+42
-36
lines changed

js/photos-main.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-main.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-c67b29.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_vue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-c67b29.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-public.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-public.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_components_Collection_CollectionContent_vue.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_components_Collection_CollectionContent_vue.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_mixins_AbortControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_mixins_AbortControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_views_AlbumContent_vue.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_views_AlbumContent_vue.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_views_Timeline_vue.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-src_views_Timeline_vue.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/FilesListViewer.vue

+15-9
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,21 @@
3535
:scroll-to-key="scrollToSection"
3636
@need-content="needContent">
3737
<ul slot-scope="{renderedRows}">
38-
<div v-for="row of renderedRows"
39-
:key="row.key"
40-
class="tiled-row"
41-
:class="{'files-list-viewer__section-header': row.items[0].sectionHeader}"
42-
:style="{height: `${row.height}px`}">
38+
<template v-for="row of renderedRows">
39+
<!--
40+
We are subtracting 1 from flex-basis to compensate for rounding issues.
41+
The flex algo will then compensate with flex-grow.
42+
-->
4343
<li v-for="item of row.items"
4444
:key="item.id"
45-
:style="{ width: item.ratio ? `${row.height * item.ratio}px` : '100%', height: `${row.height}px`}">
45+
:class="{'files-list-viewer__section-header': item.sectionHeader}"
46+
:style="{ 'flex-basis': item.ratio ? `${row.height * item.ratio - 1}px` : '100%', height: `${row.height}px`}">
4647
<!-- Placeholder when initial loading -->
4748
<div v-if="showPlaceholders" class="files-list-viewer__placeholder" />
4849
<!-- Real file. -->
4950
<slot v-else :file="item" :visibility="row.visibility" />
5051
</li>
51-
</div>
52+
</template>
5253
</ul>
5354
<NcLoadingIcon v-if="loading && !showPlaceholders" slot="loader" class="files-list-viewer__loader" />
5455
</VirtualScrolling>
@@ -280,9 +281,14 @@ export default {
280281

281282
.tiled-container {
282283
flex-basis: 0;
284+
}
285+
286+
ul {
287+
display: flex;
288+
flex-wrap: wrap;
283289

284-
.tiled-row {
285-
display: flex;
290+
li {
291+
flex-grow: 1;
286292
}
287293
}
288294

0 commit comments

Comments
 (0)