lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Merge pull request #211 from samuelthomas2774/vue-transition 

Use Vue’s transition element to transition between menu panels
This commit is contained in:
Alexei Stukov 2018-08-10 02:34:25 +03:00 committed by GitHub
parent 87a2db1745 387227cc1f
commit 4c6805510d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/styles/partials/bdsettings/sidebarview.scss
View File

@ -122,6 +122,9 @@
}
}
&.bd-stop .bd-sidebar-region {
z-index: 3004;
}
&.bd-stop .bd-content-region {
z-index: 3003;
}

37
client/src/styles/partials/sidebarview/content.scss
View File

@ -5,27 +5,28 @@
flex-grow: 1;
backface-visibility: hidden;
> div {
> * {
display: flex;
flex-direction: column;
flex-grow: 1;
}
> div:not(.active) {
opacity: 0;
position: absolute;
left: 310px;
right: 0;
// width: 100%;
height: 100%;
pointer-events: none;
}
}
.bd-content {
animation: bd-fade-in .4s forwards;
.animating {
animation: bd-fade-out .4s forwards;
&.bd-contentcolumn-enter-active,
&.bd-contentcolumn-leave-active {
transition: opacity 0.4s ease;
}
&.bd-contentcolumn-enter-to {
opacity: 1;
}
&.bd-contentcolumn-leave-to {
opacity: 0;
}
&.bd-contentcolumn-leave-active {
position: absolute;
width: 590px;
pointer-events: none;
}
}
}

18
client/src/ui/bdui.js
View File

@ -46,22 +46,16 @@ export default class {
DOM.createElement('div', null, 'bd-toasts').appendTo(DOM.bdToasts);
DOM.createElement('bd-tooltips').appendTo(DOM.bdBody);
this.toasts = new Vue({
el: '#bd-toasts',
components: { BdToasts },
template: '<BdToasts />'
this.toasts = new (Vue.extend(BdToasts))({
el: '#bd-toasts'
});
this.modals = new Vue({
el: '#bd-modals',
components: { BdModals },
template: '<BdModals />'
this.modals = new (Vue.extend(BdModals))({
el: '#bd-modals'
});
this.vueInstance = new Vue({
el: '#bd-settings',
components: { BdSettingsWrapper },
template: '<BdSettingsWrapper />'
this.vueInstance = new (Vue.extend(BdSettingsWrapper))({
el: '#bd-settings'
});
return this.vueInstance;

94
client/src/ui/components/BdSettings.vue
View File

@ -9,8 +9,8 @@
*/
<template>
<div class="bd-settings" :class="{active: active, 'bd-settings-out': activeIndex === -1 && lastActiveIndex >= 0}" @keyup="$emit('close')">
<SidebarView :contentVisible="this.activeIndex >= 0 || this.lastActiveIndex >= 0" :animating="this.animating" :class="{'bd-stop': !first}">
<div class="bd-settings" :class="{active, 'bd-settings-out': !item && animating}" @keyup="$emit('close')">
<SidebarView :contentVisible="item" :animating="animating" :class="{'bd-stop': item}">
<Sidebar slot="sidebar">
<div class="bd-settings-x" @click="$emit('close')">
<MiClose size="17"/>
@ -18,9 +18,10 @@
</div>
<template v-for="(category, text) in sidebar">
<SidebarItem :item="{text, type: 'header'}" />
<SidebarItem v-for="item in category" :item="item" :key="item.id" @click="itemOnClick(item.id)" />
<SidebarItem v-for="i in category" :key="i.id" :item="i" :active="item && i.id === item.id" @click="itemOnClick(i.id)" />
</template>
</Sidebar>
<div slot="sidebarfooter" class="bd-info">
<span class="bd-vtext">v2.0.0a by Jiiks/JsSucks</span>
<div @click="openGithub" v-tooltip="'GitHub'" class="bd-material-button">
@ -33,25 +34,28 @@
<MiWeb size="16" />
</div>
</div>
<ContentColumn slot="content">
<div v-for="item in sidebarItems" v-if="activeContent(item.contentid) || animatingContent(item.contentid)" :class="{active: activeContent(item.contentid), animating: animatingContent(item.contentid)}">
<template v-if="item.component">
<component :is="item.component" :SettingsWrapper="SettingsWrapper" />
</template>
<transition name="bd-contentcolumn" @before-enter="animating++" @after-enter="animating--" @enter-cancelled="animating--" @before-leave="animating++" @after-leave="animating--" @leave-cancelled="animating--">
<div v-if="item" :key="item.id">
<template v-if="item.component">
<component :is="item.component" :SettingsWrapper="SettingsWrapper" />
</template>
<SettingsWrapper v-if="typeof item.set === 'string'" :headertext="Settings.getSet(item.set).headertext">
<SettingsPanel :settings="Settings.getSet(item.set)" :schemes="Settings.getSet(item.set).schemes" />
</SettingsWrapper>
<SettingsWrapper v-else-if="item.set" :headertext="item.set.headertext">
<SettingsPanel :settings="item.set" :schemes="item.set.schemes" />
</SettingsWrapper>
<SettingsWrapper v-else-if="typeof item.set === 'string'" :headertext="Settings.getSet(item.set).headertext">
<SettingsPanel :settings="Settings.getSet(item.set)" :schemes="Settings.getSet(item.set).schemes" />
</SettingsWrapper>
<SettingsWrapper v-else-if="item.set" :headertext="item.set.headertext">
<SettingsPanel :settings="item.set" :schemes="item.set.schemes" />
</SettingsWrapper>
<ConnectivityView v-if="item.contentid === 'connectivity'"/>
<CssEditorView v-if="item.contentid === 'css'" />
<PluginsView v-if="item.contentid === 'plugins'" />
<ThemesView v-if="item.contentid === 'themes'" />
<UpdaterView v-if="item.contentid === 'updater'" />
</div>
<ConnectivityView v-else-if="item.contentid === 'connectivity'" />
<CssEditorView v-else-if="item.contentid === 'css'" />
<PluginsView v-else-if="item.contentid === 'plugins'" />
<ThemesView v-else-if="item.contentid === 'themes'" />
<UpdaterView v-else-if="item.contentid === 'updater'" />
</div>
</transition>
</ContentColumn>
</SidebarView>
</div>
@ -69,13 +73,10 @@
export default {
data() {
return {
BdMenuItems,
activeIndex: -1,
lastActiveIndex: -1,
animating: false,
first: true,
animating: 0,
item: null,
items: BdMenuItems.items,
Settings,
timeout: null,
SettingsWrapper,
openMenuHandler: null
};
@ -87,12 +88,9 @@
MiGithubCircle, MiWeb, MiClose, MiTwitterCircle
},
computed: {
sidebarItems() {
return this.BdMenuItems.items;
},
sidebar() {
const categories = {};
for (let item of this.sidebarItems) {
for (let item of this.items) {
if (item.hidden) continue;
const category = categories[item.category] || (categories[item.category] = []);
category.push(item);
@ -102,42 +100,10 @@
},
methods: {
itemOnClick(id) {
if (this.animating || id === this.activeIndex) return;
const activeItem = this.sidebarItems.find(item => item.id === this.activeIndex);
if (activeItem) activeItem.active = false;
this.sidebarItems.find(item => item.id === id).active = true;
this.animating = true;
this.lastActiveIndex = this.activeIndex;
this.activeIndex = id;
if (this.timeout) clearTimeout(this.timeout);
this.timeout = setTimeout(() => {
this.first = false;
this.animating = false;
this.lastActiveIndex = -1;
this.timeout = null;
}, 400);
},
activeContent(s) {
const item = this.sidebarItems.find(item => item.contentid === s);
return item && item.id === this.activeIndex;
},
animatingContent(s) {
const item = this.sidebarItems.find(item => item.contentid === s);
return item && item.id === this.lastActiveIndex;
this.item = this.items.find(item => item.id === id);
},
closeContent() {
if (this.activeIndex >= 0) this.sidebarItems.find(item => item.id === this.activeIndex).active = false;
this.first = true;
this.lastActiveIndex = this.activeIndex;
this.activeIndex = -1;
if (this.timeout) clearTimeout(this.timeout);
this.timeout = setTimeout(() => {
this.animating = false;
this.lastActiveIndex = -1;
this.timeout = null;
}, 400);
this.item = null;
},
openGithub() {
shell.openExternal('https://github.com/JsSucks/BetterDiscordApp');
@ -156,7 +122,7 @@
}
},
created() {
Events.on('bd-open-menu', this.openMenuHandler = item => item && this.itemOnClick(this.sidebarItems.find(i => i === item || i.id === item || i.contentid === item || i.set === item).id));
Events.on('bd-open-menu', this.openMenuHandler = item => item && this.itemOnClick(this.items.find(i => i === item || i.id === item || i.contentid === item || i.set === item).id));
},
destroyed() {
if (this.openMenuHandler) Events.off('bd-open-menu', this.openMenuHandler);

4
client/src/ui/components/sidebar/Button.vue
View File

@ -9,13 +9,13 @@
*/
<template>
<div class="bd-item" :class="{active: item.active}" @click="$emit('click', item.id)">
<div class="bd-item" :class="{active}" @click="$emit('click', item.id)">
{{item.text}}
</div>
</template>
<script>
export default {
props: ['item']
props: ['item', 'active']
}
</script>

4
client/src/ui/components/sidebar/Item.vue
View File

@ -9,7 +9,7 @@
*/
<template>
<SidebarButton v-if="item._type === 'button'" :item="item" @click="$emit('click', $event)" />
<SidebarButton v-if="item._type === 'button'" :item="item" :active="active" @click="$emit('click', $event)" />
<SidebarHeader v-else :item="item" />
</template>
@ -18,7 +18,7 @@
import { SidebarHeader, SidebarButton } from './';
export default {
props: ['item'],
props: ['item', 'active'],
components: {
SidebarHeader,
SidebarButton