add initial button
This commit is contained in:
parent
619250a51d
commit
3c5b1280c7
3 changed files with 65 additions and 1 deletions
|
@ -1193,6 +1193,9 @@ _nsfw:
|
||||||
ignore: "Don't hide NSFW media"
|
ignore: "Don't hide NSFW media"
|
||||||
force: "Hide all media"
|
force: "Hide all media"
|
||||||
_mfm:
|
_mfm:
|
||||||
|
play: "Play MFM"
|
||||||
|
stop: "Stop MFM"
|
||||||
|
warn: "MFM may contain rapidly moving or flashy animations"
|
||||||
cheatSheet: "MFM Cheatsheet"
|
cheatSheet: "MFM Cheatsheet"
|
||||||
intro: "MFM is a markup language used on Misskey, Calckey, Akkoma, and more that\
|
intro: "MFM is a markup language used on Misskey, Calckey, Akkoma, and more that\
|
||||||
\ can be used in many places. Here you can view a list of all available MFM syntax."
|
\ can be used in many places. Here you can view a list of all available MFM syntax."
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<div class="wrmlmaau">
|
<div class="wrmlmaau">
|
||||||
<div
|
<div
|
||||||
class="content"
|
class="content"
|
||||||
:class="{ collapsed, isLong, showContent: note.cw && !showContent }"
|
:class="{ collapsed, isLong, showContent: note.cw && !showContent, disableAnim: disableMfm }"
|
||||||
>
|
>
|
||||||
<XCwButton
|
<XCwButton
|
||||||
ref="cwButton"
|
ref="cwButton"
|
||||||
|
@ -120,6 +120,17 @@
|
||||||
v-model="collapsed"
|
v-model="collapsed"
|
||||||
></XShowMoreButton>
|
></XShowMoreButton>
|
||||||
<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
|
<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
|
||||||
|
<MkButton
|
||||||
|
v-if="hasMfm"
|
||||||
|
@click.stop="toggleMfm"
|
||||||
|
>
|
||||||
|
<template v-if="disableMfm">
|
||||||
|
<i class="ph-play ph-bold"></i> {{ i18n.ts._mfm.play }}
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<i class="ph-stop ph-bold"></i> {{ i18n.ts._mfm.stop }}
|
||||||
|
</template>
|
||||||
|
</MkButton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -128,13 +139,16 @@
|
||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
import * as misskey from "calckey-js";
|
import * as misskey from "calckey-js";
|
||||||
import * as mfm from "mfm-js";
|
import * as mfm from "mfm-js";
|
||||||
|
import * as os from "@/os";
|
||||||
import XNoteSimple from "@/components/MkNoteSimple.vue";
|
import XNoteSimple from "@/components/MkNoteSimple.vue";
|
||||||
import XMediaList from "@/components/MkMediaList.vue";
|
import XMediaList from "@/components/MkMediaList.vue";
|
||||||
import XPoll from "@/components/MkPoll.vue";
|
import XPoll from "@/components/MkPoll.vue";
|
||||||
import MkUrlPreview from "@/components/MkUrlPreview.vue";
|
import MkUrlPreview from "@/components/MkUrlPreview.vue";
|
||||||
import XShowMoreButton from "@/components/MkShowMoreButton.vue";
|
import XShowMoreButton from "@/components/MkShowMoreButton.vue";
|
||||||
import XCwButton from "@/components/MkCwButton.vue";
|
import XCwButton from "@/components/MkCwButton.vue";
|
||||||
|
import MkButton from "@/components/MkButton.vue";
|
||||||
import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
|
import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
|
||||||
|
import { extractMfmWithAnimation } from "@/scripts/extract-mfm";
|
||||||
import { i18n } from "@/i18n";
|
import { i18n } from "@/i18n";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
|
@ -164,6 +178,26 @@ const urls = props.note.text
|
||||||
|
|
||||||
let showContent = $ref(false);
|
let showContent = $ref(false);
|
||||||
|
|
||||||
|
const mfms = props.note.text ? extractMfmWithAnimation(mfm.parse(props.note.text)) : null;
|
||||||
|
|
||||||
|
const hasMfm = $ref(mfms.length > 0);
|
||||||
|
|
||||||
|
let disableMfm = $ref(hasMfm);
|
||||||
|
|
||||||
|
async function toggleMfm() {
|
||||||
|
if (disableMfm) {
|
||||||
|
const { canceled } = await os.confirm({
|
||||||
|
type: "warning",
|
||||||
|
text: i18n.ts._mfm.warn,
|
||||||
|
});
|
||||||
|
if (canceled) return;
|
||||||
|
|
||||||
|
disableMfm = false;
|
||||||
|
} else {
|
||||||
|
disableMfm = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function focusFooter(ev) {
|
function focusFooter(ev) {
|
||||||
if (ev.key == "Tab" && !ev.getModifierState("Shift")) {
|
if (ev.key == "Tab" && !ev.getModifierState("Shift")) {
|
||||||
emit("focusfooter");
|
emit("focusfooter");
|
||||||
|
@ -195,6 +229,12 @@ function focusFooter(ev) {
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mfm-warning {
|
||||||
|
button {
|
||||||
|
padding: 1em;
|
||||||
|
}
|
||||||
|
}
|
||||||
.wrmlmaau {
|
.wrmlmaau {
|
||||||
.content {
|
.content {
|
||||||
overflow-wrap: break-word;
|
overflow-wrap: break-word;
|
||||||
|
@ -286,6 +326,11 @@ function focusFooter(ev) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.disableAnim :deep(*) {
|
||||||
|
animation: none !important;
|
||||||
|
transition: none !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
16
packages/client/src/scripts/extract-mfm.ts
Normal file
16
packages/client/src/scripts/extract-mfm.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import * as mfm from "mfm-js";
|
||||||
|
|
||||||
|
const animatedMfm = ["tada", "jelly", "twitch", "shake", "spin", "jump", "bounce", "rainbow"];
|
||||||
|
|
||||||
|
export function extractMfmWithAnimation(
|
||||||
|
nodes: mfm.MfmNode[],
|
||||||
|
): string[] {
|
||||||
|
const mfmNodes = mfm.extract(nodes, (node) => {
|
||||||
|
return (
|
||||||
|
node.type === "fn" && animatedMfm.indexOf(node.props.name) > -1
|
||||||
|
);
|
||||||
|
});
|
||||||
|
const mfms = mfmNodes.map((x) => x.props.fn);
|
||||||
|
|
||||||
|
return mfms;
|
||||||
|
}
|
Loading…
Reference in a new issue