Browse Source

Merge pull request #941 from qtchaos/fix-download

Fix media download button redirecting to incorrect URL on main tab
pull/942/head
William Oldham 1 year ago committed by GitHub
parent
commit
02fceb7f8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 10
      src/components/buttons/Button.tsx

10
src/components/buttons/Button.tsx

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
import classNames from "classnames";
import { ReactNode, useCallback } from "react";
import { useNavigate } from "react-router-dom";
import { Icon, Icons } from "@/components/Icon";
import { Spinner } from "@/components/layout/Spinner";
@ -21,7 +20,6 @@ interface Props { @@ -21,7 +20,6 @@ interface Props {
}
export function Button(props: Props) {
const navigate = useNavigate();
const { onClick, href, loading } = props;
const cb = useCallback(
(
@ -31,10 +29,12 @@ export function Button(props: Props) { @@ -31,10 +29,12 @@ export function Button(props: Props) {
>,
) => {
if (loading) return;
if (href && !onClick) navigate(href);
else onClick?.(event);
if (href && !onClick) {
event.preventDefault();
window.open(href, "_blank", "noreferrer");
} else onClick?.(event);
},
[onClick, href, navigate, loading],
[onClick, href, loading],
);
let colorClasses = "bg-white hover:bg-gray-200 text-black";

Loading…
Cancel
Save