spotifyControls: make title/artists of local tracks unclickable (#201)

Co-authored-by: Vendicated <vendicated@riseup.net>

src/components/Link.tsx

@@ -18,19 +18,18 @@
 
 import { React } from "../webpack/common";
 
-interface Props {
+interface Props extends React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement> {
-    href: string;
     disabled?: boolean;
-    style?: React.CSSProperties;
 }
 
 export function Link(props: React.PropsWithChildren<Props>) {
     if (props.disabled) {
         props.style ??= {};
         props.style.pointerEvents = "none";
+        props["aria-disabled"] = true;
     }
     return (
-        <a href={props.href} target="_blank" style={props.style}>
+        <a role="link" target="_blank" {...props}>
             {props.children}
         </a>
     );

src/plugins/spotifyControls/PlayerComponent.tsx

@@ -18,6 +18,7 @@
 
 import ErrorBoundary from "../../components/ErrorBoundary";
 import { Flex } from "../../components/Flex";
+import { Link } from "../../components/Link";
 import { debounce } from "../../utils/debounce";
 import { classes, LazyComponent, lazyWebpack } from "../../utils/misc";
 import { ContextMenu, FluxDispatcher, Forms, Menu, React } from "../../webpack/common";
@@ -262,28 +263,33 @@ function Info({ track }: { track: Track; }) {
                     variant="text-sm/semibold"
                     id={cl("song-title")}
                     className={cl("ellipoverflow")}
+                    role={track.id ? "link" : undefined}
                     title={track.name}
-                    onClick={() => SpotifyStore.openExternal(`/track/${track.id}`)}
+                    onClick={track.id ? () => {
+                        SpotifyStore.openExternal(`/track/${track.id}`);
+                    } : void 0}
                 >
                     {track.name}
                 </Forms.FormText>
+                {track.artists.some(a => a.name) && (
                     <Forms.FormText variant="text-sm/normal" className={cl("ellipoverflow")}>
                         by&nbsp;
                         {track.artists.map((a, i) => (
-                        <React.Fragment key={a.id}>
+                            <React.Fragment key={a.name}>
-                            <a
+                                <Link
                                     className={cl("artist")}
+                                    disabled={!a.id}
                                     href={`https://open.spotify.com/artist/${a.id}`}
-                                target="_blank"
                                     style={{ fontSize: "inherit" }}
                                     title={a.name}
                                 >
                                     {a.name}
-                            </a>
+                                </Link>
                                 {i !== track.artists.length - 1 && <span className={cl("comma")}>{", "}</span>}
                             </React.Fragment>
                         ))}
                     </Forms.FormText>
+                )}
                 {track.album.name && (
                     <Forms.FormText variant="text-sm/normal" className={cl("ellipoverflow")}>
                         on&nbsp;
@@ -308,7 +314,7 @@ export function Player() {
         [SpotifyStore],
         () => SpotifyStore.track,
         null,
-        (prev, next) => prev?.id === next?.id
+        (prev, next) => prev?.id ? (prev.id === next?.id) : prev?.name === next?.name
     );
 
     const device = useStateFromStores(

src/plugins/spotifyControls/styles.css

@@ -121,7 +121,7 @@
 
 .vc-spotify-artist:hover,
 #vc-spotify-album-title:hover,
-#vc-spotify-song-title:hover {
+#vc-spotify-song-title[role="link"]:hover {
     text-decoration: underline;
     cursor: pointer;
 }