diff --git a/app/javascript/mastodon/components/hashtag.tsx b/app/javascript/mastodon/components/hashtag.tsx index f3d5cc1f2e1..30c20e0abde 100644 --- a/app/javascript/mastodon/components/hashtag.tsx +++ b/app/javascript/mastodon/components/hashtag.tsx @@ -151,7 +151,7 @@ export const Hashtag: React.FC = ({ 0)} + data={history ?? Array.from(Array(7)).map(() => 0)} > diff --git a/app/javascript/mastodon/components/icon_button.tsx b/app/javascript/mastodon/components/icon_button.tsx index e38e3877128..179df83627a 100644 --- a/app/javascript/mastodon/components/icon_button.tsx +++ b/app/javascript/mastodon/components/icon_button.tsx @@ -149,6 +149,7 @@ export class IconButton extends PureComponent { onClick={this.handleClick} onMouseDown={this.handleMouseDown} onKeyDown={this.handleKeyDown} + // eslint-disable-next-line @typescript-eslint/no-deprecated onKeyPress={this.handleKeyPress} style={style} tabIndex={tabIndex} diff --git a/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts b/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts index 806a3f89274..8eeb457055a 100644 --- a/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts +++ b/app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts @@ -8,14 +8,15 @@ import type { Search, ShortCodesToEmojiData } from './emoji_compressed'; import emojiCompressed from './emoji_compressed'; import { unicodeToUnifiedName } from './unicode_to_unified_name'; -type Emojis = { - [key in NonNullable]: { +type Emojis = Record< + NonNullable, + { native: BaseEmoji['native']; search: Search; short_names: Emoji['short_names']; unified: Emoji['unified']; - }; -}; + } +>; const [ shortCodesToEmojiData, diff --git a/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts b/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts index d116c6c62c8..adf4e2bb7b8 100644 --- a/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts +++ b/app/javascript/mastodon/features/emoji/emoji_unicode_mapping_light.ts @@ -9,12 +9,13 @@ import type { import emojiCompressed from './emoji_compressed'; import { unicodeToFilename } from './unicode_to_filename'; -type UnicodeMapping = { - [key in FilenameData[number][0]]: { +type UnicodeMapping = Record< + FilenameData[number][0], + { shortCode: ShortCodesToEmojiDataKey; filename: FilenameData[number][number]; - }; -}; + } +>; const [ shortCodesToEmojiData, diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx b/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx index 3f0525fe575..cb03d38847a 100644 --- a/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx +++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx @@ -17,7 +17,7 @@ export const ColumnSettings: React.FC = () => { const dispatch = useAppDispatch(); const onChange = useCallback( - (key: string, checked: boolean) => { + (key: string[], checked: boolean) => { dispatch(changeSetting(['home', ...key], checked)); }, [dispatch], diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.tsx b/app/javascript/mastodon/features/ui/components/embed_modal.tsx index 8f623e62b52..b78d5b64c4f 100644 --- a/app/javascript/mastodon/features/ui/components/embed_modal.tsx +++ b/app/javascript/mastodon/features/ui/components/embed_modal.tsx @@ -101,6 +101,7 @@ const EmbedModal: React.FC<{ />