heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

merge: style: automatically detect RTL on all MFM content (!482)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/482

Closes #356

Approved-by: Tess K <me@thvxl.se>
Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
dakkar 2024-05-31 18:42:38 +00:00
commit 928f65be72
3 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkPostForm.vue
View file

@ -68,7 +68,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<input v-show="useCw" ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown">
<div :class="[$style.textOuter, { [$style.withCw]: useCw }]">
<div v-if="channel" :class="$style.colorBar" :style="{ background: channel.color }"></div>
<textarea ref="textareaEl" v-model="text" :class="[$style.text]" :disabled="posting || posted" :readonly="textAreaReadOnly" :placeholder="placeholder" data-cy-post-form-text @keydown="onKeydown" @paste="onPaste" @compositionupdate="onCompositionUpdate" @compositionend="onCompositionEnd"/>
<textarea ref="textareaEl" v-model="text" :class="[$style.text]" :disabled="posting || posted" :readonly="textAreaReadOnly" :placeholder="placeholder" data-cy-post-form-text dir="auto" @keydown="onKeydown" @paste="onPaste" @compositionupdate="onCompositionUpdate" @compositionend="onCompositionEnd"/>
<div v-if="maxTextLength - textLength < 100" :class="['_acrylic', $style.textCount, { [$style.textOver]: textLength > maxTextLength }]">{{ maxTextLength - textLength }}</div>
</div>
<input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" :class="$style.hashtags" :placeholder="i18n.ts.hashtags" list="hashtags">

48
packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
View file

@ -390,67 +390,67 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
}
case 'center': {
return [h('div', {
return [h('bdi',h('div', {
style: 'text-align:center;',
}, genEl(token.children, scale))];
}, genEl(token.children, scale)))];
}
case 'url': {
return [h(MkUrl, {
return [h('bdi',h(MkUrl, {
key: Math.random(),
url: token.props.url,
rel: 'nofollow noopener',
})];
}))];
}
case 'link': {
return [h(MkLink, {
return [h('bdi',h(MkLink, {
key: Math.random(),
url: token.props.url,
rel: 'nofollow noopener',
}, genEl(token.children, scale, true))];
}, genEl(token.children, scale, true)))];
}
case 'mention': {
return [h(MkMention, {
return [h('bdi',h(MkMention, {
key: Math.random(),
host: (token.props.host == null && props.author && props.author.host != null ? props.author.host : token.props.host) ?? host,
username: token.props.username,
})];
}))];
}
case 'hashtag': {
return [h(MkA, {
return [h('bdi',h(MkA, {
key: Math.random(),
to: isNote ? `/tags/${encodeURIComponent(token.props.hashtag)}` : `/user-tags/${encodeURIComponent(token.props.hashtag)}`,
style: 'color:var(--hashtag);',
}, `#${token.props.hashtag}`)];
}, `#${token.props.hashtag}`))];
}
case 'blockCode': {
return [h(MkCode, {
return [h('bdi',h(MkCode, {
key: Math.random(),
code: token.props.code,
lang: token.props.lang ?? undefined,
})];
}))];
}
case 'inlineCode': {
return [h(MkCodeInline, {
return [h('bdi',h(MkCodeInline, {
key: Math.random(),
code: token.props.code,
})];
}))];
}
case 'quote': {
if (!props.nowrap) {
return [h('div', {
return [h('bdi',h('div', {
style: QUOTE_STYLE,
}, genEl(token.children, scale, true))];
}, genEl(token.children, scale, true)))];
} else {
return [h('span', {
return [h('bdi',h('span', {
style: QUOTE_STYLE,
}, genEl(token.children, scale, true))];
}, genEl(token.children, scale, true)))];
}
}
@ -494,17 +494,17 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
}
case 'mathInline': {
return [h(MkFormula, {
return [h('bdi',h(MkFormula, {
formula: token.props.formula,
block: false,
})];
}))];
}
case 'mathBlock': {
return [h(MkFormula, {
return [h('bdi',h(MkFormula, {
formula: token.props.formula,
block: true,
})];
}))];
}
case 'search': {
@ -527,8 +527,8 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
}
}).flat(Infinity) as (VNode | string)[];
return h('span', {
return h('bdi', h('span', {
// https://codeday.me/jp/qa/20190424/690106.html
style: props.nowrap ? 'white-space: pre; word-wrap: normal; overflow: hidden; text-overflow: ellipsis;' : 'white-space: pre-wrap;',
}, genEl(rootAst, props.rootScale ?? 1));
}, genEl(rootAst, props.rootScale ?? 1)));
}

2
packages/frontend/src/style.scss
View file

@ -557,6 +557,8 @@ rt {
// MFM -----------------------------
div > bdi, p > bdi { display: block }
._mfm_blur_ {
filter: blur(6px);
transition: filter 0.3s;