summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1Step621 <86859447+1STEP621@users.noreply.github.com>2023-12-27 20:41:01 +0900
committerGitHub <noreply@github.com>2023-12-27 20:41:01 +0900
commit2a5c9e6002ef93343e87362ccefb4361fa8753b0 (patch)
tree01b22d8b848662ee7320bec7a9808c599dd1ee55
parentrefactor (diff)
downloadsharkey-2a5c9e6002ef93343e87362ccefb4361fa8753b0.tar.gz
sharkey-2a5c9e6002ef93343e87362ccefb4361fa8753b0.tar.bz2
sharkey-2a5c9e6002ef93343e87362ccefb4361fa8753b0.zip
Fix(frontend): MFMでfgとbgに長い単語を使うと改行されない問題を修正 (#12819)
* MFMでfgとbgに長い単語を使うと改行されない問題を修正 * update CHANGELOG.md
-rw-r--r--CHANGELOG.md1
-rw-r--r--packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95fcbbd881..1f65f62788 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
### Client
- Fix: 一部のモデログ(logYellowでの表示対象)について、表示の色が変わらない問題を修正
- Feat: AiScript専用のMFM構文`$[clickable.ev=EVENTNAME ...]`を追加。`Mk:C:mfm`のオプション`onClickEv`に関数を渡すと、クリック時に`EVENTNAME`を引数にして呼び出す
+- Fix: `fg`/`bg`MFMに長い単語を指定すると、オーバーフローされずはみ出る問題を修正
### Server
- Enhance: センシティブワードの設定がハッシュタグトレンドにも適用されるようになりました
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 3e72b64799..650c79dff7 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -242,13 +242,13 @@ export default function(props: MfmProps, context: SetupContext<MfmEvents>) {
case 'fg': {
let color = token.props.args.color;
if (!/^[0-9a-f]{3,6}$/i.test(color)) color = 'f00';
- style = `color: #${color};`;
+ style = `color: #${color}; overflow-wrap: anywhere;`;
break;
}
case 'bg': {
let color = token.props.args.color;
if (!/^[0-9a-f]{3,6}$/i.test(color)) color = 'f00';
- style = `background-color: #${color};`;
+ style = `background-color: #${color}; overflow-wrap: anywhere;`;
break;
}
case 'ruby': {