Skip to content
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.

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

Already on GitHub? Sign in to your account

Fix; Add support for extra droppable events #2

Merged
merged 1 commit into from
Jan 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Vue component of Shopify draggable.
npm:

```bash
npm install vue-shopify-draggable
npm install vue-shopify-draggable
# peer dependencies
npm install vue @shopify/draggable
```
Expand Down Expand Up @@ -211,7 +211,7 @@ Example
<div id="VueEl"></div>

<script type="text/template" id="VueTemplate">
<vue-droppable :options="options" @droppable:dropped="dropped">
<vue-droppable :options="options" @droppable:start="start" @droppable:dropped="dropped">
<vue-draggable-container>
<div class="dropzone draggable-dropzone--occupied"><div class="item">droppable-item1</div></div>
<div class="dropzone draggable-dropzone--occupied"><div class="item">droppable-item2</div></div>
Expand Down Expand Up @@ -245,6 +245,9 @@ Example
dropped: function (e) {
console.log(e);
},
start: function (e) {
console.log(e);
},
},
});
</script>
Expand Down
2 changes: 1 addition & 1 deletion src/droppable/Droppable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Droppable } from '@shopify/draggable';
import draggableMixin from '../draggable-mixin';

const events = ['droppable:dropped', 'droppable:returned'];
const events = ['droppable:start', 'droppable:dropped', 'droppable:returned', 'droppable:stop'];

export default {
name: 'VueDroppable',
Expand Down
84 changes: 84 additions & 0 deletions src/droppable/tests/Droppable.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,48 @@ describe('Droppable', () => {
});

describe('events', () => {
it('droppable:start', async () => {
const spy = jasmine.createSpy('droppable:start');
vueInstance = new Vue({
el,
template: `
<vue-droppable @droppable:start="func" :options="options" ref="droppable">
<vue-draggable-container>
<div class="dropzone draggable-dropzone--occupied" ref="dropzone1">
<div class="item" ref="item">
draggable-source-1
</div>
</div>
</vue-draggable-container>
<vue-draggable-container>
<div class="dropzone" ref="dropzone2"></div>
</vue-draggable-container>
</vue-droppable>
`,
data() {
return {
options: {
draggable: '.item',
dropzone: '.dropzone',
},
};
},
methods: {
func(e) {
expect(e.constructor.name).toBe(Droppable.DroppableStartEvent.name);
spy();
},
},
});

await drag({
from: vueInstance.$refs.item,
to: vueInstance.$refs.dropzone2,
});

expect(spy).toHaveBeenCalledTimes(1);
});

it('droppable:dropped', async () => {
const spy = jasmine.createSpy('droppable:dropped');
vueInstance = new Vue({
Expand Down Expand Up @@ -129,5 +171,47 @@ describe('Droppable', () => {

expect(spy).toHaveBeenCalledTimes(1);
});

it('droppable:stop', async () => {
const spy = jasmine.createSpy('droppable:stop');
vueInstance = new Vue({
el,
template: `
<vue-droppable @droppable:stop="func" :options="options" ref="droppable">
<vue-draggable-container>
<div class="dropzone draggable-dropzone--occupied" ref="dropzone1">
<div class="item" ref="item">
draggable-source-1
</div>
</div>
</vue-draggable-container>
<vue-draggable-container>
<div class="dropzone" ref="dropzone2"></div>
</vue-draggable-container>
</vue-droppable>
`,
data() {
return {
options: {
draggable: '.item',
dropzone: '.dropzone',
},
};
},
methods: {
func(e) {
expect(e.constructor.name).toBe(Droppable.DroppableStopEvent.name);
spy();
},
},
});

await drag({
from: vueInstance.$refs.item,
to: vueInstance.$refs.dropzone2,
});

expect(spy).toHaveBeenCalledTimes(1);
});
});
});