Skip to content
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
11 changes: 9 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{
"presets": ["@babel/preset-env"]
}
"presets": [
[
"@babel/preset-env",
{
"exclude": ["@babel/plugin-transform-regenerator"]
}
]
]
}
3 changes: 0 additions & 3 deletions .browserslistrc

This file was deleted.

10 changes: 9 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# default
dist
types/**/*.d.ts
docs

# docs
docs/.nuxt
docs/docs
docs/static

# example
example/dist
26 changes: 6 additions & 20 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
module.exports = {
root: true,
env: {
node: true
node: true,
jest: true,
es2020: true
},
extends: [
'plugin:vue/vue3-essential',
'plugin:vue/vue3-strongly-recommended',
'plugin:vue/vue3-recommended',
'@vue/prettier'
],
parserOptions: {
parser: 'babel-eslint'
parser: 'babel-eslint',
sourceType: 'module'
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)'
],
env: {
jest: true
}
}
]
}
}
2 changes: 1 addition & 1 deletion .prettierrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ printWidth: 120
tabWidth: 2
semi: false
singleQuote: true
# trailingComma: 'es5'
trailingComma: 'none'
# bracketSpacing: true
arrowParens: 'avoid'
2 changes: 1 addition & 1 deletion dist/VueFinalModal.esm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueFinalModal.esm.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueFinalModal.umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueFinalModal.umd.js.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions docs/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: ['plugin:vue/essential', 'plugin:vue/strongly-recommended', 'eslint:recommended', '@vue/prettier']
}
2 changes: 1 addition & 1 deletion docs/components/examples/basic/BasicOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@confirm="showModal = false"
@cancel="showModal = false"
>
<template v-slot:title># Hello, world!</template>
<template #title># Hello, world!</template>
<p>
Lorem Ipsum is simply dummy text of the printing and typesetting industry.
</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/components/examples/basic/BasicPlainStyleCodepen.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<iframe
height="600"
style="width: 100%;"
style="width: 100%"
scrolling="no"
title="Plain style - Vue Final Modal"
src="https://codepen.io/hunterliu1003/embed/ZEWoYeE?height=265&theme-id=dark&default-tab=js,result"
Expand Down
8 changes: 3 additions & 5 deletions docs/components/examples/basic/VAccessibility.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<template>
<div>
<v-modal v-model="show" @confirm="show = false" @cancel="show = false" focus-trap>
<template v-slot:title>Hello, vue-final-modal</template>
<p>
Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.
</p>
<v-modal v-model="show" focus-trap @confirm="show = false" @cancel="show = false">
<template #title>Hello, vue-final-modal</template>
<p>Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.</p>
</v-modal>

<button class="vfm-btn" @click="show = true">Open modal</button>
Expand Down
8 changes: 3 additions & 5 deletions docs/components/examples/basic/VApiShow.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<template>
<div>
<v-modal v-model="showModal" name="VApiShow" @confirm="showModal = false" @cancel="showModal = false">
<template v-slot="{ params }"> Hi {{ params.userName }} </template>
<template v-slot:title>$vfm.show</template>
<template #default="{ params }"> Hi {{ params.userName }} </template>
<template #title>$vfm.show</template>
</v-modal>
<button class="vfm-btn" @click="$vfm.show('VApiShow', { userName: 'vue-final-modal' })">
Open modal
</button>
<button class="vfm-btn" @click="$vfm.show('VApiShow', { userName: 'vue-final-modal' })">Open modal</button>
</div>
</template>

Expand Down
4 changes: 1 addition & 3 deletions docs/components/examples/basic/VCloseButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
</button>
<span class="modal__title">Hello, vue-final-modal</span>
<div class="modal__content">
<p>
Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.
</p>
<p>Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.</p>
</div>
</vue-final-modal>
<button class="vfm-btn" @click="showModal = true">Open modal</button>
Expand Down
4 changes: 1 addition & 3 deletions docs/components/examples/basic/VContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
<vue-final-modal v-model="showModal" classes="modal-container" content-class="modal-content">
<span class="modal__title">Hello, vue-final-modal</span>
<div class="modal__content">
<p>
Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.
</p>
<p>Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.</p>
</div>
</vue-final-modal>
<button class="vfm-btn" @click="showModal = true">Open modal</button>
Expand Down
4 changes: 2 additions & 2 deletions docs/components/examples/basic/VDynamicAdvanced.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</template>

<script>
import VContent from '../VContent.vue'
import VDescription from '../VDescription.vue'

export default {
methods: {
Expand Down Expand Up @@ -48,7 +48,7 @@ export default {
}
},
default: {
component: VContent,
component: VDescription,
bind: {
content: 'Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.'
}
Expand Down
4 changes: 1 addition & 3 deletions docs/components/examples/basic/VDynamicModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
</button>
<span class="modal__title">Hello, vue-final-modal</span>
<div class="modal__content">
<p>
Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.
</p>
<p>Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.</p>
</div>
</vue-final-modal>
</template>
Expand Down
2 changes: 1 addition & 1 deletion docs/components/examples/basic/VEvents.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@closed="closed"
@cancel="showModal = false"
>
<template v-slot:title>Events Example!</template>
<template #title>Events Example!</template>
</v-modal>
<button class="vfm-btn" @click="showModal = true">Open modal</button>
</div>
Expand Down
26 changes: 7 additions & 19 deletions docs/components/examples/basic/VParams.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
prevent-click
@closed="e => e.stop()"
>
<template v-slot="{ params }">
<template #default="{ params }">
<button class="modal__close" @click="$vfm.hide('stackable')">
<mdi-close></mdi-close>
</button>
Expand All @@ -19,27 +19,15 @@
</p>
</div>
<div class="modal__action">
<button class="vfm-btn" @click="$vfm.hide('stackable')">
confirm
</button>
<button class="vfm-btn" @click="$vfm.hide('stackable')">
cancel
</button>
<button class="vfm-btn" @click="$vfm.hide('stackable')">confirm</button>
<button class="vfm-btn" @click="$vfm.hide('stackable')">cancel</button>
</div>
</template>
</vue-final-modal>
<button class="vfm-btn" @click="$vfm.show('stackable', { test: 123 })">
Show modal with params
</button>
<button class="vfm-btn" @click="$vfm.toggle('stackable', null, { test: 321 })">
Toggle modal with params
</button>
<button class="vfm-btn" @click="$vfm.show('stackable')">
Show modal
</button>
<button class="vfm-btn" @click="$vfm.hide('stackable')">
Hide modal
</button>
<button class="vfm-btn" @click="$vfm.show('stackable', { test: 123 })">Show modal with params</button>
<button class="vfm-btn" @click="$vfm.toggle('stackable', null, { test: 321 })">Toggle modal with params</button>
<button class="vfm-btn" @click="$vfm.show('stackable')">Show modal</button>
<button class="vfm-btn" @click="$vfm.hide('stackable')">Hide modal</button>
</div>
</template>

Expand Down
16 changes: 4 additions & 12 deletions docs/components/examples/basic/VStackable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
</div>
<div class="modal__action">
<span>Try click →&nbsp;&nbsp;&nbsp;&nbsp;</span>
<button class="vfm-btn" @click="showConfirmModal = true">
confirm
</button>
<button class="vfm-btn" @click="showConfirmModal = true">confirm</button>
<button class="vfm-btn" @click="showModal = false">cancel</button>
</div>
</vue-final-modal>
Expand All @@ -26,16 +24,10 @@
<mdi-close></mdi-close>
</button>
<span class="modal__title">Confirm</span>
<div class="modal__content">
Confirm to submit.
</div>
<div class="modal__content">Confirm to submit.</div>
<div class="modal__action">
<button class="vfm-btn" @click="confirm">
confirm
</button>
<button class="vfm-btn" @click="showConfirmModal = false">
cancel
</button>
<button class="vfm-btn" @click="confirm">confirm</button>
<button class="vfm-btn" @click="showConfirmModal = false">cancel</button>
</div>
</vue-final-modal>

Expand Down
8 changes: 2 additions & 6 deletions docs/components/examples/basic/VStopBeforeClose.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@
</p>
</div>
<div class="modal__action">
<button class="vfm-btn" @click="showModal = false">
confirm
</button>
<button class="vfm-btn" @click="showModal = false">
cancel
</button>
<button class="vfm-btn" @click="showModal = false">confirm</button>
<button class="vfm-btn" @click="showModal = false">cancel</button>
</div>
</vue-final-modal>
<button class="vfm-btn" @click="showModal = true">Open modal</button>
Expand Down
8 changes: 2 additions & 6 deletions docs/components/examples/basic/VStopBeforeOpen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@
</p>
</div>
<div class="modal__action">
<button class="vfm-btn" @click="showModal = false">
confirm
</button>
<button class="vfm-btn" @click="showModal = false">
cancel
</button>
<button class="vfm-btn" @click="showModal = false">confirm</button>
<button class="vfm-btn" @click="showModal = false">cancel</button>
</div>
</vue-final-modal>
<button class="vfm-btn" @click="showModal = true">Open modal</button>
Expand Down
6 changes: 2 additions & 4 deletions docs/components/examples/hoc/HocExample.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<template>
<div>
<v-modal v-model="show" @confirm="confirm" @cancel="cancel">
<template v-slot:title>Hello, vue-final-modal</template>
<p>
Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.
</p>
<template #title>Hello, vue-final-modal</template>
<p>Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.</p>
</v-modal>

<button class="vfm-btn" @click="show = true">Open modal</button>
Expand Down
6 changes: 2 additions & 4 deletions docs/components/examples/hoc/HocExampleTailwind.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<template>
<div>
<v-tailwind-modal v-model="show" @confirm="confirm" @cancel="cancel">
<template v-slot:title>Hello, vue-final-modal</template>
<p>
Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.
</p>
<template #title>Hello, vue-final-modal</template>
<p>Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.</p>
</v-tailwind-modal>

<button class="vfm-btn" @click="show = true">Open modal</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'leave-class': 'translate-y-0'
}"
>
<template v-slot:title>Hello, vue-final-modal</template>
<template #title>Hello, vue-final-modal</template>
<p>
Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.
</p>
Expand Down
12 changes: 4 additions & 8 deletions docs/components/examples/hoc/VModal.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
<template>
<vue-final-modal v-bind="$attrs" classes="modal-container" content-class="modal-content" v-on="$listeners">
<template v-slot="{ params }">
<template #default="{ params }">
<span class="modal__title">
<slot name="title"></slot>
</span>
<div class="modal__content">
<slot v-bind:params="params"></slot>
<slot :params="params"></slot>
</div>
<div class="modal__action">
<button class="vfm-btn" @click="$emit('confirm', close)">
confirm
</button>
<button class="vfm-btn" @click="$emit('cancel', close)">
cancel
</button>
<button class="vfm-btn" @click="$emit('confirm', close)">confirm</button>
<button class="vfm-btn" @click="$emit('cancel', close)">cancel</button>
</div>
<button class="modal__close" @click="close">
<mdi-close></mdi-close>
Expand Down
4 changes: 2 additions & 2 deletions docs/components/examples/hoc/VTailwindModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
content-class="relative flex flex-col max-h-full mx-4 p-4 border dark:border-gray-800 rounded bg-white dark:bg-gray-900"
v-on="$listeners"
>
<template v-slot="{ params }">
<template #default="{ params }">
<span class="mr-8 text-2xl font-bold ">
<slot name="title"></slot>
</span>
<div class="flex-grow overflow-y-auto">
<slot v-bind:params="params"></slot>
<slot :params="params"></slot>
</div>
<div class="flex-shrink-0 flex justify-center items-center pt-4">
<button class="vfm-btn" @click="$emit('confirm', close)">
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"generate": "nuxt generate"
},
"dependencies": {
"@nuxt/content-theme-docs": "^0.10.0",
"@nuxt/content-theme-docs": "0.10.0",
"nuxt": "^2.14.12",
"vue-final-modal": "^2.1.0"
},
Expand Down
Loading