diff --git a/apps/files/src/components/BreadCrumbs.vue b/apps/files/src/components/BreadCrumbs.vue index c423b698d40d8..3569228dbde0f 100644 --- a/apps/files/src/components/BreadCrumbs.vue +++ b/apps/files/src/components/BreadCrumbs.vue @@ -14,7 +14,7 @@ v-bind="section" dir="auto" :to="section.to" - :force-icon-text="index === 0 && filesListWidth >= 486" + :force-icon-text="index === 0 && fileListWidth >= 486" :title="titleForSection(index, section)" :aria-description="ariaForSection(section)" @click.native="onClick(section.to)" @@ -46,15 +46,15 @@ import NcBreadcrumb from '@nextcloud/vue/dist/Components/NcBreadcrumb.js' import NcBreadcrumbs from '@nextcloud/vue/dist/Components/NcBreadcrumbs.js' import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js' -import { useNavigation } from '../composables/useNavigation' -import { onDropInternalFiles, dataTransferToFileTree, onDropExternalFiles } from '../services/DropService' +import { useNavigation } from '../composables/useNavigation.ts' +import { onDropInternalFiles, dataTransferToFileTree, onDropExternalFiles } from '../services/DropService.ts' +import { useFileListWidth } from '../composables/useFileListWidth.ts' import { showError } from '@nextcloud/dialogs' import { useDragAndDropStore } from '../store/dragging.ts' import { useFilesStore } from '../store/files.ts' import { usePathsStore } from '../store/paths.ts' import { useSelectionStore } from '../store/selection.ts' import { useUploaderStore } from '../store/uploader.ts' -import filesListWidthMixin from '../mixins/filesListWidth.ts' import logger from '../logger' export default defineComponent({ @@ -66,10 +66,6 @@ export default defineComponent({ NcIconSvgWrapper, }, - mixins: [ - filesListWidthMixin, - ], - props: { path: { type: String, @@ -83,6 +79,7 @@ export default defineComponent({ const pathsStore = usePathsStore() const selectionStore = useSelectionStore() const uploaderStore = useUploaderStore() + const fileListWidth = useFileListWidth() const { currentView, views } = useNavigation() return { @@ -93,6 +90,7 @@ export default defineComponent({ uploaderStore, currentView, + fileListWidth, views, } }, @@ -129,7 +127,7 @@ export default defineComponent({ wrapUploadProgressBar(): boolean { // if an upload is ongoing, and on small screens / mobile, then // show the progress bar for the upload below breadcrumbs - return this.isUploadInProgress && this.filesListWidth < 512 + return this.isUploadInProgress && this.fileListWidth < 512 }, // used to show the views icon for the first breadcrumb diff --git a/apps/files/src/components/FilesListTableHeaderActions.vue b/apps/files/src/components/FilesListTableHeaderActions.vue index fa5f7d4bd5f63..9f5724dc80f94 100644 --- a/apps/files/src/components/FilesListTableHeaderActions.vue +++ b/apps/files/src/components/FilesListTableHeaderActions.vue @@ -43,10 +43,10 @@ import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js' import { useRouteParameters } from '../composables/useRouteParameters.ts' +import { useFileListWidth } from '../composables/useFileListWidth.ts' import { useActionsMenuStore } from '../store/actionsmenu.ts' import { useFilesStore } from '../store/files.ts' import { useSelectionStore } from '../store/selection.ts' -import filesListWidthMixin from '../mixins/filesListWidth.ts' import logger from '../logger.ts' // The registered actions list @@ -62,10 +62,6 @@ export default defineComponent({ NcLoadingIcon, }, - mixins: [ - filesListWidthMixin, - ], - props: { currentView: { type: Object as PropType, @@ -81,10 +77,12 @@ export default defineComponent({ const actionsMenuStore = useActionsMenuStore() const filesStore = useFilesStore() const selectionStore = useSelectionStore() + const fileListWidth = useFileListWidth() const { directory } = useRouteParameters() return { directory, + fileListWidth, actionsMenuStore, filesStore, @@ -126,13 +124,13 @@ export default defineComponent({ }, inlineActions() { - if (this.filesListWidth < 512) { + if (this.fileListWidth < 512) { return 0 } - if (this.filesListWidth < 768) { + if (this.fileListWidth < 768) { return 1 } - if (this.filesListWidth < 1024) { + if (this.fileListWidth < 1024) { return 2 } return 3 diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index 95bd0f6c5719c..d9d63bec53312 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -12,7 +12,7 @@ isMtimeAvailable, isSizeAvailable, nodes, - filesListWidth, + fileListWidth, }" :scroll-to-index="scrollToIndex" :caption="caption"> @@ -39,7 +39,7 @@