Skip to content

Ensure consistent download file name on download from ImageView #29913

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 2 commits into from
May 12, 2025
Merged

Ensure consistent download file name on download from ImageView #29913

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4411d2
Ensure consistent download file name on download from ImageView
t3chguy May 9, 2025
fb6649c
Ensure consistent download file name on download from ImageView
t3chguy May 9, 2025
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
18 changes: 14 additions & 4 deletions src/components/views/elements/ImageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/

import React, { type JSX, createRef, type CSSProperties, useRef, useState } from "react";
import React, { type JSX, createRef, type CSSProperties, useRef, useState, useMemo } from "react";
import FocusLock from "react-focus-lock";
import { type MatrixEvent, parseErrorResponse } from "matrix-js-sdk/src/matrix";

Expand All @@ -33,6 +33,7 @@ import AccessibleButton from "./AccessibleButton";
import Modal from "../../../Modal";
import ErrorDialog from "../dialogs/ErrorDialog";
import { FileDownloader } from "../../../utils/FileDownloader";
import { MediaEventHelper } from "../../../utils/MediaEventHelper.ts";

// Max scale to keep gaps around the image
const MAX_SCALE = 0.95;
Expand Down Expand Up @@ -549,7 +550,7 @@ export default class ImageView extends React.Component<IProps, IState> {
title={_t("lightbox|rotate_right")}
onClick={this.onRotateClockwiseClick}
/>
<DownloadButton url={this.props.src} fileName={this.props.name} />
<DownloadButton url={this.props.src} fileName={this.props.name} mxEvent={this.props.mxEvent} />
{contextMenuButton}
<AccessibleButton
className="mx_ImageView_button mx_ImageView_button_close"
Expand Down Expand Up @@ -582,10 +583,19 @@ export default class ImageView extends React.Component<IProps, IState> {
}
}

function DownloadButton({ url, fileName }: { url: string; fileName?: string }): JSX.Element {
function DownloadButton({
url,
fileName,
mxEvent,
}: {
url: string;
fileName?: string;
mxEvent?: MatrixEvent;
}): JSX.Element {
const downloader = useRef(new FileDownloader()).current;
const [loading, setLoading] = useState(false);
const blobRef = useRef<Blob>(undefined);
const mediaEventHelper = useMemo(() => (mxEvent ? new MediaEventHelper(mxEvent) : undefined), [mxEvent]);

function showError(e: unknown): void {
Modal.createDialog(ErrorDialog, {
Expand Down Expand Up @@ -625,7 +635,7 @@ function DownloadButton({ url, fileName }: { url: string; fileName?: string }):
async function downloadBlob(blob: Blob): Promise<void> {
await downloader.download({
blob,
name: fileName ?? _t("common|image"),
name: mediaEventHelper?.fileName ?? fileName ?? _t("common|image"),
});
setLoading(false);
}
Expand Down
Loading