natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements

This commit is contained in:
Freeplay 2023-02-17 15:39:30 -05:00
parent eac3699bd2 b654add6b3
commit c644a08d39
2 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "calckey",
"version": "13.2.0-dev9",
"version": "13.2.0-dev10",
"codename": "aqua",
"repository": {
"type": "git",

69
packages/client/src/components/global/MkPageHeader.vue
View File

@ -1,34 +1,33 @@
<template>
<div ref="el" class="fdidabkb" :class="classes" :style="{ background: bg }" @click="onClick">
<div v-show="narrow" class="buttons left" @click="openAccountMenu">
<MkAvatar v-if="displayMyAvatar && user" class="avatar" :user="user" :disable-preview="true"/>
<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
<div v-if="narrow" class="buttons left" @click="openAccountMenu">
<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
</div>
<template v-if="hasTabs">
<div v-show="!hideTitle" class="titleContainer" @click="showTabsPopup">
<template v-if="metadata">
<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/>
<i v-else-if="metadata.icon && !narrow" class="icon" :class="metadata.icon"></i>
<div class="title">
<MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
<div v-else-if="metadata.title && !hasTabs && !narrow" class="title">{{ metadata.title }}</div>
<div v-show="!narrow && metadata.subtitle" class="subtitle">{{ metadata.subtitle }}</div>
<div v-else-if="metadata.title && !(tabs != null && tabs.length > 0 && narrow)" class="title">{{ metadata.title }}</div>
<div v-if="!narrow && metadata.subtitle" class="subtitle">
{{ metadata.subtitle }}
</div>
</div>
<div ref="tabsEl" class="tabs" v-show="hasTabs">
<button v-for="tab in tabs" :key="tab.key" ref="tabRefs[tab.key]" v-tooltip.noDelay="tab.title"
class="tab _button" :class="{ active: isActiveTab(tab) }" @mousedown="onTabMousedown(tab)"
@click="onTabClick(tab)">
<i v-if="tab.icon && !tab.iconOnly" class="icon" :class="tab.icon"></i>
</div>
<div ref="tabsEl" v-if="hasTabs" class="tabs">
<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
<span class="title">{{ tab.title }}</span>
</button>
<div ref="tabHighlightEl" class="highlight"></div>
</div>
</template>
<div v-show="hasActions" class="buttons right">
<button v-for="(action, index) in actions" :key="index" v-tooltip.noDelay="action.text"
class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler"
@touchstart="preventDrag">
<i :class="action.icon"></i>
</button>
<div class="buttons right">
<template v-for="action in actions">
<button v-tooltip.noDelay="action.text" class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
</template>
</div>
</div>
</template>
@ -145,35 +144,35 @@ onMounted(() => {
calcBg();
globalEvents.on('themeChanged', calcBg);
watch(() => [props.tab, props.tabs], () => {
const updateTabHighlight = () => {
nextTick(() => {
const tabEl = tabRefs[props.tab];
if (tabEl && tabHighlightEl) {
// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
tabEl.style = `--width: ${tabSizeX}px`;
setTimeout(() => {
const tabSizeX = tabEl.scrollWidth + 20;
tabEl.style.setProperty('--width', `${tabSizeX}px`);
const parentRect = tabsEl.getBoundingClientRect();
const rect = tabEl.getBoundingClientRect();
const left = (rect.left - parentRect.left + tabsEl?.scrollLeft);
tabHighlightEl.style.width = tabSizeX + 'px';
const left = (rect.left - parentRect.left + tabsEl.scrollLeft);
tabHighlightEl.style.width = `${tabSizeX}px`;
tabHighlightEl.style.transform = `translateX(${left}px)`;
window.requestAnimationFrame(() => {
tabsEl?.scrollTo({left: left - 60, behavior: "smooth"});
})
}, 200);
tabsEl.scrollTo({left: left - 60, behavior: "smooth"});
}
});
}, {
immediate: true,
});
};
const updateTab = () => {
emit('update:tab', props.tab);
};
watch(() => [props.tab, props.tabs], updateTabHighlight, { immediate: true });
watch(() => props.tab, updateTab);
if (el && el.parentElement) {
narrow = el.parentElement.offsetWidth < 500;
narrow.value = el.parentElement.offsetWidth < 500;
ro = new ResizeObserver((entries, observer) => {
if (el.parentElement && document.body.contains(el)) {
narrow = el.parentElement.offsetWidth < 500;
narrow.value = el.parentElement.offsetWidth < 500;
}
});
ro.observe(el.parentElement);