From 4ed1b80d6842acd60ae137767e93b54cd6ceec9a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 11:40:12 -0800
Subject: [PATCH 1/5] perf: :zap: MkPageHeader perf

---
 .../src/components/global/MkPageHeader.vue    | 100 +++++++++---------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 3b844bd82..831eca997 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick, reactive } from 'vue';
+import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick } from 'vue';
 import tinycolor from 'tinycolor2';
 import { popupMenu } from '@/os';
 import { scrollToTop } from '@/scripts/scroll';
@@ -71,17 +71,17 @@ const metadata = injectPageMetadata();
 const hideTitle = inject('shouldOmitHeaderTitle', false);
 const thin_ = props.thin || inject('shouldHeaderThin', false);
 
-const el = $ref<HTMLElement | null>(null);
-const tabRefs = {};
-const tabHighlightEl = $ref<HTMLElement | null>(null);
-const tabsEl = $ref<HTMLElement | null>(null);
-const bg = ref(null);
-let narrow = $ref(false);
+const el = ref<HTMLElement | null>(null);
+const tabRefs: Record<string, HTMLElement> = {};
+const tabHighlightEl = ref<HTMLElement | null>(null);
+const tabsEl = ref<HTMLElement | null>(null);
+const bg = ref<string | null>(null);
+const narrow = ref(false);
 const height = ref(0);
-const hasTabs = $computed(() => props.tabs && props.tabs.length > 0);
-const hasActions = $computed(() => props.actions && props.actions.length > 0);
-const show = $computed(() => {
-	return !hideTitle || hasTabs || hasActions;
+const hasTabs = computed(() => props.tabs && props.tabs.length > 0);
+const hasActions = computed(() => props.actions && props.actions.length > 0);
+const show = computed(() => {
+	return !hideTitle || hasTabs.value || hasActions.value;
 });
 
 const openAccountMenu = (ev: MouseEvent) => {
@@ -91,11 +91,11 @@ const openAccountMenu = (ev: MouseEvent) => {
 };
 
 const showTabsPopup = (ev: MouseEvent) => {
-	if (!hasTabs) return;
-	if (!narrow) return;
+	if (!hasTabs.value) return;
+	if (!narrow.value) return;
 	ev.preventDefault();
 	ev.stopPropagation();
-	const menu = props.tabs.map(tab => ({
+	const menu = props.tabs!.map(tab => ({
 		text: tab.title,
 		icon: tab.icon,
 		active: tab.key != null && tab.key === props.tab,
@@ -111,7 +111,7 @@ const preventDrag = (ev: TouchEvent) => {
 };
 
 const onClick = () => {
-	scrollToTop(el, { behavior: 'smooth' });
+	scrollToTop(el.value!, { behavior: 'smooth' });
 };
 
 function onTabMousedown(tab: Tab, ev: MouseEvent): void {
@@ -142,42 +142,42 @@ const calcBg = () => {
 let ro: ResizeObserver | null;
 
 onMounted(() => {
-	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,
-	});
+  calcBg();
+  globalEvents.on('themeChanged', calcBg);
 
-	if (el && el.parentElement) {
-		narrow = el.parentElement.offsetWidth < 500;
-		ro = new ResizeObserver((entries, observer) => {
-			if (el.parentElement && document.body.contains(el)) {
-				narrow = el.parentElement.offsetWidth < 500;
-			}
-		});
-		ro.observe(el.parentElement);
-	}
+  const updateTabHighlight = () => {
+    nextTick(() => {
+      const tabEl = tabRefs[props.tab];
+      if (tabEl && tabHighlightEl) {
+        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`;
+        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(() => {

From 6d2f2efcf6c3406d352675b16e53b7c4c2c59d0c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 11:41:24 -0800
Subject: [PATCH 2/5] dev10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dbb304cb9..476d9afe5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev9",
+	"version": "13.2.0-dev10",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 9ed34f3704b410f24468d4db145477253be4bd52 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 11:54:33 -0800
Subject: [PATCH 3/5] add isActiveTab method

---
 packages/client/src/components/global/MkPageHeader.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 831eca997..4a6b72a4e 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -132,6 +132,11 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
 	}
 }
 
+const isActiveTab = (index: number) => {
+  const activeTab = tabRefs[props.tab]?.value ?? 0;
+  return index === activeTab;
+};
+
 const calcBg = () => {
 	const rawBg = metadata?.bg || 'var(--bg)';
 	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);

From 0d32eb2cd5717d07ec57ffe894c3f4dc6cd32123 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 12:36:07 -0800
Subject: [PATCH 4/5] fix

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 476d9afe5..d1173a5d4 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
 		"test": "pnpm run mocha",
 		"format": "gulp format",
 		"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"
 	},
 	"resolutions": {

From b654add6b31f6bb6768e50bfd19fc0ac523d938e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 17 Feb 2023 12:36:16 -0800
Subject: [PATCH 5/5] fix

---
 .../src/components/global/MkPageHeader.vue    | 98 +++++++++----------
 1 file changed, 46 insertions(+), 52 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 4a6b72a4e..c25f90dba 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,40 +1,39 @@
 <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>
-    <template v-if="hasTabs">
-      <div v-show="!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>
-      </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>
-          <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>
-  </div>
+	<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="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 && !(tabs != null && tabs.length > 0 && narrow)" class="title">{{ metadata.title }}</div>
+					<div v-if="!narrow && metadata.subtitle" class="subtitle">
+						{{ metadata.subtitle }}
+					</div>
+				</div>
+			</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 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>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick } from 'vue';
+import { computed, onMounted, onUnmounted, ref, inject, watch, shallowReactive, nextTick, reactive } from 'vue';
 import tinycolor from 'tinycolor2';
 import { popupMenu } from '@/os';
 import { scrollToTop } from '@/scripts/scroll';
@@ -71,17 +70,17 @@ const metadata = injectPageMetadata();
 const hideTitle = inject('shouldOmitHeaderTitle', false);
 const thin_ = props.thin || inject('shouldHeaderThin', false);
 
-const el = ref<HTMLElement | null>(null);
-const tabRefs: Record<string, HTMLElement> = {};
-const tabHighlightEl = ref<HTMLElement | null>(null);
-const tabsEl = ref<HTMLElement | null>(null);
-const bg = ref<string | null>(null);
-const narrow = ref(false);
+const el = $ref<HTMLElement | null>(null);
+const tabRefs = {};
+const tabHighlightEl = $ref<HTMLElement | null>(null);
+const tabsEl = $ref<HTMLElement | null>(null);
+const bg = ref(null);
+let narrow = $ref(false);
 const height = ref(0);
-const hasTabs = computed(() => props.tabs && props.tabs.length > 0);
-const hasActions = computed(() => props.actions && props.actions.length > 0);
-const show = computed(() => {
-	return !hideTitle || hasTabs.value || hasActions.value;
+const hasTabs = $computed(() => props.tabs && props.tabs.length > 0);
+const hasActions = $computed(() => props.actions && props.actions.length > 0);
+const show = $computed(() => {
+	return !hideTitle || hasTabs || hasActions;
 });
 
 const openAccountMenu = (ev: MouseEvent) => {
@@ -91,11 +90,11 @@ const openAccountMenu = (ev: MouseEvent) => {
 };
 
 const showTabsPopup = (ev: MouseEvent) => {
-	if (!hasTabs.value) return;
-	if (!narrow.value) return;
+	if (!hasTabs) return;
+	if (!narrow) return;
 	ev.preventDefault();
 	ev.stopPropagation();
-	const menu = props.tabs!.map(tab => ({
+	const menu = props.tabs.map(tab => ({
 		text: tab.title,
 		icon: tab.icon,
 		active: tab.key != null && tab.key === props.tab,
@@ -111,7 +110,7 @@ const preventDrag = (ev: TouchEvent) => {
 };
 
 const onClick = () => {
-	scrollToTop(el.value!, { behavior: 'smooth' });
+	scrollToTop(el, { behavior: 'smooth' });
 };
 
 function onTabMousedown(tab: Tab, ev: MouseEvent): void {
@@ -132,11 +131,6 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
 	}
 }
 
-const isActiveTab = (index: number) => {
-  const activeTab = tabRefs[props.tab]?.value ?? 0;
-  return index === activeTab;
-};
-
 const calcBg = () => {
 	const rawBg = metadata?.bg || 'var(--bg)';
 	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);