summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2025-01-18 08:28:20 +0900
committerGitHub <noreply@github.com>2025-01-17 23:28:20 +0000
commitf01fc5af5a1e4690efedc32f12c00e391996db3c (patch)
tree2cec7700bf87f5a8a5f9d81af6ff83e8af9381c9 /packages/frontend/src
parentワードミュートの保存失敗時にAPIエラーが握りつぶされ... (diff)
downloadsharkey-f01fc5af5a1e4690efedc32f12c00e391996db3c.tar.gz
sharkey-f01fc5af5a1e4690efedc32f12c00e391996db3c.tar.bz2
sharkey-f01fc5af5a1e4690efedc32f12c00e391996db3c.zip
fix(frontend): MkInstanceTickerの情報がリアクティブでない問題を修正 (#15123)
* fix(frontend): MkInstanceTickerの情報がリアクティブでない問題を修正 * Update Changelog --------- Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com>
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/MkInstanceTicker.vue28
1 files changed, 13 insertions, 15 deletions
diff --git a/packages/frontend/src/components/MkInstanceTicker.vue b/packages/frontend/src/components/MkInstanceTicker.vue
index fae22baa3f..570c50b627 100644
--- a/packages/frontend/src/components/MkInstanceTicker.vue
+++ b/packages/frontend/src/components/MkInstanceTicker.vue
@@ -4,16 +4,16 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
<template>
-<div :class="$style.root" :style="bg">
+<div :class="$style.root" :style="themeColorStyle">
<img v-if="faviconUrl" :class="$style.icon" :src="faviconUrl"/>
- <div :class="$style.name">{{ instance.name }}</div>
+ <div :class="$style.name">{{ instanceName }}</div>
</div>
</template>
<script lang="ts" setup>
-import { computed } from 'vue';
-import { instanceName } from '@@/js/config.js';
-import { instance as Instance } from '@/instance.js';
+import { computed, type CSSProperties } from 'vue';
+import { instanceName as localInstanceName } from '@@/js/config.js';
+import { instance as localInstance } from '@/instance.js';
import { getProxiedImageUrlNullable } from '@/scripts/media-proxy.js';
const props = defineProps<{
@@ -25,18 +25,16 @@ const props = defineProps<{
}>();
// if no instance data is given, this is for the local instance
-const instance = props.instance ?? {
- name: instanceName,
- themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement).content,
-};
+const instanceName = computed(() => props.instance?.name ?? localInstanceName);
-const faviconUrl = computed(() => props.instance ? getProxiedImageUrlNullable(props.instance.faviconUrl, 'preview') : getProxiedImageUrlNullable(Instance.iconUrl, 'preview') ?? '/favicon.ico');
+const faviconUrl = computed(() => getProxiedImageUrlNullable(props.instance?.faviconUrl ?? localInstance.iconUrl, 'preview') ?? '/favicon.ico');
-const themeColor = instance.themeColor ?? '#777777';
-
-const bg = {
- background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`,
-};
+const themeColorStyle = computed<CSSProperties>(() => {
+ const themeColor = props.instance?.themeColor ?? localInstance.themeColor ?? '#777777';
+ return {
+ background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`,
+ };
+});
</script>
<style lang="scss" module>