amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: redesign cat ears (#10039)

Browse Source 
* fix: viewing disgusting objects when user is a cat with having transparent avatar

* chore: mask cat ears when useBlurEffect is enabled

* fix: typo

* style: add comment

* chore: shrink mask

* chore: blur mask

* refactor: minify

* chore: use SVG to determine ear color

* style: comment

* refactor: use `<component>`

* refactor: separate cat definitions

* refactor: use singleton SVG definitions

* perf: use CSS instead of SVG

* refactor: unused definer

* refactor: not used anymore

* refactor: minify

* refactor: minify

* fix: import
This commit is contained in:
Acid Chicken (硫酸鶏) 2023-03-23 18:06:26 +09:00 committed by GitHub
parent 41d1b1b8c9
commit 7f9a41b05c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 120 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
packages/frontend/src/components/global/MkAvatar.vue
View File

@ -1,25 +1,26 @@
<template> <template>
<span v-if="!link" v-user-preview="preview ? user.id : undefined" class="_noSelect" :class="[$style.root, { [$style.cat]: user.isCat, [$style.square]: squareAvatars }]" :style="{ color }" :title="acct(user)" @click="onClick"> <component :is="link ? MkA : 'span'" v-user-preview="preview ? user.id : undefined" v-bind="bound" class="_noSelect" :class="[$style.root, { [$style.cat]: user.isCat, [$style.square]: squareAvatars }]" :style="{ color }" :title="acct(user)" @click="onClick">
<img :class="$style.inner" :src="url" decoding="async"/> <img :class="$style.inner" :src="url" decoding="async"/>
<MkUserOnlineIndicator v-if="indicator" :class="$style.indicator" :user="user"/> <MkUserOnlineIndicator v-if="indicator" :class="$style.indicator" :user="user"/>
<template v-if="user.isCat"> <div v-if="user.isCat" :class="[$style.ears, { [$style.mask]: useBlurEffect }]">
<div :class="$style.earLeft"/> <div :class="$style.earLeft">
<div :class="$style.earRight"/> <div v-if="useBlurEffect" :class="$style.layer">
</template> <div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
</span> </div>
<MkA v-else v-user-preview="preview ? user.id : undefined" class="_noSelect" :class="[$style.root, { [$style.cat]: user.isCat, [$style.square]: squareAvatars }]" :style="{ color }" :title="acct(user)" :to="userPage(user)" :target="target"> </div>
<img :class="$style.inner" :src="url" decoding="async"/> <div :class="$style.earRight">
<MkUserOnlineIndicator v-if="indicator" :class="$style.indicator" :user="user"/> <div v-if="useBlurEffect" :class="$style.layer">
<template v-if="user.isCat"> <div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
<div :class="$style.earLeft"/> </div>
<div :class="$style.earRight"/> </div>
</template> </div>
</MkA> </component>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { watch } from 'vue'; import { watch } from 'vue';
import * as misskey from 'misskey-js'; import * as misskey from 'misskey-js';
import MkA from './MkA.vue';
import { getStaticImageUrl } from '@/scripts/media-proxy'; import { getStaticImageUrl } from '@/scripts/media-proxy';
import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash'; import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
import { acct, userPage } from '@/filters/user'; import { acct, userPage } from '@/filters/user';
@ -27,6 +28,7 @@ import MkUserOnlineIndicator from '@/components/MkUserOnlineIndicator.vue';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
const squareAvatars = $ref(defaultStore.state.squareAvatars); const squareAvatars = $ref(defaultStore.state.squareAvatars);
const useBlurEffect = $ref(defaultStore.state.useBlurEffect);
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
user: misskey.entities.User; user: misskey.entities.User;
@ -45,15 +47,20 @@ const emit = defineEmits<{
(ev: 'click', v: MouseEvent): void; (ev: 'click', v: MouseEvent): void;
}>(); }>();
const bound = $computed(() => props.link
? { to: userPage(props.user), target: props.target }
: {});
const url = $computed(() => defaultStore.state.disableShowingAnimatedImages const url = $computed(() => defaultStore.state.disableShowingAnimatedImages
? getStaticImageUrl(props.user.avatarUrl) ? getStaticImageUrl(props.user.avatarUrl)
: props.user.avatarUrl); : props.user.avatarUrl);
function onClick(ev: MouseEvent) { function onClick(ev: MouseEvent): void {
if (props.link) return;
emit('click', ev); emit('click', ev);
} }
let color = $ref(); let color = $ref<string | undefined>();
watch(() => props.user.avatarBlurhash, () => { watch(() => props.user.avatarBlurhash, () => {
color = extractAvgColorFromBlurhash(props.user.avatarBlurhash); color = extractAvgColorFromBlurhash(props.user.avatarBlurhash);
@ -120,42 +127,113 @@ watch(() => props.user.avatarBlurhash, () => {
} }
.cat { .cat {
> .earLeft, > .ears {
> .earRight {
contain: strict; contain: strict;
display: inline-block; position: absolute;
height: 50%; top: -50%;
width: 50%; left: -50%;
background: currentColor; width: 100%;
height: 100%;
padding: 50%;
&::before { &.mask {
contain: strict; -webkit-mask:
content: ''; url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><filter id="a"><feGaussianBlur in="SourceGraphic" stdDeviation="1"/></filter><circle cx="16" cy="16" r="15" filter="url(%23a)"/></svg>') center / 50% 50%,
display: block; linear-gradient(#fff, #fff);
width: 60%; -webkit-mask-composite: destination-out, source-over;
height: 60%; mask:
margin: 20%; url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><filter id="a"><feGaussianBlur in="SourceGraphic" stdDeviation="1"/></filter><circle cx="16" cy="16" r="15" filter="url(%23a)"/></svg>') exclude center / 50% 50%,
background: #df548f; linear-gradient(#fff, #fff); // polyfill of `image(#fff)`
} }
}
> .earLeft { > .earLeft,
border-radius: 0 75% 75%; > .earRight {
transform: rotate(37.5deg) skew(30deg); contain: strict;
} display: inline-block;
height: 50%;
width: 50%;
background: currentColor;
> .earRight { &::after {
border-radius: 75% 0 75% 75%; contain: strict;
transform: rotate(-37.5deg) skew(-30deg); content: '';
} display: block;
width: 60%;
height: 60%;
margin: 20%;
background: #df548f;
}
> .layer {
contain: strict;
position: absolute;
top: 0;
width: 280%;
height: 280%;
> .plot {
contain: strict;
width: 100%;
height: 100%;
clip-path: path('M0 0H1V1H0z');
transform: scale(32767);
transform-origin: 0 0;
}
}
}
&:hover {
> .earLeft { > .earLeft {
animation: earwiggleleft 1s infinite; transform: rotate(37.5deg) skew(30deg);
&, &::after {
border-radius: 0 75% 75%;
}
> .layer {
left: 0;
transform:
skew(-30deg)
rotate(-37.5deg)
translate(-2.82842712475%, /* -2 * sqrt(2) */
-38.5857864376%); /* 40 - 2 * sqrt(2) */
> .plot {
background-position: 20% 10%; /* ~= 37.5deg */
}
}
} }
> .earRight { > .earRight {
animation: earwiggleright 1s infinite; transform: rotate(-37.5deg) skew(-30deg);
&, &::after {
border-radius: 75% 0 75% 75%;
}
> .layer {
right: 0;
transform:
skew(30deg)
rotate(37.5deg)
translate(2.82842712475%, /* 2 * sqrt(2) */
-38.5857864376%); /* 40 - 2 * sqrt(2) */
> .plot {
background-position: 80% 10%; /* ~= 37.5deg */
}
}
}
}
&:hover {
> .ears {
> .earLeft {
animation: earwiggleleft 1s infinite;
}
> .earRight {
animation: earwiggleright 1s infinite;
}
} }
} }
} }