HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Freeplay 2023-02-17 15:39:30 -05:00
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

4
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "calckey", "name": "calckey",
"version": "13.2.0-dev9", "version": "13.2.0-dev10",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",
@ -29,7 +29,7 @@
"test": "pnpm run mocha", "test": "pnpm run mocha",
"format": "gulp format", "format": "gulp format",
"clean": "pnpm node ./scripts/clean.js", "clean": "pnpm node ./scripts/clean.js",
"clean-all": "pnpm node ./scripts/clean-all.js", "clean-all": "pnpm node ./scripts/clean-all.js",
"cleanall": "pnpm run clean-all" "cleanall": "pnpm run clean-all"
}, },
"resolutions": { "resolutions": {

133
packages/client/src/components/global/MkPageHeader.vue
View file

@ -1,36 +1,35 @@
<template> <template>
<div ref="el" class="fdidabkb" :class="classes" :style="{ background: bg }" @click="onClick"> <div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
<div v-show="narrow" class="buttons left" @click="openAccountMenu"> <div v-if="narrow" class="buttons left" @click="openAccountMenu">
<MkAvatar v-if="displayMyAvatar && user" class="avatar" :user="user" :disable-preview="true"/> <MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
</div> </div>
<template v-if="hasTabs"> <template v-if="metadata">
<div v-show="!hideTitle" class="titleContainer" @click="showTabsPopup"> <div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
<MkAvatar v-if="metadata.avatar" class="avatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/> <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> <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 class="title">
<div v-else-if="metadata.title && !hasTabs && !narrow" class="title">{{ metadata.title }}</div> <MkUserName v-if="metadata.userName" :user="metadata.userName" :nowrap="true" class="title"/>
<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> <div v-if="!narrow && metadata.subtitle" class="subtitle">
</div> {{ metadata.subtitle }}
<div ref="tabsEl" class="tabs" v-show="hasTabs"> </div>
<button v-for="tab in tabs" :key="tab.key" ref="tabRefs[tab.key]" v-tooltip.noDelay="tab.title" </div>
class="tab _button" :class="{ active: isActiveTab(tab) }" @mousedown="onTabMousedown(tab)" </div>
@click="onTabClick(tab)"> <div ref="tabsEl" v-if="hasTabs" class="tabs">
<i v-if="tab.icon && !tab.iconOnly" class="icon" :class="tab.icon"></i> <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)">
<span class="title">{{ tab.title }}</span> <i v-if="tab.icon" class="icon" :class="tab.icon"></i>
</button> <span class="title">{{ tab.title }}</span>
<div ref="tabHighlightEl" class="highlight"></div> </button>
</div> <div ref="tabHighlightEl" class="highlight"></div>
</template> </div>
<div v-show="hasActions" class="buttons right"> </template>
<button v-for="(action, index) in actions" :key="index" v-tooltip.noDelay="action.text" <div class="buttons right">
class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" <template v-for="action in actions">
@touchstart="preventDrag"> <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>
<i :class="action.icon"></i> </template>
</button> </div>
</div> </div>
</div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -142,42 +141,42 @@ const calcBg = () => {
let ro: ResizeObserver | null; let ro: ResizeObserver | null;
onMounted(() => { onMounted(() => {
calcBg(); calcBg();
globalEvents.on('themeChanged', calcBg); globalEvents.on('themeChanged', calcBg);
watch(() => [props.tab, props.tabs], () => {
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 parentRect = tabsEl.getBoundingClientRect();
const rect = tabEl.getBoundingClientRect();
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);
}
});
}, {
immediate: true,
});
if (el && el.parentElement) { const updateTabHighlight = () => {
narrow = el.parentElement.offsetWidth < 500; nextTick(() => {
ro = new ResizeObserver((entries, observer) => { const tabEl = tabRefs[props.tab];
if (el.parentElement && document.body.contains(el)) { if (tabEl && tabHighlightEl) {
narrow = el.parentElement.offsetWidth < 500; const tabSizeX = tabEl.scrollWidth + 20;
} tabEl.style.setProperty('--width', `${tabSizeX}px`);
});
ro.observe(el.parentElement); const parentRect = tabsEl.getBoundingClientRect();
} const rect = tabEl.getBoundingClientRect();
const left = (rect.left - parentRect.left + tabsEl.scrollLeft);
tabHighlightEl.style.width = `${tabSizeX}px`;
tabHighlightEl.style.transform = `translateX(${left}px)`;
tabsEl.scrollTo({left: left - 60, behavior: "smooth"});
}
});
};
const updateTab = () => {
emit('update:tab', props.tab);
};
watch(() => [props.tab, props.tabs], updateTabHighlight, { immediate: true });
watch(() => props.tab, updateTab);
if (el && el.parentElement) {
narrow.value = el.parentElement.offsetWidth < 500;
ro = new ResizeObserver((entries, observer) => {
if (el.parentElement && document.body.contains(el)) {
narrow.value = el.parentElement.offsetWidth < 500;
}
});
ro.observe(el.parentElement);
}
}); });
onUnmounted(() => { onUnmounted(() => {