matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip hooks migration

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-10-02 12:17:49 +02:00
parent ae3d98505e
commit bed3eadd2c
7 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/pl-fe/src/features/compose/components/reply-group-indicator.tsx
View File

@@ -1,10 +1,10 @@
import { useStatus } from 'pl-fe/pl-hooks/hooks/statuses/useStatus';
import React, { useCallback } from 'react';
import { FormattedMessage } from 'react-intl';
import Link from 'pl-fe/components/link';
import { Text } from 'pl-fe/components/ui';
import { useAppSelector } from 'pl-fe/hooks';
import { makeGetStatus } from 'pl-fe/selectors';
import { useCompose } from 'pl-fe/hooks';
interface IReplyGroupIndicator {
composeId: string;
@@ -13,9 +13,9 @@ interface IReplyGroupIndicator {
const ReplyGroupIndicator = (props: IReplyGroupIndicator) => {
const { composeId } = props;
const getStatus = useCallback(makeGetStatus(), []);
const inReplyTo = useCompose(composeId).in_reply_to!;
const status = useAppSelector((state) => getStatus(state, { id: state.compose.get(composeId)?.in_reply_to! }));
const { data: status } = useStatus(inReplyTo);
const group = status?.group;
if (!group) {

18
packages/pl-fe/src/features/status/index.tsx
View File

@@ -1,4 +1,5 @@
import React, { useCallback, useEffect, useState } from 'react';
import { useStatus } from 'pl-fe/pl-hooks/hooks/statuses/useStatus';
import React, { useEffect, useState } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import { Redirect } from 'react-router-dom';
@@ -7,8 +8,7 @@ import MissingIndicator from 'pl-fe/components/missing-indicator';
import PullToRefresh from 'pl-fe/components/pull-to-refresh';
import { Column, Stack } from 'pl-fe/components/ui';
import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status';
import { useAppDispatch, useAppSelector, useLoggedIn } from 'pl-fe/hooks';
import { makeGetStatus } from 'pl-fe/selectors';
import { useAppDispatch, useLoggedIn } from 'pl-fe/hooks';
import Thread from './components/thread';
import ThreadLoginCta from './components/thread-login-cta';
@@ -45,10 +45,12 @@ const StatusDetails: React.FC<IStatusDetails> = (props) => {
const intl = useIntl();
const { isLoggedIn } = useLoggedIn();
const getStatus = useCallback(makeGetStatus(), []);
const status = useAppSelector((state) => getStatus(state, { id: props.params.statusId }));
const statusQuery = useStatus(props.params.statusId);
const [isLoaded, setIsLoaded] = useState<boolean>(!!status);
const status = statusQuery.data;
const isLoaded = statusQuery.isSuccess;
// const [isLoaded, setIsLoaded] = useState<boolean>(!!status);
/** Fetch the status (and context) from the API. */
const fetchData = () => {
@@ -60,9 +62,9 @@ const StatusDetails: React.FC<IStatusDetails> = (props) => {
// Load data.
useEffect(() => {
fetchData().then(() => {
setIsLoaded(true);
// setIsLoaded(true);
}).catch(() => {
setIsLoaded(true);
// setIsLoaded(true);
});
}, [props.params.statusId]);