Skip to content

custom class back for better openess #82

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
26 changes: 20 additions & 6 deletions src/plugin/components/dialog-window.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<template>
<div :class="options.customClass">
<div :class="customClass.rootClass">
<transition name="dg-backdrop" appear @after-leave="animationEnded('backdrop')">
<div v-if="show" class="dg-backdrop"></div>
</transition>

<transition :name="animation" @after-leave="animationEnded('content')" appear>
<div v-if="show" :class="['dg-container', {'dg-container--has-input': (isHardConfirm || isPrompt)}]" @click="closeAtOutsideClick" >
<div class="dg-content-cont dg-content-cont--floating">
<div class="dg-main-content" @click.stop>
<div v-if="show" :class="['dg-container', customClass.containerClass, {'dg-container--has-input': (isHardConfirm || isPrompt)}]" @click="closeAtOutsideClick" >
<div :class="['dg-content-cont', 'dg-content-cont--floating', customClass.contentClass]">
<div :class="['dg-main-content', customClass.mainContent]" @click.stop>
<component :is="dialogView" :options="options" @close="close"></component>
</div>
</div>
Expand All @@ -18,14 +18,15 @@

<script>
import DefaultView from './views/default-view.vue'
import {DIALOG_TYPES, ANIMATION_TYPES, CONFIRM_TYPES} from '../js/constants'
import {DIALOG_TYPES, ANIMATION_TYPES, CONFIRM_TYPES, CUSTOM_CLASS} from '../js/constants'

export default {
data: function () {
return {
show: true,
closed: false,
endedAnimations: []
endedAnimations: [],
customClass: Object.assign({}, CUSTOM_CLASS),
}
},
props: {
Expand Down Expand Up @@ -111,8 +112,21 @@
this.options.promiseRejecter(false)
this.$emit('close', this.options.id)
}
},
setCustomClasses(){
if (this.options.hasOwnProperty('customClass')) {
Object.keys(this.options.customClass).forEach(prop => {
if (!Object.keys(CUSTOM_CLASS).includes(prop)) {
console.warn(`[WARNING]: Custom class name "${prop}" could not be found!`)
}
});
}
this.customClass = Object.assign(this.customClass, this.options.customClass);
}
},
mounted () {
this.setCustomClasses()
},
beforeDestroy(){
if(this.closed === false){
this.cancelBtnDisabled ? this.proceed() : this.cancel()
Expand Down
19 changes: 12 additions & 7 deletions src/plugin/js/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@ export const ANIMATION_TYPES = {
}

export const CLASS_TYPES = {
MAIN_CONTENT: 'mainContent',
BODY: 'body',
TITLE: 'title',
FOOTER: 'footer',
OK_BTN: 'okBtn',
CANCEL_BTN: 'cancelBtn'
ROOT_CLASS: 'rootClass',
CONTAINER_CLASS: 'containerClass',
CONTENT_CLASS: 'contentClass',
MAIN_CONTENT: 'mainContent'
}

export const CUSTOM_CLASS = {
[CLASS_TYPES.ROOT_CLASS] : '',
[CLASS_TYPES.CONTAINER_CLASS] : '',
[CLASS_TYPES.CONTENT_CLASS] : '',
[CLASS_TYPES.MAIN_CONTENT] : ''
}

export const DEFAULT_OPTIONS = {
Expand All @@ -39,7 +44,7 @@ export const DEFAULT_OPTIONS = {
message : 'Proceed with the request?',
clicksCount : 3,
animation : 'zoom',
customClass : '',
customClass : CUSTOM_CLASS,
verification : 'continue',
verificationHelp : 'Type "[+:verification]" below to confirm',
promptHelp : 'Type in the box below and click "[+:okText]"'
Expand Down