forked from rca-fedi/yoiyami
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhance(frontend): ノートのインスタンス情報の表示位置 (taiyme#104)
Co-authored-by: taiyme <53635909+taiyme@users.noreply.github.com>
- Loading branch information
Showing
5 changed files
with
139 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,192 @@ | ||
| <template> | ||
| <div class="hpaizdrt" :class="{ vertical }" :style="tickerColor"> | ||
| <div class="hpaizdrt" :class="position" :style="tickerColor"> | ||
| <img v-if="instance.faviconUrl" class="icon" :src="instance.faviconUrl"/> | ||
| <span class="name">{{ instance.name }}</span> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script lang="ts" setup> | ||
| import { } from 'vue'; | ||
| import { computed, ComputedRef } from 'vue'; | ||
| import { instanceName } from '@/config'; | ||
| import { instance as Instance } from '@/instance'; | ||
| import { getProxiedImageUrlNullable } from '@/scripts/media-proxy'; | ||
| import { defaultStore } from '@/store'; | ||
| const props = defineProps<{ | ||
| instance?: { | ||
| faviconUrl?: string | ||
| name: string | ||
| themeColor?: string | ||
| } | ||
| vertical?: boolean | ||
| forceType?: typeof defaultStore.state.instanceTickerPosition | ComputedRef<typeof defaultStore.state.instanceTickerPosition>; | ||
| }>(); | ||
| // if no instance data is given, this is for the local instance | ||
| const instance = props.instance ?? { | ||
| faviconUrl: getProxiedImageUrlNullable(Instance.iconUrl) ?? getProxiedImageUrlNullable(Instance.faviconUrl) ?? '/favicon.ico', | ||
| faviconUrl: getProxiedImageUrlNullable(Instance.iconUrl) ?? getProxiedImageUrlNullable((Instance as { faviconUrl?: string | null }).faviconUrl) ?? '/favicon.ico', | ||
| name: instanceName, | ||
| themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement).content, | ||
| }; | ||
| const vertical = props.vertical ?? false; | ||
| const position = computed(() => { | ||
| return typeof props.forceType === 'string' ? props.forceType : props.forceType?.value ?? defaultStore.state.instanceTickerPosition; | ||
| }); | ||
| const yuvColor = (hex) => { | ||
| const toRgb = (hex) => { | ||
| const [r, g, b] = Array.from(hex.slice(1).match(/.{2}/g) || [], n => parseInt(n, 16)); | ||
| return { r, g, b }; | ||
| }; | ||
| const { r, g, b } = toRgb(hex); | ||
| const hexToRgb = (hex: string): { | ||
| r: number; | ||
| g: number; | ||
| b: number; | ||
| } => { | ||
| const [r, g, b] = Array.from(hex.slice(1).match(/.{2}/g) ?? [], n => parseInt(n, 16)); | ||
| return { r, g, b }; | ||
| }; | ||
| const getTickerFgColor = (hex: string): string => { | ||
| const { r, g, b } = hexToRgb(hex); | ||
| const yuv = 0.299 * r + 0.587 * g + 0.114 * b; | ||
| return (yuv > 191) ? '#2f2f2fcc' : '#ffffff'; | ||
| return yuv > 191 ? '#2f2f2fcc' : '#ffffff'; | ||
| }; | ||
| const tickerBgColor = instance.themeColor ?? '#777777'; | ||
| const tickerFgColor = yuvColor(tickerBgColor); | ||
| const tickerFgColor = getTickerFgColor(tickerBgColor); | ||
| const tickerColor = { | ||
| '--ticker-bg': tickerBgColor, | ||
| '--ticker-fg': tickerFgColor, | ||
| '--ticker-bg-rgb': (({ r, g, b }): string => `${r}, ${g}, ${b}`)(hexToRgb(tickerBgColor)), | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| .hpaizdrt { | ||
| background: var(--ticker-bg, #777777); | ||
| color: var(--ticker-fg, #ffffff); | ||
| width: auto; | ||
| height: 1.1rem; | ||
| border-radius: 4px; | ||
| overflow: hidden; | ||
| > .icon { | ||
| width: auto; | ||
| height: 100%; | ||
| aspect-ratio: 1 / 1; | ||
| } | ||
| > .name { | ||
| margin-left: 4px; | ||
| line-height: 1.1rem; | ||
| font-size: 0.9em; | ||
| vertical-align: top; | ||
| font-weight: bold; | ||
| } | ||
| &.vertical { | ||
| &.normal { | ||
| width: auto; | ||
| height: 1.1rem; | ||
| border-radius: 4px; | ||
| overflow: hidden; | ||
| > .icon { | ||
| width: auto; | ||
| height: 100%; | ||
| } | ||
| > .name { | ||
| margin-left: 4px; | ||
| line-height: 1.1rem; | ||
| } | ||
| } | ||
| &.leftedge { | ||
| position: absolute; | ||
| top: 0; | ||
| left: 0; | ||
| display: grid; | ||
| gap: 4px; | ||
| grid-template-rows: auto 1fr; | ||
| width: 14px; | ||
| height: 100%; | ||
| border-radius: 0; | ||
| > .icon { | ||
| display: block; | ||
| width: 100%; | ||
| height: auto; | ||
| } | ||
| > .name { | ||
| display: inline-block; | ||
| height: calc(100% - 14px); | ||
| margin-left: 0; | ||
| display: block; | ||
| width: 100%; | ||
| height: 100%; | ||
| line-height: 14px; | ||
| writing-mode: vertical-lr; | ||
| white-space: nowrap; | ||
| text-overflow: ellipsis; | ||
| overflow: hidden; | ||
| } | ||
| } | ||
| &.rightedge { | ||
| @extend .leftedge; | ||
| left: auto; | ||
| right: 0; | ||
| } | ||
| &.bottomright { | ||
| --ticker-bg-deg: 135deg; | ||
| pointer-events: none; | ||
| user-select: none; | ||
| position: absolute; | ||
| z-index: -1; | ||
| inset: 0; | ||
| padding: 6px; | ||
| display: flex; | ||
| gap: 4px; | ||
| flex-direction: column; | ||
| justify-content: flex-end; | ||
| align-items: flex-end; | ||
| background: linear-gradient( | ||
| var(--ticker-bg-deg), | ||
| rgba(var(--ticker-bg-rgb), 0.35), | ||
| rgba(var(--ticker-bg-rgb), 0.35) 3em, | ||
| rgba(0, 0, 0, 0) 3em, | ||
| rgba(0, 0, 0, 0) calc(100% - 3em), | ||
| rgba(var(--ticker-bg-rgb), 0.35) calc(100% - 3em), | ||
| rgba(var(--ticker-bg-rgb), 0.35) 100% | ||
| ); | ||
| color: #fff; | ||
| text-shadow: /* 0.866 ≈ sin(60deg) */ | ||
| 1px 0 1px #000, | ||
| 0.866px 0.5px 1px #000, | ||
| 0.5px 0.866px 1px #000, | ||
| 0 1px 1px #000, | ||
| -0.5px 0.866px 1px #000, | ||
| -0.866px 0.5px 1px #000, | ||
| -1px 0 1px #000, | ||
| -0.866px -0.5px 1px #000, | ||
| -0.5px -0.866px 1px #000, | ||
| 0 -1px 1px #000, | ||
| 0.5px -0.866px 1px #000, | ||
| 0.866px -0.5px 1px #000; | ||
| > .icon { | ||
| display: block; | ||
| height: 2em; | ||
| opacity: 0.8; | ||
| } | ||
| > .name { | ||
| display: block; | ||
| max-width: 100%; | ||
| margin: -4px; // text-shadow | ||
| padding: 4px; // text-shadow | ||
| line-height: 1; | ||
| opacity: 0.7; | ||
| white-space: nowrap; | ||
| text-overflow: ellipsis; | ||
| overflow: hidden; | ||
| text-align: end; | ||
| } | ||
| } | ||
| &.bottomleft { | ||
| @extend .bottomright; | ||
| --ticker-bg-deg: -135deg; | ||
| align-items: flex-start; | ||
| > .name { | ||
| text-align: start; | ||
| } | ||
| } | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters