Skip to content

Allow downloading plotly images #9234

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
Dec 20, 2019
Merged

Allow downloading plotly images #9234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7fb78
Allow downloading plotly images
DonJayamanne Dec 20, 2019
35f64d9
Oops
DonJayamanne Dec 20, 2019
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
4 changes: 2 additions & 2 deletions src/client/common/application/webPanels/webPanel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class WebPanel implements IWebPanel {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data: https: http: blob:; default-src 'unsafe-inline' 'unsafe-eval' vscode-resource: data: https: http:;">
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data: https: http: blob:; default-src 'unsafe-inline' 'unsafe-eval' vscode-resource: data: https: http: blob:;">
<meta name="theme-color" content="#000000">
<meta name="theme" content="${Identifiers.GeneratedThemeName}"/>
<title>React App</title>
Expand Down Expand Up @@ -167,7 +167,7 @@ export class WebPanel implements IWebPanel {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data: https: http: blob:; default-src 'unsafe-inline' 'unsafe-eval' vscode-resource: data: https: http:;">
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data: https: http: blob:; default-src 'unsafe-inline' 'unsafe-eval' vscode-resource: data: https: http: blob:;">
<meta name="theme-color" content="#000000">
<meta name="theme" content="${Identifiers.GeneratedThemeName}"/>
<title>React App</title>
Expand Down
2 changes: 1 addition & 1 deletion src/client/common/application/webPanels/webPanelServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export class WebPanelServer {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data: https: http: blob:; default-src 'unsafe-inline' 'unsafe-eval' vscode-resource: data: https: http:;">
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data: https: http: blob:; default-src 'unsafe-inline' 'unsafe-eval' vscode-resource: data: https: http: blob:;">
<meta name="theme-color" content="#000000">
<meta name="theme" content="${Identifiers.GeneratedThemeName}"/>
<title>React App</title>
Expand Down
24 changes: 23 additions & 1 deletion src/datascience-ui/interactive-common/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,30 @@ export function handleLinkClick(ev: MouseEvent, linkClick: (href: string) => voi
anchor = inner[0];
}
}
if (anchor && anchor.href && !anchor.href.startsWith('vscode')) {
if (!anchor || !anchor.href || anchor.href.startsWith('vscode')) {
return;
}
if (!anchor.href.startsWith('blob:')) {
linkClick(anchor.href);
}

// We an have an image (as a blob) and the reference is blob://null:<someguid>
// We need to get the blob, for that make a http request and the response will be the Blob
// Next convert the blob into something that can be sent to the client side.
// Just send an inlined base64 image to `linkClick`, such as `data:image/png;base64,xxxxx`
const xhr = new XMLHttpRequest();
xhr.open('GET', anchor.href, true);
xhr.responseType = 'blob';
xhr.onload = () => {
const blob = xhr.response;
const reader = new FileReader();
reader.readAsDataURL(blob);
reader.onload = () => {
if (typeof reader.result === 'string'){
linkClick(reader.result);
}
};
};
xhr.send();
}
}
2 changes: 1 addition & 1 deletion src/datascience-ui/native-editor/nativeCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export class NativeCell extends React.Component<INativeCellProps> {
private onMouseClick = (ev: React.MouseEvent<HTMLDivElement>) => {
if (ev.nativeEvent.target) {
const elem = ev.nativeEvent.target as HTMLElement;
if (!elem.className.includes('image-button')) {
if (!elem.className.includes || !elem.className.includes('image-button')) {
// Not a click on an button in a toolbar, select the cell.
ev.stopPropagation();
this.lastKeyPressed = undefined;
Expand Down