jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ui: fix cmd click on sess play icon (new tab)

Browse source
This commit is contained in:
nick-delirium 2024-04-26 14:54:23 +02:00
parent b789496a3a
commit 336084a9f3
No known key found for this signature in database
GPG key ID: 93ABD695DF5FDBA0
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx
View file

@ -13,13 +13,13 @@ const PLAY_ICON_NAMES = {
notPlayed: 'play-fill',
played: 'play-circle-light',
hovered: 'play-hover',
};
} as const
const getDefaultIconName = (isViewed: any) =>
!isViewed ? PLAY_ICON_NAMES.notPlayed : PLAY_ICON_NAMES.played;
interface Props {
isAssist: boolean;
isAssist?: boolean;
viewed: boolean;
sessionId: string;
onClick?: () => void;
@ -35,7 +35,7 @@ function PlayLink(props: Props) {
const defaultIconName = getDefaultIconName(viewed);
const [isHovered, toggleHover] = useState(false);
const [iconName, setIconName] = useState(defaultIconName);
const [iconName, setIconName] = useState<typeof PLAY_ICON_NAMES[keyof typeof PLAY_ICON_NAMES]>(defaultIconName);
useEffect(() => {
if (isHovered) setIconName(PLAY_ICON_NAMES.hovered);
@ -46,12 +46,21 @@ function PlayLink(props: Props) {
? liveSessionRoute(sessionId, queryParams)
: sessionRoute(sessionId);
const handleBeforeOpen = () => {
const handleBeforeOpen = (e: any) => {
const replayLink = withSiteId(
link + (props.query ? props.query : ''),
props.siteId
);
if (props.beforeOpen) {
props.beforeOpen();
history.push(
withSiteId(link + (props.query ? props.query : ''), props.siteId)
);
// check for ctrl or shift
if (e.ctrlKey || e.shiftKey || e.metaKey) {
e.preventDefault();
return window.open(replayLink, '_blank');
} else {
e.preventDefault();
props.beforeOpen();
history.push(replayLink);
}
}
};

4
frontend/app/components/shared/SessionItem/SessionItem.tsx
View file

@ -196,7 +196,7 @@ function SessionItem(props: RouteComponentProps & Props) {
console.error('Error while prefetching first mob', e);
}
};
const openSession = () => {
const populateData = () => {
if (
props.live
|| isAssist
@ -430,7 +430,7 @@ function SessionItem(props: RouteComponentProps & Props) {
onClick={onClick}
queryParams={queryParams}
query={query}
beforeOpen={props.live || isAssist ? undefined : openSession}
beforeOpen={props.live || isAssist ? undefined : populateData}
/>
{bookmarked && (
<div className="ml-2 cursor-pointer">