Edit navbar.vue to add hover functionality

This commit is contained in:
Ozzy 2024-12-23 02:19:27 +10:30
parent c66b76f15e
commit e7c5b1cb0a

View file

@ -3,18 +3,28 @@ SPDX-FileCopyrightText: syuilo and misskey-project
SPDX-License-Identifier: AGPL-3.0-only
-->
<!--
SPDX-FileCopyrightText: syuilo and misskey-project
SPDX-License-Identifier: AGPL-3.0-only
-->
<template>
<div :class="[$style.root, { [$style.iconOnly]: iconOnly }]">
<div
:class="[$style.root, { [$style.iconOnly]: !isHovered }]"
@mouseover="handleMouseOver"
@mouseleave="handleMouseLeave"
>
<div :class="$style.body">
<div :class="$style.top">
<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }"></div>
<button v-tooltip.noDelay.right="instance.name ?? i18n.ts.instance" class="_button" :class="$style.instance" @click="openInstanceMenu">
<img :src="instance.sidebarLogoUrl && !iconOnly ? instance.sidebarLogoUrl : instance.iconUrl || '/apple-touch-icon.png'" alt="" :class="instance.sidebarLogoUrl && !iconOnly ? $style.wideInstanceIcon : $style.instanceIcon"/>
<img :src="instance.sidebarLogoUrl && isHovered ? instance.sidebarLogoUrl : instance.iconUrl || '/apple-touch-icon.png'" alt="" :class="instance.sidebarLogoUrl && isHovered ? $style.wideInstanceIcon : $style.instanceIcon"/>
</button>
</div>
<div :class="$style.middle">
<MkA v-tooltip.noDelay.right="i18n.ts.timeline" :class="$style.item" :activeClass="$style.active" to="/" exact>
<i :class="$style.itemIcon" class="ti ti-home ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.timeline }}</span>
<i :class="$style.itemIcon" class="ti ti-home ti-fw"></i>
<span v-if="isHovered" :class="$style.itemText">{{ i18n.ts.timeline }}</span>
</MkA>
<template v-for="item in menu">
<div v-if="item === '-'" :class="$style.divider"></div>
@ -28,7 +38,8 @@ SPDX-License-Identifier: AGPL-3.0-only
:to="navbarItemDef[item].to"
v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}"
>
<i class="ti-fw" :class="[$style.itemIcon, navbarItemDef[item].icon]"></i><span :class="$style.itemText">{{ navbarItemDef[item].title }}</span>
<i class="ti-fw" :class="[$style.itemIcon, navbarItemDef[item].icon]"></i>
<span v-if="isHovered" :class="$style.itemText">{{ navbarItemDef[item].title }}</span>
<span v-if="navbarItemDef[item].indicated" :class="$style.itemIndicator" class="_blink">
<span v-if="navbarItemDef[item].indicateValue" class="_indicateCounter" :class="$style.itemIndicateValueIcon">{{ navbarItemDef[item].indicateValue }}</span>
<i v-else class="_indicatorCircle"></i>
@ -37,599 +48,107 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<div :class="$style.divider"></div>
<MkA v-if="$i.isAdmin || $i.isModerator" v-tooltip.noDelay.right="i18n.ts.controlPanel" :class="$style.item" :activeClass="$style.active" to="/admin">
<i :class="$style.itemIcon" class="ti ti-dashboard ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.controlPanel }}</span>
<i :class="$style.itemIcon" class="ti ti-dashboard ti-fw"></i>
<span v-if="isHovered" :class="$style.itemText">{{ i18n.ts.controlPanel }}</span>
</MkA>
<button class="_button" :class="$style.item" @click="more">
<i :class="$style.itemIcon" class="ti ti-grid-dots ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.more }}</span>
<span v-if="otherMenuItemIndicated" :class="$style.itemIndicator" class="_blink"><i class="_indicatorCircle"></i></span>
<i :class="$style.itemIcon" class="ti ti-grid-dots ti-fw"></i>
<span v-if="isHovered" :class="$style.itemText">{{ i18n.ts.more }}</span>
<span v-if="otherMenuItemIndicated" :class="$style.itemIndicator" class="_blink">
<i class="_indicatorCircle"></i>
</span>
</button>
<MkA v-tooltip.noDelay.right="i18n.ts.settings" :class="$style.item" :activeClass="$style.active" to="/settings">
<i :class="$style.itemIcon" class="ti ti-settings ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.settings }}</span>
<i :class="$style.itemIcon" class="ti ti-settings ti-fw"></i>
<span v-if="isHovered" :class="$style.itemText">{{ i18n.ts.settings }}</span>
</MkA>
</div>
<div :class="$style.bottom">
<button v-tooltip.noDelay.right="i18n.ts.note" class="_button" :class="[$style.post]" data-cy-open-post-form @click="os.post">
<i class="ti ti-pencil ti-fw" :class="$style.postIcon"></i><span :class="$style.postText">{{ i18n.ts.note }}</span>
<i class="ti ti-pencil ti-fw" :class="$style.postIcon"></i>
<span v-if="isHovered" :class="$style.postText">{{ i18n.ts.note }}</span>
</button>
<button v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="_button" :class="[$style.account]" @click="openAccountMenu">
<MkAvatar :user="$i" :class="$style.avatar"/><MkAcct class="_nowrap" :class="$style.acct" :user="$i"/>
<MkAvatar :user="$i" :class="$style.avatar"/>
<MkAcct v-if="isHovered" class="_nowrap" :class="$style.acct" :user="$i"/>
</button>
</div>
</div>
<button v-if="!forceIconOnly" class="_button" :class="$style.toggleButton" @click="toggleIconOnly">
<!--
<svg viewBox="0 0 16 48" :class="$style.toggleButtonShape">
<g transform="matrix(0.333333,0,0,0.222222,0.000895785,13.3333)">
<path d="M23.935,-24C37.223,-24 47.995,-7.842 47.995,12.09C47.995,34.077 47.995,62.07 47.995,84.034C47.995,93.573 45.469,102.721 40.972,109.466C36.475,116.211 30.377,120 24.018,120L23.997,120C10.743,120 -0.003,136.118 -0.003,156C-0.003,156 -0.003,156 -0.003,156L-0.003,-60L-0.003,-59.901C-0.003,-50.379 2.519,-41.248 7.007,-34.515C11.496,-27.782 17.584,-24 23.931,-24C23.932,-24 23.934,-24 23.935,-24Z" style="fill:var(--MI_THEME-navBg);"/>
</g>
</svg>
-->
<svg viewBox="0 0 16 64" :class="$style.toggleButtonShape">
<g transform="matrix(0.333333,0,0,0.222222,0.000895785,21.3333)">
<path d="M47.488,7.995C47.79,10.11 47.943,12.266 47.943,14.429C47.997,26.989 47.997,84 47.997,84C47.997,84 44.018,118.246 23.997,133.5C-0.374,152.07 -0.003,192 -0.003,192L-0.003,-96C-0.003,-96 0.151,-56.216 23.997,-37.5C40.861,-24.265 46.043,-1.243 47.488,7.995Z" style="fill:var(--MI_THEME-navBg);"/>
</g>
</svg>
<i :class="'ti ' + `ti-chevron-${ iconOnly ? 'right' : 'left' }`" style="font-size: 12px; margin-left: -8px;"></i>
</button>
</div>
</template>
</div>
</template>
<script lang="ts" setup>
import { computed, defineAsyncComponent, ref, watch } from 'vue';
import { openInstanceMenu } from './common.js';
import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
<script lang="ts" setup>
import { ref, computed, defineAsyncComponent } from 'vue';
import { defaultStore } from '@/store.js';
import { openInstanceMenu } from './common.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { navbarItemDef } from '@/navbar.js';
import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
import * as os from '@/os.js';
const iconOnly = ref(false);
const isHovered = ref(false);
const menu = computed(() => defaultStore.state.menu);
const otherMenuItemIndicated = computed(() => {
function handleMouseOver() {
isHovered.value = true;
}
function handleMouseLeave() {
isHovered.value = false;
}
const menu = computed(() => defaultStore.state.menu);
const otherMenuItemIndicated = computed(() => {
for (const def in navbarItemDef) {
if (menu.value.includes(def)) continue;
if (navbarItemDef[def].indicated) return true;
}
return false;
});
const forceIconOnly = window.innerWidth <= 1279;
function calcViewState() {
iconOnly.value = forceIconOnly || (defaultStore.state.menuDisplay === 'sideIcon');
}
calcViewState();
window.addEventListener('resize', calcViewState);
watch(defaultStore.reactiveState.menuDisplay, () => {
calcViewState();
});
function toggleIconOnly() {
defaultStore.set('menuDisplay', iconOnly.value ? 'sideFull' : 'sideIcon');
}
function openAccountMenu(ev: MouseEvent) {
openAccountMenu_({
withExtraOperation: true,
}, ev);
}
function more(ev: MouseEvent) {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
src: ev.currentTarget ?? ev.target,
}, {
closed: () => dispose(),
});
}
</script>
<style lang="scss" module>
.root {
function openAccountMenu(ev: MouseEvent) {
openAccountMenu_({ withExtraOperation: true }, ev);
}
function more(ev: MouseEvent) {
const { dispose } = os.popup(
defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')),
{ src: ev.currentTarget ?? ev.target },
{ closed: () => dispose() }
);
}
</script>
<style lang="scss" module>
.root {
--nav-width: 250px;
--nav-icon-only-width: 80px;
--nav-bg-transparent: color(from var(--MI_THEME-navBg) srgb r g b / 0.5);
transition: width 0.3s ease;
flex: 0 0 var(--nav-width);
width: var(--nav-width);
box-sizing: border-box;
}
.body {
position: fixed;
top: 0;
left: 0;
z-index: 1001;
&.iconOnly {
width: var(--nav-icon-only-width);
height: 100dvh;
box-sizing: border-box;
overflow: auto;
overflow-x: clip;
overscroll-behavior: contain;
background: var(--MI_THEME-navBg);
contain: strict;
display: flex;
flex-direction: column;
direction: rtl; //
}
}
}
.top {
direction: ltr;
}
.middle {
direction: ltr;
}
.bottom {
direction: ltr;
}
.toggleButton {
position: fixed;
bottom: 20px;
left: var(--nav-width);
z-index: 1001;
width: 16px;
height: 64px;
box-sizing: border-box;
}
.toggleButtonShape {
position: absolute;
z-index: -1;
top: 0;
left: 0;
width: 16px;
height: 64px;
}
.root:not(.iconOnly) {
.body {
width: var(--nav-width);
}
.top {
position: sticky;
top: 0;
z-index: 1;
padding: 20px 0;
background: var(--nav-bg-transparent);
-webkit-backdrop-filter: var(--MI-blur, blur(8px));
backdrop-filter: var(--MI-blur, blur(8px));
}
.banner {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-size: cover;
background-position: center center;
-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%);
mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%);
}
.instance {
position: relative;
display: block;
text-align: center;
width: 100%;
&:focus-visible {
outline: none;
> .instanceIcon {
outline: 2px solid var(--MI_THEME-focus);
outline-offset: 2px;
}
}
}
.instanceIcon {
display: inline-block;
width: 38px;
aspect-ratio: 1;
}
.wideInstanceIcon {
display: inline-block;
min-width: 38px;
max-width: 100%;
max-height: 80px;
}
.bottom {
position: sticky;
bottom: 0;
padding-top: 20px;
background: var(--nav-bg-transparent);
-webkit-backdrop-filter: var(--MI-blur, blur(8px));
backdrop-filter: var(--MI-blur, blur(8px));
}
.post {
position: relative;
display: block;
width: 100%;
height: 40px;
color: var(--MI_THEME-fgOnAccent);
font-weight: bold;
text-align: left;
&::before {
content: "";
display: block;
width: calc(100% - 38px);
height: 100%;
margin: auto;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border-radius: var(--MI-radius-ellipse);
background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
}
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--MI_THEME-fgOnAccent);
outline-offset: -4px;
}
}
&:hover, &.active {
&::before {
background: var(--MI_THEME-accentLighten);
}
}
}
.postIcon {
position: relative;
margin-left: 30px;
margin-right: 8px;
width: 32px;
}
.postText {
position: relative;
}
.account {
position: relative;
display: flex;
align-items: center;
padding: 20px 0 20px 30px;
width: 100%;
text-align: left;
box-sizing: border-box;
overflow: clip;
&:focus-visible {
outline: none;
> .avatar {
box-shadow: 0 0 0 4px var(--MI_THEME-focus);
}
}
}
.avatar {
display: block;
flex-shrink: 0;
position: relative;
width: 32px;
aspect-ratio: 1;
margin-right: 8px;
transition: width 0.3s ease;
}
.itemText,
.acct {
display: block;
flex-shrink: 1;
padding-right: 8px;
}
transition: opacity 0.3s ease;
opacity: 1;
.middle {
flex: 1;
.root.iconOnly & {
opacity: 0;
}
.divider {
margin: 16px 16px;
border-top: solid 0.5px var(--MI_THEME-divider);
}
.item {
position: relative;
display: block;
padding-left: 30px;
line-height: 2.85rem;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 100%;
text-align: left;
box-sizing: border-box;
color: var(--MI_THEME-navFg);
&:hover {
text-decoration: none;
color: var(--MI_THEME-navHoverFg);
}
&.active {
color: var(--MI_THEME-navActive);
}
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--MI_THEME-focus);
outline-offset: -2px;
}
}
&:hover, &.active, &:focus {
color: var(--MI_THEME-accent);
&::before {
content: "";
display: block;
width: calc(100% - 34px);
height: 100%;
margin: auto;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border-radius: var(--MI-radius-ellipse);
background: var(--MI_THEME-accentedBg);
}
}
}
.itemIcon {
position: relative;
width: 32px;
margin-right: 8px;
}
.itemIndicator {
position: absolute;
top: 0;
left: 20px;
color: var(--MI_THEME-navIndicator);
font-size: 8px;
}
</style>
&:has(.itemIndicateValueIcon) {
animation: none;
left: auto;
right: 40px;
font-size: 10px;
}
}
.itemText {
position: relative;
font-size: 0.9em;
}
.toggleButton {
left: var(--nav-width);
}
}
.root.iconOnly {
flex: 0 0 var(--nav-icon-only-width);
width: var(--nav-icon-only-width);
.body {
width: var(--nav-icon-only-width);
}
.top {
position: sticky;
top: 0;
z-index: 1;
padding: 20px 0;
background: var(--nav-bg-transparent);
-webkit-backdrop-filter: var(--MI-blur, blur(8px));
backdrop-filter: var(--MI-blur, blur(8px));
}
.instance {
display: block;
text-align: center;
width: 100%;
&:focus-visible {
outline: none;
> .instanceIcon {
outline: 2px solid var(--MI_THEME-focus);
outline-offset: 2px;
}
}
}
.instanceIcon {
display: inline-block;
width: 30px;
aspect-ratio: 1;
}
.bottom {
position: sticky;
bottom: 0;
padding-top: 20px;
background: var(--nav-bg-transparent);
-webkit-backdrop-filter: var(--MI-blur, blur(8px));
backdrop-filter: var(--MI-blur, blur(8px));
}
.post {
display: block;
position: relative;
width: 100%;
height: 52px;
text-align: center;
&::before {
content: "";
display: block;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
width: 52px;
aspect-ratio: 1/1;
border-radius: var(--MI-radius-full);
background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
}
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--MI_THEME-fgOnAccent);
outline-offset: -4px;
}
}
&:hover, &.active {
&::before {
background: var(--MI_THEME-accentLighten);
}
}
}
.postIcon {
position: relative;
color: var(--MI_THEME-fgOnAccent);
}
.postText {
display: none;
}
.account {
display: block;
text-align: center;
padding: 20px 0;
width: 100%;
overflow: clip;
&:focus-visible {
outline: none;
> .avatar {
box-shadow: 0 0 0 4px var(--MI_THEME-focus);
}
}
}
.avatar {
display: inline-block;
width: 38px;
aspect-ratio: 1;
}
.acct {
display: none;
}
.middle {
flex: 1;
}
.divider {
margin: 8px auto;
width: calc(100% - 32px);
border-top: solid 0.5px var(--MI_THEME-divider);
}
.item {
display: block;
position: relative;
padding: 18px 0;
width: 100%;
text-align: center;
&:focus-visible {
outline: none;
&::before {
outline: 2px solid var(--MI_THEME-focus);
outline-offset: -2px;
}
}
&:hover, &.active, &:focus {
text-decoration: none;
color: var(--MI_THEME-accent);
&::before {
content: "";
display: block;
height: 100%;
aspect-ratio: 1;
margin: auto;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border-radius: var(--MI-radius-ellipse);
background: var(--MI_THEME-accentedBg);
}
> .icon,
> .text {
opacity: 1;
}
}
}
.itemIcon {
display: block;
margin: 0 auto;
opacity: 0.7;
}
.itemText {
display: none;
}
.itemIndicator {
position: absolute;
top: 6px;
left: 24px;
color: var(--MI_THEME-navIndicator);
font-size: 8px;
&:has(.itemIndicateValueIcon) {
animation: none;
top: 4px;
left: auto;
right: 4px;
font-size: 10px;
}
}
.toggleButton {
left: var(--nav-icon-only-width);
}
}
</style>