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

add ability to conditionally wrap toast message in Mfm tag

Browse Source
This commit is contained in:
tess 2024-06-09 16:19:56 +02:00
parent c8535b5d26
commit ce197bc2e6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/frontend/src/components/MkToast.vue
View File

@ -14,7 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
> >
<div v-if="showing" class="_acrylic" :class="$style.root" :style="{ zIndex }"> <div v-if="showing" class="_acrylic" :class="$style.root" :style="{ zIndex }">
<div style="padding: 16px 24px;"> <div style="padding: 16px 24px;">
<Mfm :text="message" plain="true"/> <Mfm v-if="renderMfm" :text="message" plain/>
<template v-else>{{ message }}</template>
</div> </div>
</div> </div>
</Transition> </Transition>
@ -26,9 +27,12 @@ import { onMounted, ref } from 'vue';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { defaultStore } from '@/store.js'; import { defaultStore } from '@/store.js';
defineProps<{ withDefaults(defineProps<{
message: string; message: string;
}>(); renderMfm: boolean;
}>(), {
renderMfm: false,
});
const emit = defineEmits<{ const emit = defineEmits<{
(ev: 'closed'): void; (ev: 'closed'): void;

3
packages/frontend/src/os.ts
View File

@ -211,9 +211,10 @@ export function pageWindow(path: string) {
}, {}, 'closed'); }, {}, 'closed');
} }
export function toast(message: string) { export function toast(message: string, renderMfm = false) {
popup(MkToast, { popup(MkToast, {
message, message,
renderMfm,
}, {}, 'closed'); }, {}, 'closed');
} }