Skip to content

🔧 refactor(Lightbox.tsx): optimize navigation and link handling in Lightbox component #932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2024
Merged

🔧 refactor(Lightbox.tsx): optimize navigation and link handling in Lightbox component #932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 17 additions & 23 deletions src/pages/Insights/Collection/Lightbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import styled from 'styled-components';
import { ReactComponent as ExternalLinkIcon } from 'src/assets/icons/external-link-icon.svg';
import { ReactComponent as LinkIcon } from 'src/assets/icons/link-stroke.svg';
import { useLocalizeRoute } from 'src/hooks/useLocalizedRoute';
import { useLocation, useNavigate, useParams } from 'react-router-dom';
import { Link, useParams } from 'react-router-dom';
import { useFormikContext } from 'formik';
import { getDeviceIcon } from 'src/common/components/BugDetail/Meta';
import { InsightFormValues } from '../FormProvider';
Expand Down Expand Up @@ -74,9 +74,7 @@ export const LightboxContainer = ({
const videoRef = useRef<HTMLVideoElement | null>(null);
const { addToast } = useToast();
const { values, setFieldValue } = useFormikContext<InsightFormValues>();
const navigate = useNavigate();
const location = useLocation();
const observationUrl = useLocalizeRoute(
const observationRoute = useLocalizeRoute(
`campaigns/${campaignId}/videos/${observation.mediaId}#observation-${observation.id}`
);

Expand All @@ -94,17 +92,11 @@ export const LightboxContainer = ({
vid: observation.mediaId.toString(),
});

const navigateToObs = () => {
navigate(observationUrl, {
state: { from: location.pathname },
});
};

const copyLink = useCallback(
(event: React.MouseEvent) => {
event.stopPropagation();
navigator.clipboard.writeText(
`${window.location.origin}${observationUrl}`
`${window.location.origin}${observationRoute}`
);
addToast(
({ close }) => (
Expand Down Expand Up @@ -202,18 +194,20 @@ export const LightboxContainer = ({
</Span>
</SM>
<StyledPipe />
<Tooltip
type="light"
size="small"
placement="auto"
content={t(
'__INSIGHTS_COLLECTION_OBSERVATION_CARD_LIGHTBOX_OPEN_OBSERVATION_LINK'
)}
>
<IconButton onClick={navigateToObs}>
<ExternalLinkIcon />
</IconButton>
</Tooltip>
<Link to={observationRoute}>
<Tooltip
type="light"
size="small"
placement="auto"
content={t(
'__INSIGHTS_COLLECTION_OBSERVATION_CARD_LIGHTBOX_OPEN_OBSERVATION_LINK'
)}
>
<IconButton>
<ExternalLinkIcon />
</IconButton>
</Tooltip>
</Link>
</DetailsHeader>
<Label>
{t(
Expand Down