Skip to content

feat(vue3): remove vue-autosize and replace vue-dndrop with vuedraggable #13413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GretaD wants to merge 1 commit into
base: vue3
Choose a base branch
from
Open

feat(vue3): remove vue-autosize and replace vue-dndrop with vuedraggable #13413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@
"uuid": "^14.0.1",
"v-tooltip": "^2.1.3",
"vue": "^2.7.16",
"vue-autosize": "^1.0.2",
"vue-dndrop": "^1.3.4",
"vuedraggable": "^4.1.0",
"vue-frag": "^1.4.3",
"vue-material-design-icons": "^5.3.1",
"vue-router": "^3.6.5",
Expand Down
4 changes: 0 additions & 4 deletions src/components/Composer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,6 @@ import trimStart from 'lodash/fp/trimCharsStart.js'
import uniqBy from 'lodash/fp/uniqBy.js'
import mitt from 'mitt'
import { mapState, mapStores } from 'pinia'
import Vue from 'vue'
import Autosize from 'vue-autosize'
import { NcReferencePickerModal } from '@nextcloud/vue/components/NcRichText'
import ChevronLeft from 'vue-material-design-icons/ChevronLeft.vue'
import IconFolder from 'vue-material-design-icons/FolderOutline.vue'
Expand Down Expand Up @@ -549,8 +547,6 @@ const debouncedSearch = debouncePromise(findRecipient, 500)

const NO_ALIAS_SET = -1

Vue.use(Autosize)

export default {
name: 'Composer',
components: {
Expand Down
50 changes: 27 additions & 23 deletions src/components/quickActions/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,25 @@
<div class="modal-content">
<NcTextField v-model="localAction.name" :label="t('mail', 'Quick action name')" />
<h3>{{ t('mail', 'Do the following actions') }}</h3>
<Container @onDrop="onDrop">
<Draggable
v-for="item in actions"
:key="item.id"
class="modal-content__action"
:drag-not-allowed="item.name === 'deleteThread' || item.name === 'moveThread'">
<Action
:action="item"
:account="account"
:draggable="item.name !== 'deleteThread' && item.name !== 'moveThread'"
@update="(payload) => updateAction(payload, item)"
@delete="deleteAction(item)" />
</Draggable>
</Container>
<VueDraggable
v-model="actions"
item-key="order"
filter=".drag-not-allowed"
:prevent-on-filter="true"
@end="onReorder">
<template #item="{ element: item }">
<div
class="modal-content__action"
:class="{ 'drag-not-allowed': item.name === 'deleteThread' || item.name === 'moveThread' }">
<Action
:action="item"
:account="account"
:draggable="item.name !== 'deleteThread' && item.name !== 'moveThread'"
@update="(payload) => updateAction(payload, item)"
@delete="deleteAction(item)" />
</div>
</template>
</VueDraggable>
<NcActions :menu-name="t('mail', 'Add another action')">
<template #icon>
<PlusIcon :size="20" />
Expand Down Expand Up @@ -119,7 +124,7 @@
<script>
import { showError, showSuccess } from '@nextcloud/dialogs'
import { NcActionButton, NcActions, NcButton, NcListItem, NcLoadingIcon, NcModal, NcTextField } from '@nextcloud/vue'
import { Container, Draggable } from 'vue-dndrop'
import VueDraggable from 'vuedraggable'
import AlertOctagonIcon from 'vue-material-design-icons/AlertOctagonOutline.vue'
import IconEmailFast from 'vue-material-design-icons/EmailFastOutline.vue'
import EmailRead from 'vue-material-design-icons/EmailOpenOutline.vue'
Expand Down Expand Up @@ -149,8 +154,7 @@ export default {
IconEdit,
Action,
IconEmailFast,
Container,
Draggable,
VueDraggable,
AlertOctagonIcon,
TagIcon,
OpenInNewIcon,
Expand Down Expand Up @@ -336,14 +340,14 @@ export default {
this.actions.splice(index, 1, updated)
},

onDrop(e) {
const { removedIndex, addedIndex } = e
if (this.deletionAndMovingDisabled && (addedIndex === this.actions.length - 1 || removedIndex === this.actions.length - 1)) {
onReorder(e) {
// Prevent moving to/from the protected last position when delete/move actions are present
if (this.deletionAndMovingDisabled
&& (e.newIndex === this.actions.length - 1 || e.oldIndex === this.actions.length - 1)) {
const item = this.actions.splice(e.newIndex, 1)[0]
this.actions.splice(e.oldIndex, 0, item)
return
}
const movedItem = this.actions[removedIndex]
this.actions.splice(removedIndex, 1)
this.actions.splice(addedIndex, 0, movedItem)
this.actions = this.actions.map((action, index) => ({ ...action, order: index + 1 }))
},

Expand Down
Loading