Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-27 21:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Convert <ColumnHeader> to Typescript

Browse Source 
Port 3939352e92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Eugen Rochko
2024-06-26 21:46:28 +02:00
committed by Claire
parent 8160a655a5
commit d612daee97
4 changed files with 311 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/flavours/glitch/features/directory/index.tsx
View File

@@ -14,9 +14,12 @@ import {
moveColumn,
changeColumnParams,
} from 'flavours/glitch/actions/columns';
import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
import {
fetchDirectory,
expandDirectory,
} from 'flavours/glitch/actions/directory';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
import { ColumnHeader } from 'flavours/glitch/components/column_header';
import { LoadMore } from 'flavours/glitch/components/load_more';
import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import { RadioButton } from 'flavours/glitch/components/radio_button';
@@ -86,7 +89,7 @@ export const Directory: React.FC<{
}, [dispatch, order, local]);
const handleMove = useCallback(
(dir: string) => {
(dir: number) => {
dispatch(moveColumn(columnId, dir));
},
[dispatch, columnId],
@@ -185,7 +188,6 @@ export const Directory: React.FC<{
label={intl.formatMessage(messages.title)}
>
<ColumnHeader
// @ts-expect-error ColumnHeader is not properly typed yet
icon='address-book-o'
iconComponent={PeopleIcon}
title={intl.formatMessage(messages.title)}

11
app/javascript/flavours/glitch/features/ui/components/column_loading.tsx
View File

@@ -1,11 +1,8 @@
import Column from '../../../components/column';
import ColumnHeader from '../../../components/column_header';
import Column from 'flavours/glitch/components/column';
import { ColumnHeader } from 'flavours/glitch/components/column_header';
import type { Props as ColumnHeaderProps } from 'flavours/glitch/components/column_header';
interface Props {
multiColumn?: boolean;
}
export const ColumnLoading: React.FC<Props> = (otherProps) => (
export const ColumnLoading: React.FC<ColumnHeaderProps> = (otherProps) => (
<Column>
<ColumnHeader {...otherProps} />
<div className='scrollable' />