mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-04 07:24:13 +00:00 
			
		
		
		
	set isBlock for mfm render in embeds
This commit is contained in:
		
							parent
							
								
									abb93f1d79
								
							
						
					
					
						commit
						e87b1d2b11
					
				
					 7 changed files with 10 additions and 6 deletions
				
			
		| 
						 | 
					@ -396,7 +396,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			case 'blockCode': {
 | 
								case 'blockCode': {
 | 
				
			||||||
				return [h('bdi', h('code', {
 | 
									return [h('bdi', { class: 'block' }, h('code', {
 | 
				
			||||||
					key: Math.random(),
 | 
										key: Math.random(),
 | 
				
			||||||
					lang: token.props.lang ?? undefined,
 | 
										lang: token.props.lang ?? undefined,
 | 
				
			||||||
				}, token.props.code))];
 | 
									}, token.props.code))];
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,7 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
			<EmInstanceTicker v-if="appearNote.user.instance != null" :instance="appearNote.user.instance"/>
 | 
								<EmInstanceTicker v-if="appearNote.user.instance != null" :instance="appearNote.user.instance"/>
 | 
				
			||||||
			<div style="container-type: inline-size;">
 | 
								<div style="container-type: inline-size;">
 | 
				
			||||||
				<p v-if="appearNote.cw != null" :class="$style.cw">
 | 
									<p v-if="appearNote.cw != null" :class="$style.cw">
 | 
				
			||||||
					<EmMfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'"/>
 | 
										<EmMfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'" :isBlock="true"/>
 | 
				
			||||||
					<button style="display: block; width: 100%; margin: 4px 0;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
										<button style="display: block; width: 100%; margin: 4px 0;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
				
			||||||
				</p>
 | 
									</p>
 | 
				
			||||||
				<div v-show="appearNote.cw == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]">
 | 
									<div v-show="appearNote.cw == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]">
 | 
				
			||||||
| 
						 | 
					@ -63,6 +63,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
							:emojiUrls="appearNote.emojis"
 | 
												:emojiUrls="appearNote.emojis"
 | 
				
			||||||
							:enableEmojiMenu="!true"
 | 
												:enableEmojiMenu="!true"
 | 
				
			||||||
							:enableEmojiMenuReaction="true"
 | 
												:enableEmojiMenuReaction="true"
 | 
				
			||||||
 | 
												:isBlock="true"
 | 
				
			||||||
						/>
 | 
											/>
 | 
				
			||||||
					</div>
 | 
										</div>
 | 
				
			||||||
					<div v-if="appearNote.files && appearNote.files.length > 0">
 | 
										<div v-if="appearNote.files && appearNote.files.length > 0">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -59,7 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
		</header>
 | 
							</header>
 | 
				
			||||||
		<div :class="[$style.noteContent, { [$style.contentCollapsed]: collapsed }]">
 | 
							<div :class="[$style.noteContent, { [$style.contentCollapsed]: collapsed }]">
 | 
				
			||||||
			<p v-if="appearNote.cw != null" :class="$style.cw">
 | 
								<p v-if="appearNote.cw != null" :class="$style.cw">
 | 
				
			||||||
				<EmMfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'"/>
 | 
									<EmMfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'" :isBlock="true"/>
 | 
				
			||||||
				<button style="display: block; width: 100%; margin: 4px 0;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
									<button style="display: block; width: 100%; margin: 4px 0;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
				
			||||||
			</p>
 | 
								</p>
 | 
				
			||||||
			<div v-show="appearNote.cw == null || showContent">
 | 
								<div v-show="appearNote.cw == null || showContent">
 | 
				
			||||||
| 
						 | 
					@ -72,6 +72,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
					:author="appearNote.user"
 | 
										:author="appearNote.user"
 | 
				
			||||||
					:nyaize="'respect'"
 | 
										:nyaize="'respect'"
 | 
				
			||||||
					:emojiUrls="appearNote.emojis"
 | 
										:emojiUrls="appearNote.emojis"
 | 
				
			||||||
 | 
										:isBlock="true"
 | 
				
			||||||
				/>
 | 
									/>
 | 
				
			||||||
				<a v-if="appearNote.renote != null" :class="$style.rn">RN:</a>
 | 
									<a v-if="appearNote.renote != null" :class="$style.rn">RN:</a>
 | 
				
			||||||
				<div v-if="appearNote.files && appearNote.files.length > 0">
 | 
									<div v-if="appearNote.files && appearNote.files.length > 0">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
		<EmNoteHeader :class="$style.header" :note="note" :mini="true"/>
 | 
							<EmNoteHeader :class="$style.header" :note="note" :mini="true"/>
 | 
				
			||||||
		<div>
 | 
							<div>
 | 
				
			||||||
			<p v-if="note.cw != null" :class="$style.cw">
 | 
								<p v-if="note.cw != null" :class="$style.cw">
 | 
				
			||||||
				<EmMfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
 | 
									<EmMfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis" :isBlock="true"/>
 | 
				
			||||||
				<button style="display: block; width: 100%;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
									<button style="display: block; width: 100%;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
				
			||||||
			</p>
 | 
								</p>
 | 
				
			||||||
			<div v-show="note.cw == null || showContent">
 | 
								<div v-show="note.cw == null || showContent">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
			<EmNoteHeader :class="$style.header" :note="note" :mini="true"/>
 | 
								<EmNoteHeader :class="$style.header" :note="note" :mini="true"/>
 | 
				
			||||||
			<div>
 | 
								<div>
 | 
				
			||||||
				<p v-if="note.cw != null" :class="$style.cw">
 | 
									<p v-if="note.cw != null" :class="$style.cw">
 | 
				
			||||||
					<EmMfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'"/>
 | 
										<EmMfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'" :isBlock="true"/>
 | 
				
			||||||
					<button style="display: block; width: 100%;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
										<button style="display: block; width: 100%;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button>
 | 
				
			||||||
				</p>
 | 
									</p>
 | 
				
			||||||
				<div v-show="note.cw == null || showContent">
 | 
									<div v-show="note.cw == null || showContent">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
		<span v-if="note.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 | 
							<span v-if="note.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 | 
				
			||||||
		<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deletedNote }})</span>
 | 
							<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deletedNote }})</span>
 | 
				
			||||||
		<EmA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></EmA>
 | 
							<EmA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></EmA>
 | 
				
			||||||
		<EmMfm v-if="note.text" :text="note.text" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
 | 
							<EmMfm v-if="note.text" :text="note.text" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis" :isBlock="true"/>
 | 
				
			||||||
		<EmA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`">RN: ...</EmA>
 | 
							<EmA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`">RN: ...</EmA>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
	<details v-if="note.files && note.files.length > 0">
 | 
						<details v-if="note.files && note.files.length > 0">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -310,6 +310,8 @@ rt {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// MFM -----------------------------
 | 
					// MFM -----------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bdi.block { display: block }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
._mfm_blur_ {
 | 
					._mfm_blur_ {
 | 
				
			||||||
	filter: blur(6px);
 | 
						filter: blur(6px);
 | 
				
			||||||
	transition: filter 0.3s;
 | 
						transition: filter 0.3s;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue