summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortess <me@thvxl.se>2024-06-09 16:19:56 +0200
committertess <me@thvxl.se>2024-06-09 16:19:56 +0200
commitce197bc2e60134f99beb6f90f528ef6a807cd425 (patch)
treeae3b63d93b4b7644b4a56cbc6bf0e5fc36668f1f
parentMkToast Mfm plain prop should be static (diff)
downloadsharkey-ce197bc2e60134f99beb6f90f528ef6a807cd425.tar.gz
sharkey-ce197bc2e60134f99beb6f90f528ef6a807cd425.tar.bz2
sharkey-ce197bc2e60134f99beb6f90f528ef6a807cd425.zip
add ability to conditionally wrap toast message in Mfm tag
-rw-r--r--packages/frontend/src/components/MkToast.vue10
-rw-r--r--packages/frontend/src/os.ts3
2 files changed, 9 insertions, 4 deletions
diff --git a/packages/frontend/src/components/MkToast.vue b/packages/frontend/src/components/MkToast.vue
index 33170048dc..f731b3264f 100644
--- a/packages/frontend/src/components/MkToast.vue
+++ b/packages/frontend/src/components/MkToast.vue
@@ -14,7 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
>
<div v-if="showing" class="_acrylic" :class="$style.root" :style="{ zIndex }">
<div style="padding: 16px 24px;">
- <Mfm :text="message" plain="true"/>
+ <Mfm v-if="renderMfm" :text="message" plain/>
+ <template v-else>{{ message }}</template>
</div>
</div>
</Transition>
@@ -26,9 +27,12 @@ import { onMounted, ref } from 'vue';
import * as os from '@/os.js';
import { defaultStore } from '@/store.js';
-defineProps<{
+withDefaults(defineProps<{
message: string;
-}>();
+ renderMfm: boolean;
+}>(), {
+ renderMfm: false,
+});
const emit = defineEmits<{
(ev: 'closed'): void;
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index fc73622d6b..fd24039d95 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -211,9 +211,10 @@ export function pageWindow(path: string) {
}, {}, 'closed');
}
-export function toast(message: string) {
+export function toast(message: string, renderMfm = false) {
popup(MkToast, {
message,
+ renderMfm,
}, {}, 'closed');
}