Use React Router hook for 'history'

This commit is contained in:
Justin
2022-03-22 08:42:26 -04:00
parent 12ed6889a4
commit 40cc960985
12 changed files with 54 additions and 89 deletions

View File

@@ -1,11 +1,11 @@
import React from 'react';
import { RouteComponentProps, withRouter } from 'react-router-dom';
import { useHistory } from 'react-router-dom';
import Helmet from 'soapbox/components/helmet';
import { Card, CardBody, CardHeader, CardTitle } from '../card/card';
interface IColumn extends RouteComponentProps {
interface IColumn {
backHref?: string,
label?: string,
transparent?: boolean,
@@ -13,7 +13,9 @@ interface IColumn extends RouteComponentProps {
}
const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedRef<HTMLDivElement>): JSX.Element => {
const { backHref, children, label, history, transparent = false, withHeader = true } = props;
const { backHref, children, label, transparent = false, withHeader = true } = props;
const history = useHistory();
const handleBackClick = () => {
if (backHref) {
@@ -57,4 +59,4 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
);
});
export default withRouter(Column);
export default Column;

View File

@@ -7,7 +7,7 @@ import {
} from '@reach/tabs';
import classNames from 'classnames';
import * as React from 'react';
import { RouteComponentProps, withRouter } from 'react-router-dom';
import { useHistory } from 'react-router-dom';
import './tabs.css';
@@ -87,14 +87,16 @@ type Item = {
action?: () => void,
name: string
}
interface ITabs extends RouteComponentProps<any> {
interface ITabs {
items: Item[],
activeItem: string,
}
const Tabs = ({ items, activeItem, history }: ITabs) => {
const Tabs = ({ items, activeItem }: ITabs) => {
const defaultIndex = items.findIndex(({ name }) => name === activeItem);
const history = useHistory();
const onChange = (selectedIndex: number) => {
const item = items[selectedIndex];
@@ -130,4 +132,4 @@ const Tabs = ({ items, activeItem, history }: ITabs) => {
);
};
export default withRouter(Tabs);
export default Tabs;