mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-05 01:55:36 +02:00
refactor(frontend): フロントエンドの型エラー解消(途中まで) (#16539)
* fix(frontend): FormLinkをボタンとして使用した際にエラーが出る問題を修正 * refactor(frontend): フロントエンドの型エラー解消 * remove unused ts-expect-error * migrate * remove unrelated changes * fix lint * more type fixes
This commit is contained in:
@@ -36,7 +36,7 @@ export async function getTheme(mode: 'light' | 'dark', getName = false): Promise
|
||||
_res = deepClone(theme.codeHighlighter.overrides);
|
||||
} else {
|
||||
const base = await bundledThemesInfo.find(t => t.id === theme.codeHighlighter!.base)?.import() ?? darkPlus;
|
||||
_res = deepMerge(theme.codeHighlighter.overrides ?? {}, 'default' in base ? base.default : base);
|
||||
_res = deepMerge<ThemeRegistration>(theme.codeHighlighter.overrides ?? {}, 'default' in base ? base.default : base);
|
||||
}
|
||||
if (_res.name == null) {
|
||||
_res.name = theme.id;
|
||||
|
||||
@@ -130,11 +130,11 @@ type GetItemType<Item extends FormItem> =
|
||||
: Item extends RadioFormItem
|
||||
? GetRadioItemType<Item>
|
||||
: Item extends RangeFormItem
|
||||
? NonNullableIfRequired<InferDefault<RangeFormItem, number>, Item>
|
||||
? NonNullableIfRequired<InferDefault<Item, number>, Item>
|
||||
: Item extends EnumFormItem
|
||||
? GetEnumItemType<Item>
|
||||
: Item extends ArrayFormItem
|
||||
? NonNullableIfRequired<InferDefault<ArrayFormItem, unknown[]>, Item>
|
||||
? NonNullableIfRequired<InferDefault<Item, unknown[]>, Item>
|
||||
: Item extends ObjectFormItem
|
||||
? NonNullableIfRequired<InferDefault<Item, Record<string, unknown>>, Item>
|
||||
: Item extends DriveFileFormItem
|
||||
|
||||
@@ -289,7 +289,6 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
|
||||
caseSensitive: antenna.caseSensitive,
|
||||
withReplies: antenna.withReplies,
|
||||
withFile: antenna.withFile,
|
||||
notify: antenna.notify,
|
||||
});
|
||||
antennasCache.delete();
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user