Skip to content

Commit

Permalink
Merge pull request #1101 from nextcloud-libraries/fix/migrate-dialog-…
Browse files Browse the repository at this point in the history
…component-to-lib

fix: Use `NcDialog` instead of custom dialog component now that it is upstreamed
  • Loading branch information
susnux authored Nov 7, 2023
2 parents f9202ea + 628b148 commit fb8dca1
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 316 deletions.
233 changes: 0 additions & 233 deletions lib/components/DialogBase.vue

This file was deleted.

35 changes: 0 additions & 35 deletions lib/components/DialogButton.vue

This file was deleted.

7 changes: 3 additions & 4 deletions lib/components/FilePicker/FilePicker.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DialogBase v-bind="dialogProps" @close="emit('close')">
<NcDialog v-bind="dialogProps" @close="emit('close')">
<template #navigation="{ isCollapsed }">
<FilePickerNavigation :is-collapsed="isCollapsed" :current-view.sync="currentView" :filter-string.sync="filterString" />
</template>
Expand Down Expand Up @@ -41,22 +41,21 @@
</template>
</NcEmptyContent>
</div>
</DialogBase>
</NcDialog>
</template>

<script setup lang="ts">
import type { IFilePickerButton, IFilePickerButtonFactory, IFilePickerFilter } from '../types'
import type { Node } from '@nextcloud/files'
import IconFile from 'vue-material-design-icons/File.vue'
import DialogBase from '../DialogBase.vue'
import FileList from './FileList.vue'
import FilePickerBreadcrumbs from './FilePickerBreadcrumbs.vue'
import FilePickerNavigation from './FilePickerNavigation.vue'
import { emit as emitOnEventBus } from '@nextcloud/event-bus'
import { davRootPath } from '@nextcloud/files'
import { NcEmptyContent } from '@nextcloud/vue'
import { NcDialog, NcEmptyContent } from '@nextcloud/vue'
import { join } from 'path'
import { computed, onMounted, ref, toRef } from 'vue'
import { showError } from '../../toast'
Expand Down
1 change: 1 addition & 0 deletions lib/components/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import type { AsyncComponent, Component } from 'vue'

/**
* Interface for defining buttons passed to the Dialog component
* See NcDialogButton
*/
export interface IDialogButton {
/** Label of the button */
Expand Down
Loading

0 comments on commit fb8dca1

Please sign in to comment.