Skip to content

Commit fb8dca1

Browse files
authored
Merge pull request #1101 from nextcloud-libraries/fix/migrate-dialog-component-to-lib
fix: Use `NcDialog` instead of custom dialog component now that it is upstreamed
2 parents f9202ea + 628b148 commit fb8dca1

File tree

6 files changed

+39
-316
lines changed

6 files changed

+39
-316
lines changed

lib/components/DialogBase.vue

Lines changed: 0 additions & 233 deletions
This file was deleted.

lib/components/DialogButton.vue

Lines changed: 0 additions & 35 deletions
This file was deleted.

lib/components/FilePicker/FilePicker.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<DialogBase v-bind="dialogProps" @close="emit('close')">
2+
<NcDialog v-bind="dialogProps" @close="emit('close')">
33
<template #navigation="{ isCollapsed }">
44
<FilePickerNavigation :is-collapsed="isCollapsed" :current-view.sync="currentView" :filter-string.sync="filterString" />
55
</template>
@@ -41,22 +41,21 @@
4141
</template>
4242
</NcEmptyContent>
4343
</div>
44-
</DialogBase>
44+
</NcDialog>
4545
</template>
4646

4747
<script setup lang="ts">
4848
import type { IFilePickerButton, IFilePickerButtonFactory, IFilePickerFilter } from '../types'
4949
import type { Node } from '@nextcloud/files'
5050
5151
import IconFile from 'vue-material-design-icons/File.vue'
52-
import DialogBase from '../DialogBase.vue'
5352
import FileList from './FileList.vue'
5453
import FilePickerBreadcrumbs from './FilePickerBreadcrumbs.vue'
5554
import FilePickerNavigation from './FilePickerNavigation.vue'
5655
5756
import { emit as emitOnEventBus } from '@nextcloud/event-bus'
5857
import { davRootPath } from '@nextcloud/files'
59-
import { NcEmptyContent } from '@nextcloud/vue'
58+
import { NcDialog, NcEmptyContent } from '@nextcloud/vue'
6059
import { join } from 'path'
6160
import { computed, onMounted, ref, toRef } from 'vue'
6261
import { showError } from '../../toast'

lib/components/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import type { AsyncComponent, Component } from 'vue'
2525

2626
/**
2727
* Interface for defining buttons passed to the Dialog component
28+
* See NcDialogButton
2829
*/
2930
export interface IDialogButton {
3031
/** Label of the button */

0 commit comments

Comments
 (0)