Lazyload#2454

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

Closed
nicolaskruchten wants to merge 5 commits into from
Closed

Lazyload #2454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4f726e
Added lazy loading to jupyterlab-plotly
pragyagarg642 Mar 10, 2020
1783857
Added lazy loading to plotlywidget
pragyagarg642 Mar 31, 2020
3662e90
Resolving merge conflicts
pragyagarg642 Apr 15, 2020
79b8066
wip
nicolaskruchten Apr 30, 2020
adda7ef
wip
nicolaskruchten May 9, 2020
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
140 changes: 75 additions & 65 deletions packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
* The CSS class to add to the Plotly Widget.
*/
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
* The CSS class for a Plotly icon.
*/
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
* The MIME type for Plotly.
* The version of this follows the major version of Plotly.
*/
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
data: Plotly.Data;
layout: Plotly.Layout;
frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
/**
* Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
this._mimeType = options.mimeType;

// Create image element
this._img_el = <HTMLImageElement>(document.createElement("img"));
this._img_el.className = 'plot-img';
this._img_el = <HTMLImageElement>document.createElement("img");
this._img_el.className = "plot-img";
this.node.appendChild(this._img_el);

// Install image hover callback
this._img_el.addEventListener('mouseenter', event => {
this.createGraph(this._model);
})
import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
(Plotly) => {
this._img_el.addEventListener("mouseenter", (event) => {
this.createGraph(this._model, Plotly);
});
}
);
}

/**
* Render Plotly into this widget's node.
*/
renderModel(model: IRenderMime.IMimeModel): Promise<void> {

if (this.hasGraphElement()) {
// We already have a graph, don't overwrite it
return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
this._model = model;

// Check for PNG data in mime bundle
const png_data = <string>model.data['image/png'];
if(png_data !== undefined && png_data !== null) {
const png_data = <string>model.data["image/png"];
if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
} else {
// Create a new graph
return this.createGraph(model);
return import(
/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
).then((Plotly) => {
this.createGraph(model, Plotly);
});
}
}

private hasGraphElement() {
// Check for the presence of the .plot-container element that plotly.js
// places at the top of the figure structure
return this.node.querySelector('.plot-container') !== null
return this.node.querySelector(".plot-container") !== null;
}

private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

private hideGraph() {
// Hide the graph if there is one
let el = <HTMLDivElement>this.node.querySelector('.plot-container');
let el = <HTMLDivElement>this.node.querySelector(".plot-container");
if (el !== null && el !== undefined) {
el.style.display = "none"
el.style.display = "none";
}
}

private showGraph() {
// Show the graph if there is one
let el = <HTMLDivElement>this.node.querySelector('.plot-container');
let el = <HTMLDivElement>this.node.querySelector(".plot-container");
if (el !== null && el !== undefined) {
el.style.display = "block"
el.style.display = "block";
}
}

private hideImage() {
// Hide the image element
let el = <HTMLImageElement>this.node.querySelector('.plot-img');
let el = <HTMLImageElement>this.node.querySelector(".plot-img");
if (el !== null && el !== undefined) {
el.style.display = "none"
el.style.display = "none";
}
}

private showImage() {
// Show the image element
let el = <HTMLImageElement>this.node.querySelector('.plot-img');
let el = <HTMLImageElement>this.node.querySelector(".plot-img");
if (el !== null && el !== undefined) {
el.style.display = "block"
el.style.display = "block";
}
}

private createGraph(model: IRenderMime.IMimeModel) {
private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
const { data, layout, frames, config } = model.data[this._mimeType] as
| any
| IPlotlySpec;
| { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
| { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

return Plotly.react(this.node, data, layout, config).then(plot => {
return Plotly.react(this.node, data, layout, config).then((plot: any) => {
this.showGraph();
this.hideImage();
this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
}
if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
Plotly.toImage(plot, {
format: 'png',
format: "png",
width: this.node.offsetWidth,
height: this.node.offsetHeight
height: this.node.offsetHeight,
}).then((url: string) => {
const imageData = url.split(',')[1];
if (model.data['image/png'] !== imageData) {
const imageData = url.split(",")[1];
if (model.data["image/png"] !== imageData) {
model.setData({
data: {
...model.data,
'image/png': imageData
}
"image/png": imageData,
},
});
}
});
}

// Handle webgl context lost events
(<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
(<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
});
}

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
*/
protected onUpdateRequest(msg: Message): void {
if (this.isVisible && this.hasGraphElement()) {
Plotly.redraw(this.node).then(() => {
Plotly.Plots.resize(this.node);
});
import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
(Plotly) => {
Plotly.redraw(this.node).then(() => {
Plotly.Plots.resize(this.node);
});
}
);
}
}

private _mimeType: string;
private _img_el: HTMLImageElement;
private _model: IRenderMime.IMimeModel
private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
safe: true,
mimeTypes: [MIME_TYPE],
createRenderer: options => new RenderedPlotly(options)
createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
{
id: '@jupyterlab/plotly-extension:factory',
id: "@jupyterlab/plotly-extension:factory",
rendererFactory,
rank: 0,
dataType: 'json',
dataType: "json",
fileTypes: [
{
name: 'plotly',
name: "plotly",
mimeTypes: [MIME_TYPE],
extensions: ['.plotly', '.plotly.json'],
iconClass: CSS_ICON_CLASS
}
extensions: [".plotly", ".plotly.json"],
iconClass: CSS_ICON_CLASS,
},
],
documentWidgetFactoryOptions: {
name: 'Plotly',
primaryFileType: 'plotly',
fileTypes: ['plotly', 'json'],
defaultFor: ['plotly']
}
}
name: "Plotly",
primaryFileType: "plotly",
fileTypes: ["plotly", "json"],
defaultFor: ["plotly"],
},
},
];

export default extensions;
6 changes: 3 additions & 3 deletions packages/javascript/jupyterlab-plotly/src/lib.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
export * from "plotly.js";
export type Frame = { [key: string]: any };
export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
export function animate(root: Plotly.Root): void;

export interface PlotlyHTMLElement extends HTMLElement {
on(event: 'plotly_webglcontextlost', callback: () => void): void;
on(event: "plotly_webglcontextlost", callback: () => void): void;
}
}
2 changes: 1 addition & 1 deletion packages/javascript/jupyterlab-plotly/tsconfig.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"noUnusedLocals": true,
"esModuleInterop": true,
"preserveWatchOutput": true,
"module": "commonjs",
"module": "esnext",
"moduleResolution": "node",
"target": "es2015",
"lib": ["dom", "es2015"],
Expand Down
2 changes: 1 addition & 1 deletion packages/javascript/plotlywidget/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
],
"scripts": {
"build": "webpack",
"clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
"clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
"test": "echo \"Error: no test specified\" && exit 1"
},
"devDependencies": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Lazyload#2454

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

 Closed

nicolaskruchten
wants to merge
5
commits into

from

 Closed


Lazyload
#2454
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
f4f726e

Added lazy loading to jupyterlab-plotly


pragyagarg642 Mar 10, 2020
1783857

Added lazy loading to plotlywidget


pragyagarg642 Mar 31, 2020
3662e90

Resolving merge conflicts


pragyagarg642 Apr 15, 2020
79b8066

wip


nicolaskruchten Apr 30, 2020
adda7ef

wip


nicolaskruchten May 9, 2020

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


140 changes: 75 additions & 65 deletions
packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
 * The CSS class to add to the Plotly Widget.
 */
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
 * The CSS class for a Plotly icon.
 */
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
 * The MIME type for Plotly.
 * The version of this follows the major version of Plotly.
 */
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
 data: Plotly.Data;
 layout: Plotly.Layout;
 frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
 on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 /**
 * Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._mimeType = options.mimeType;

 // Create image element
 this._img_el = <HTMLImageElement>(document.createElement("img"));
 this._img_el.className = 'plot-img';
 this._img_el = <HTMLImageElement>document.createElement("img");
 this._img_el.className = "plot-img";
 this.node.appendChild(this._img_el);

 // Install image hover callback
 this._img_el.addEventListener('mouseenter', event => {
 this.createGraph(this._model);
 })
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 this._img_el.addEventListener("mouseenter", (event) => {
 this.createGraph(this._model, Plotly);
 });
 }
 );
 }

 /**
 * Render Plotly into this widget's node.
 */
 renderModel(model: IRenderMime.IMimeModel): Promise<void> {

 if (this.hasGraphElement()) {
 // We already have a graph, don't overwrite it
 return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._model = model;

 // Check for PNG data in mime bundle
 const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
 const png_data = <string>model.data["image/png"];
 if(png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 } else {
 // Create a new graph
 return this.createGraph(model);
 return import(
 /* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
 ).then((Plotly) => {
 this.createGraph(model, Plotly);
 });
 }
 }

 private hasGraphElement() {
 // Check for the presence of the .plot-container element that plotly.js
 // places at the top of the figure structure
 return this.node.querySelector('.plot-container') !== null
 return this.node.querySelector(".plot-container") !== null;
 }

 private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

 private hideGraph() {
 // Hide the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showGraph() {
 // Show the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private hideImage() {
 // Hide the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showImage() {
 // Show the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private createGraph(model: IRenderMime.IMimeModel) {
 private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
 const { data, layout, frames, config } = model.data[this._mimeType] as
 | any
 | IPlotlySpec;
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

 return Plotly.react(this.node, data, layout, config).then(plot => {
 return Plotly.react(this.node, data, layout, config).then((plot: any) => {
 this.showGraph();
 this.hideImage();
 this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 }
 if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
 Plotly.toImage(plot, {
 format: 'png',
 format: "png",
 width: this.node.offsetWidth,
 height: this.node.offsetHeight
 height: this.node.offsetHeight,
 }).then((url: string) => {
 const imageData = url.split(',')[1];
 if (model.data['image/png'] !== imageData) {
 const imageData = url.split(",")[1];
 if (model.data["image/png"] !== imageData) {
 model.setData({
 data: {
 ...model.data,
'image/png': imageData
 }
"image/png": imageData,
 },
 });
 }
 });
 }

 // Handle webgl context lost events
 (<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
 (<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
 const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 }
 });
 });
 }

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 */
 protected onUpdateRequest(msg: Message): void {
 if (this.isVisible && this.hasGraphElement()) {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 }
 );
 }
 }

 private _mimeType: string;
 private _img_el: HTMLImageElement;
 private _model: IRenderMime.IMimeModel
 private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
 safe: true,
 mimeTypes: [MIME_TYPE],
 createRenderer: options => new RenderedPlotly(options)
 createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
 {
 id: '@jupyterlab/plotly-extension:factory',
 id: "@jupyterlab/plotly-extension:factory",
 rendererFactory,
 rank: 0,
 dataType: 'json',
 dataType: "json",
 fileTypes: [
 {
 name: 'plotly',
 name: "plotly",
 mimeTypes: [MIME_TYPE],
 extensions: ['.plotly', '.plotly.json'],
 iconClass: CSS_ICON_CLASS
 }
 extensions: [".plotly", ".plotly.json"],
 iconClass: CSS_ICON_CLASS,
 },
 ],
 documentWidgetFactoryOptions: {
 name: 'Plotly',
 primaryFileType: 'plotly',
 fileTypes: ['plotly', 'json'],
 defaultFor: ['plotly']
 }
 }
 name: "Plotly",
 primaryFileType: "plotly",
 fileTypes: ["plotly", "json"],
 defaultFor: ["plotly"],
 },
 },
];

export default extensions;

6 changes: 3 additions & 3 deletions
packages/javascript/jupyterlab-plotly/src/lib.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
 export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
 export * from "plotly.js";
 export type Frame = { [key: string]: any };
 export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
 export function animate(root: Plotly.Root): void;

 export interface PlotlyHTMLElement extends HTMLElement {
 on(event: 'plotly_webglcontextlost', callback: () => void): void;
 on(event: "plotly_webglcontextlost", callback: () => void): void;
 }
}

2 changes: 1 addition & 1 deletion
packages/javascript/jupyterlab-plotly/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 "noUnusedLocals": true,
 "esModuleInterop": true,
 "preserveWatchOutput": true,
 "module": "commonjs",
 "module": "esnext",
 "moduleResolution": "node",
 "target": "es2015",
 "lib": ["dom", "es2015"],
Expand Down

2 changes: 1 addition & 1 deletion
packages/javascript/plotlywidget/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 ],
 "scripts": {
 "build": "webpack",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
 "test": "echo \"Error: no test specified\" && exit 1"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Lazyload#2454

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

 Closed

nicolaskruchten
wants to merge
5
commits into

from

 Closed


Lazyload
#2454
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
f4f726e

Added lazy loading to jupyterlab-plotly


pragyagarg642 Mar 10, 2020
1783857

Added lazy loading to plotlywidget


pragyagarg642 Mar 31, 2020
3662e90

Resolving merge conflicts


pragyagarg642 Apr 15, 2020
79b8066

wip


nicolaskruchten Apr 30, 2020
adda7ef

wip


nicolaskruchten May 9, 2020

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


140 changes: 75 additions & 65 deletions
packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
 * The CSS class to add to the Plotly Widget.
 */
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
 * The CSS class for a Plotly icon.
 */
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
 * The MIME type for Plotly.
 * The version of this follows the major version of Plotly.
 */
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
 data: Plotly.Data;
 layout: Plotly.Layout;
 frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
 on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 /**
 * Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._mimeType = options.mimeType;

 // Create image element
 this._img_el = <HTMLImageElement>(document.createElement("img"));
 this._img_el.className = 'plot-img';
 this._img_el = <HTMLImageElement>document.createElement("img");
 this._img_el.className = "plot-img";
 this.node.appendChild(this._img_el);

 // Install image hover callback
 this._img_el.addEventListener('mouseenter', event => {
 this.createGraph(this._model);
 })
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 this._img_el.addEventListener("mouseenter", (event) => {
 this.createGraph(this._model, Plotly);
 });
 }
 );
 }

 /**
 * Render Plotly into this widget's node.
 */
 renderModel(model: IRenderMime.IMimeModel): Promise<void> {

 if (this.hasGraphElement()) {
 // We already have a graph, don't overwrite it
 return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._model = model;

 // Check for PNG data in mime bundle
 const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
 const png_data = <string>model.data["image/png"];
 if(png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 } else {
 // Create a new graph
 return this.createGraph(model);
 return import(
 /* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
 ).then((Plotly) => {
 this.createGraph(model, Plotly);
 });
 }
 }

 private hasGraphElement() {
 // Check for the presence of the .plot-container element that plotly.js
 // places at the top of the figure structure
 return this.node.querySelector('.plot-container') !== null
 return this.node.querySelector(".plot-container") !== null;
 }

 private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

 private hideGraph() {
 // Hide the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showGraph() {
 // Show the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private hideImage() {
 // Hide the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showImage() {
 // Show the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private createGraph(model: IRenderMime.IMimeModel) {
 private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
 const { data, layout, frames, config } = model.data[this._mimeType] as
 | any
 | IPlotlySpec;
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

 return Plotly.react(this.node, data, layout, config).then(plot => {
 return Plotly.react(this.node, data, layout, config).then((plot: any) => {
 this.showGraph();
 this.hideImage();
 this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 }
 if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
 Plotly.toImage(plot, {
 format: 'png',
 format: "png",
 width: this.node.offsetWidth,
 height: this.node.offsetHeight
 height: this.node.offsetHeight,
 }).then((url: string) => {
 const imageData = url.split(',')[1];
 if (model.data['image/png'] !== imageData) {
 const imageData = url.split(",")[1];
 if (model.data["image/png"] !== imageData) {
 model.setData({
 data: {
 ...model.data,
'image/png': imageData
 }
"image/png": imageData,
 },
 });
 }
 });
 }

 // Handle webgl context lost events
 (<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
 (<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
 const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 }
 });
 });
 }

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 */
 protected onUpdateRequest(msg: Message): void {
 if (this.isVisible && this.hasGraphElement()) {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 }
 );
 }
 }

 private _mimeType: string;
 private _img_el: HTMLImageElement;
 private _model: IRenderMime.IMimeModel
 private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
 safe: true,
 mimeTypes: [MIME_TYPE],
 createRenderer: options => new RenderedPlotly(options)
 createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
 {
 id: '@jupyterlab/plotly-extension:factory',
 id: "@jupyterlab/plotly-extension:factory",
 rendererFactory,
 rank: 0,
 dataType: 'json',
 dataType: "json",
 fileTypes: [
 {
 name: 'plotly',
 name: "plotly",
 mimeTypes: [MIME_TYPE],
 extensions: ['.plotly', '.plotly.json'],
 iconClass: CSS_ICON_CLASS
 }
 extensions: [".plotly", ".plotly.json"],
 iconClass: CSS_ICON_CLASS,
 },
 ],
 documentWidgetFactoryOptions: {
 name: 'Plotly',
 primaryFileType: 'plotly',
 fileTypes: ['plotly', 'json'],
 defaultFor: ['plotly']
 }
 }
 name: "Plotly",
 primaryFileType: "plotly",
 fileTypes: ["plotly", "json"],
 defaultFor: ["plotly"],
 },
 },
];

export default extensions;

6 changes: 3 additions & 3 deletions
packages/javascript/jupyterlab-plotly/src/lib.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
 export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
 export * from "plotly.js";
 export type Frame = { [key: string]: any };
 export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
 export function animate(root: Plotly.Root): void;

 export interface PlotlyHTMLElement extends HTMLElement {
 on(event: 'plotly_webglcontextlost', callback: () => void): void;
 on(event: "plotly_webglcontextlost", callback: () => void): void;
 }
}

2 changes: 1 addition & 1 deletion
packages/javascript/jupyterlab-plotly/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 "noUnusedLocals": true,
 "esModuleInterop": true,
 "preserveWatchOutput": true,
 "module": "commonjs",
 "module": "esnext",
 "moduleResolution": "node",
 "target": "es2015",
 "lib": ["dom", "es2015"],
Expand Down

2 changes: 1 addition & 1 deletion
packages/javascript/plotlywidget/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 ],
 "scripts": {
 "build": "webpack",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
 "test": "echo \"Error: no test specified\" && exit 1"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Lazyload#2454

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

 Closed

nicolaskruchten
wants to merge
5
commits into

from

 Closed


Lazyload
#2454
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
f4f726e

Added lazy loading to jupyterlab-plotly


pragyagarg642 Mar 10, 2020
1783857

Added lazy loading to plotlywidget


pragyagarg642 Mar 31, 2020
3662e90

Resolving merge conflicts


pragyagarg642 Apr 15, 2020
79b8066

wip


nicolaskruchten Apr 30, 2020
adda7ef

wip


nicolaskruchten May 9, 2020

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


140 changes: 75 additions & 65 deletions
packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
 * The CSS class to add to the Plotly Widget.
 */
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
 * The CSS class for a Plotly icon.
 */
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
 * The MIME type for Plotly.
 * The version of this follows the major version of Plotly.
 */
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
 data: Plotly.Data;
 layout: Plotly.Layout;
 frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
 on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 /**
 * Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._mimeType = options.mimeType;

 // Create image element
 this._img_el = <HTMLImageElement>(document.createElement("img"));
 this._img_el.className = 'plot-img';
 this._img_el = <HTMLImageElement>document.createElement("img");
 this._img_el.className = "plot-img";
 this.node.appendChild(this._img_el);

 // Install image hover callback
 this._img_el.addEventListener('mouseenter', event => {
 this.createGraph(this._model);
 })
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 this._img_el.addEventListener("mouseenter", (event) => {
 this.createGraph(this._model, Plotly);
 });
 }
 );
 }

 /**
 * Render Plotly into this widget's node.
 */
 renderModel(model: IRenderMime.IMimeModel): Promise<void> {

 if (this.hasGraphElement()) {
 // We already have a graph, don't overwrite it
 return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._model = model;

 // Check for PNG data in mime bundle
 const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
 const png_data = <string>model.data["image/png"];
 if(png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 } else {
 // Create a new graph
 return this.createGraph(model);
 return import(
 /* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
 ).then((Plotly) => {
 this.createGraph(model, Plotly);
 });
 }
 }

 private hasGraphElement() {
 // Check for the presence of the .plot-container element that plotly.js
 // places at the top of the figure structure
 return this.node.querySelector('.plot-container') !== null
 return this.node.querySelector(".plot-container") !== null;
 }

 private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

 private hideGraph() {
 // Hide the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showGraph() {
 // Show the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private hideImage() {
 // Hide the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showImage() {
 // Show the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private createGraph(model: IRenderMime.IMimeModel) {
 private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
 const { data, layout, frames, config } = model.data[this._mimeType] as
 | any
 | IPlotlySpec;
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

 return Plotly.react(this.node, data, layout, config).then(plot => {
 return Plotly.react(this.node, data, layout, config).then((plot: any) => {
 this.showGraph();
 this.hideImage();
 this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 }
 if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
 Plotly.toImage(plot, {
 format: 'png',
 format: "png",
 width: this.node.offsetWidth,
 height: this.node.offsetHeight
 height: this.node.offsetHeight,
 }).then((url: string) => {
 const imageData = url.split(',')[1];
 if (model.data['image/png'] !== imageData) {
 const imageData = url.split(",")[1];
 if (model.data["image/png"] !== imageData) {
 model.setData({
 data: {
 ...model.data,
'image/png': imageData
 }
"image/png": imageData,
 },
 });
 }
 });
 }

 // Handle webgl context lost events
 (<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
 (<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
 const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 }
 });
 });
 }

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 */
 protected onUpdateRequest(msg: Message): void {
 if (this.isVisible && this.hasGraphElement()) {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 }
 );
 }
 }

 private _mimeType: string;
 private _img_el: HTMLImageElement;
 private _model: IRenderMime.IMimeModel
 private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
 safe: true,
 mimeTypes: [MIME_TYPE],
 createRenderer: options => new RenderedPlotly(options)
 createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
 {
 id: '@jupyterlab/plotly-extension:factory',
 id: "@jupyterlab/plotly-extension:factory",
 rendererFactory,
 rank: 0,
 dataType: 'json',
 dataType: "json",
 fileTypes: [
 {
 name: 'plotly',
 name: "plotly",
 mimeTypes: [MIME_TYPE],
 extensions: ['.plotly', '.plotly.json'],
 iconClass: CSS_ICON_CLASS
 }
 extensions: [".plotly", ".plotly.json"],
 iconClass: CSS_ICON_CLASS,
 },
 ],
 documentWidgetFactoryOptions: {
 name: 'Plotly',
 primaryFileType: 'plotly',
 fileTypes: ['plotly', 'json'],
 defaultFor: ['plotly']
 }
 }
 name: "Plotly",
 primaryFileType: "plotly",
 fileTypes: ["plotly", "json"],
 defaultFor: ["plotly"],
 },
 },
];

export default extensions;

6 changes: 3 additions & 3 deletions
packages/javascript/jupyterlab-plotly/src/lib.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
 export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
 export * from "plotly.js";
 export type Frame = { [key: string]: any };
 export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
 export function animate(root: Plotly.Root): void;

 export interface PlotlyHTMLElement extends HTMLElement {
 on(event: 'plotly_webglcontextlost', callback: () => void): void;
 on(event: "plotly_webglcontextlost", callback: () => void): void;
 }
}

2 changes: 1 addition & 1 deletion
packages/javascript/jupyterlab-plotly/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 "noUnusedLocals": true,
 "esModuleInterop": true,
 "preserveWatchOutput": true,
 "module": "commonjs",
 "module": "esnext",
 "moduleResolution": "node",
 "target": "es2015",
 "lib": ["dom", "es2015"],
Expand Down

2 changes: 1 addition & 1 deletion
packages/javascript/plotlywidget/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 ],
 "scripts": {
 "build": "webpack",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
 "test": "echo \"Error: no test specified\" && exit 1"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Lazyload#2454

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

 Closed

nicolaskruchten
wants to merge
5
commits into

from

 Closed


Lazyload
#2454
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
f4f726e

Added lazy loading to jupyterlab-plotly


pragyagarg642 Mar 10, 2020
1783857

Added lazy loading to plotlywidget


pragyagarg642 Mar 31, 2020
3662e90

Resolving merge conflicts


pragyagarg642 Apr 15, 2020
79b8066

wip


nicolaskruchten Apr 30, 2020
adda7ef

wip


nicolaskruchten May 9, 2020

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


140 changes: 75 additions & 65 deletions
packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
 * The CSS class to add to the Plotly Widget.
 */
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
 * The CSS class for a Plotly icon.
 */
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
 * The MIME type for Plotly.
 * The version of this follows the major version of Plotly.
 */
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
 data: Plotly.Data;
 layout: Plotly.Layout;
 frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
 on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 /**
 * Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._mimeType = options.mimeType;

 // Create image element
 this._img_el = <HTMLImageElement>(document.createElement("img"));
 this._img_el.className = 'plot-img';
 this._img_el = <HTMLImageElement>document.createElement("img");
 this._img_el.className = "plot-img";
 this.node.appendChild(this._img_el);

 // Install image hover callback
 this._img_el.addEventListener('mouseenter', event => {
 this.createGraph(this._model);
 })
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 this._img_el.addEventListener("mouseenter", (event) => {
 this.createGraph(this._model, Plotly);
 });
 }
 );
 }

 /**
 * Render Plotly into this widget's node.
 */
 renderModel(model: IRenderMime.IMimeModel): Promise<void> {

 if (this.hasGraphElement()) {
 // We already have a graph, don't overwrite it
 return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._model = model;

 // Check for PNG data in mime bundle
 const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
 const png_data = <string>model.data["image/png"];
 if(png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 } else {
 // Create a new graph
 return this.createGraph(model);
 return import(
 /* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
 ).then((Plotly) => {
 this.createGraph(model, Plotly);
 });
 }
 }

 private hasGraphElement() {
 // Check for the presence of the .plot-container element that plotly.js
 // places at the top of the figure structure
 return this.node.querySelector('.plot-container') !== null
 return this.node.querySelector(".plot-container") !== null;
 }

 private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

 private hideGraph() {
 // Hide the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showGraph() {
 // Show the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private hideImage() {
 // Hide the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showImage() {
 // Show the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private createGraph(model: IRenderMime.IMimeModel) {
 private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
 const { data, layout, frames, config } = model.data[this._mimeType] as
 | any
 | IPlotlySpec;
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

 return Plotly.react(this.node, data, layout, config).then(plot => {
 return Plotly.react(this.node, data, layout, config).then((plot: any) => {
 this.showGraph();
 this.hideImage();
 this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 }
 if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
 Plotly.toImage(plot, {
 format: 'png',
 format: "png",
 width: this.node.offsetWidth,
 height: this.node.offsetHeight
 height: this.node.offsetHeight,
 }).then((url: string) => {
 const imageData = url.split(',')[1];
 if (model.data['image/png'] !== imageData) {
 const imageData = url.split(",")[1];
 if (model.data["image/png"] !== imageData) {
 model.setData({
 data: {
 ...model.data,
'image/png': imageData
 }
"image/png": imageData,
 },
 });
 }
 });
 }

 // Handle webgl context lost events
 (<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
 (<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
 const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 }
 });
 });
 }

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 */
 protected onUpdateRequest(msg: Message): void {
 if (this.isVisible && this.hasGraphElement()) {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 }
 );
 }
 }

 private _mimeType: string;
 private _img_el: HTMLImageElement;
 private _model: IRenderMime.IMimeModel
 private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
 safe: true,
 mimeTypes: [MIME_TYPE],
 createRenderer: options => new RenderedPlotly(options)
 createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
 {
 id: '@jupyterlab/plotly-extension:factory',
 id: "@jupyterlab/plotly-extension:factory",
 rendererFactory,
 rank: 0,
 dataType: 'json',
 dataType: "json",
 fileTypes: [
 {
 name: 'plotly',
 name: "plotly",
 mimeTypes: [MIME_TYPE],
 extensions: ['.plotly', '.plotly.json'],
 iconClass: CSS_ICON_CLASS
 }
 extensions: [".plotly", ".plotly.json"],
 iconClass: CSS_ICON_CLASS,
 },
 ],
 documentWidgetFactoryOptions: {
 name: 'Plotly',
 primaryFileType: 'plotly',
 fileTypes: ['plotly', 'json'],
 defaultFor: ['plotly']
 }
 }
 name: "Plotly",
 primaryFileType: "plotly",
 fileTypes: ["plotly", "json"],
 defaultFor: ["plotly"],
 },
 },
];

export default extensions;

6 changes: 3 additions & 3 deletions
packages/javascript/jupyterlab-plotly/src/lib.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
 export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
 export * from "plotly.js";
 export type Frame = { [key: string]: any };
 export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
 export function animate(root: Plotly.Root): void;

 export interface PlotlyHTMLElement extends HTMLElement {
 on(event: 'plotly_webglcontextlost', callback: () => void): void;
 on(event: "plotly_webglcontextlost", callback: () => void): void;
 }
}

2 changes: 1 addition & 1 deletion
packages/javascript/jupyterlab-plotly/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 "noUnusedLocals": true,
 "esModuleInterop": true,
 "preserveWatchOutput": true,
 "module": "commonjs",
 "module": "esnext",
 "moduleResolution": "node",
 "target": "es2015",
 "lib": ["dom", "es2015"],
Expand Down

2 changes: 1 addition & 1 deletion
packages/javascript/plotlywidget/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 ],
 "scripts": {
 "build": "webpack",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
 "test": "echo \"Error: no test specified\" && exit 1"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Lazyload#2454

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

 Closed

nicolaskruchten
wants to merge
5
commits into

from

 Closed


Lazyload
#2454
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
f4f726e

Added lazy loading to jupyterlab-plotly


pragyagarg642 Mar 10, 2020
1783857

Added lazy loading to plotlywidget


pragyagarg642 Mar 31, 2020
3662e90

Resolving merge conflicts


pragyagarg642 Apr 15, 2020
79b8066

wip


nicolaskruchten Apr 30, 2020
adda7ef

wip


nicolaskruchten May 9, 2020

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


140 changes: 75 additions & 65 deletions
packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
 * The CSS class to add to the Plotly Widget.
 */
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
 * The CSS class for a Plotly icon.
 */
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
 * The MIME type for Plotly.
 * The version of this follows the major version of Plotly.
 */
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
 data: Plotly.Data;
 layout: Plotly.Layout;
 frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
 on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 /**
 * Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._mimeType = options.mimeType;

 // Create image element
 this._img_el = <HTMLImageElement>(document.createElement("img"));
 this._img_el.className = 'plot-img';
 this._img_el = <HTMLImageElement>document.createElement("img");
 this._img_el.className = "plot-img";
 this.node.appendChild(this._img_el);

 // Install image hover callback
 this._img_el.addEventListener('mouseenter', event => {
 this.createGraph(this._model);
 })
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 this._img_el.addEventListener("mouseenter", (event) => {
 this.createGraph(this._model, Plotly);
 });
 }
 );
 }

 /**
 * Render Plotly into this widget's node.
 */
 renderModel(model: IRenderMime.IMimeModel): Promise<void> {

 if (this.hasGraphElement()) {
 // We already have a graph, don't overwrite it
 return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._model = model;

 // Check for PNG data in mime bundle
 const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
 const png_data = <string>model.data["image/png"];
 if(png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 } else {
 // Create a new graph
 return this.createGraph(model);
 return import(
 /* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
 ).then((Plotly) => {
 this.createGraph(model, Plotly);
 });
 }
 }

 private hasGraphElement() {
 // Check for the presence of the .plot-container element that plotly.js
 // places at the top of the figure structure
 return this.node.querySelector('.plot-container') !== null
 return this.node.querySelector(".plot-container") !== null;
 }

 private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

 private hideGraph() {
 // Hide the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showGraph() {
 // Show the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private hideImage() {
 // Hide the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showImage() {
 // Show the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private createGraph(model: IRenderMime.IMimeModel) {
 private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
 const { data, layout, frames, config } = model.data[this._mimeType] as
 | any
 | IPlotlySpec;
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

 return Plotly.react(this.node, data, layout, config).then(plot => {
 return Plotly.react(this.node, data, layout, config).then((plot: any) => {
 this.showGraph();
 this.hideImage();
 this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 }
 if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
 Plotly.toImage(plot, {
 format: 'png',
 format: "png",
 width: this.node.offsetWidth,
 height: this.node.offsetHeight
 height: this.node.offsetHeight,
 }).then((url: string) => {
 const imageData = url.split(',')[1];
 if (model.data['image/png'] !== imageData) {
 const imageData = url.split(",")[1];
 if (model.data["image/png"] !== imageData) {
 model.setData({
 data: {
 ...model.data,
'image/png': imageData
 }
"image/png": imageData,
 },
 });
 }
 });
 }

 // Handle webgl context lost events
 (<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
 (<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
 const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 }
 });
 });
 }

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 */
 protected onUpdateRequest(msg: Message): void {
 if (this.isVisible && this.hasGraphElement()) {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 }
 );
 }
 }

 private _mimeType: string;
 private _img_el: HTMLImageElement;
 private _model: IRenderMime.IMimeModel
 private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
 safe: true,
 mimeTypes: [MIME_TYPE],
 createRenderer: options => new RenderedPlotly(options)
 createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
 {
 id: '@jupyterlab/plotly-extension:factory',
 id: "@jupyterlab/plotly-extension:factory",
 rendererFactory,
 rank: 0,
 dataType: 'json',
 dataType: "json",
 fileTypes: [
 {
 name: 'plotly',
 name: "plotly",
 mimeTypes: [MIME_TYPE],
 extensions: ['.plotly', '.plotly.json'],
 iconClass: CSS_ICON_CLASS
 }
 extensions: [".plotly", ".plotly.json"],
 iconClass: CSS_ICON_CLASS,
 },
 ],
 documentWidgetFactoryOptions: {
 name: 'Plotly',
 primaryFileType: 'plotly',
 fileTypes: ['plotly', 'json'],
 defaultFor: ['plotly']
 }
 }
 name: "Plotly",
 primaryFileType: "plotly",
 fileTypes: ["plotly", "json"],
 defaultFor: ["plotly"],
 },
 },
];

export default extensions;

6 changes: 3 additions & 3 deletions
packages/javascript/jupyterlab-plotly/src/lib.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
 export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
 export * from "plotly.js";
 export type Frame = { [key: string]: any };
 export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
 export function animate(root: Plotly.Root): void;

 export interface PlotlyHTMLElement extends HTMLElement {
 on(event: 'plotly_webglcontextlost', callback: () => void): void;
 on(event: "plotly_webglcontextlost", callback: () => void): void;
 }
}

2 changes: 1 addition & 1 deletion
packages/javascript/jupyterlab-plotly/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 "noUnusedLocals": true,
 "esModuleInterop": true,
 "preserveWatchOutput": true,
 "module": "commonjs",
 "module": "esnext",
 "moduleResolution": "node",
 "target": "es2015",
 "lib": ["dom", "es2015"],
Expand Down

2 changes: 1 addition & 1 deletion
packages/javascript/plotlywidget/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 ],
 "scripts": {
 "build": "webpack",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
 "test": "echo \"Error: no test specified\" && exit 1"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Lazyload#2454

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

 Closed

nicolaskruchten
wants to merge
5
commits into

from

 Closed


Lazyload
#2454
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
f4f726e

Added lazy loading to jupyterlab-plotly


pragyagarg642 Mar 10, 2020
1783857

Added lazy loading to plotlywidget


pragyagarg642 Mar 31, 2020
3662e90

Resolving merge conflicts


pragyagarg642 Apr 15, 2020
79b8066

wip


nicolaskruchten Apr 30, 2020
adda7ef

wip


nicolaskruchten May 9, 2020

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


140 changes: 75 additions & 65 deletions
packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
 * The CSS class to add to the Plotly Widget.
 */
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
 * The CSS class for a Plotly icon.
 */
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
 * The MIME type for Plotly.
 * The version of this follows the major version of Plotly.
 */
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
 data: Plotly.Data;
 layout: Plotly.Layout;
 frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
 on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 /**
 * Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._mimeType = options.mimeType;

 // Create image element
 this._img_el = <HTMLImageElement>(document.createElement("img"));
 this._img_el.className = 'plot-img';
 this._img_el = <HTMLImageElement>document.createElement("img");
 this._img_el.className = "plot-img";
 this.node.appendChild(this._img_el);

 // Install image hover callback
 this._img_el.addEventListener('mouseenter', event => {
 this.createGraph(this._model);
 })
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 this._img_el.addEventListener("mouseenter", (event) => {
 this.createGraph(this._model, Plotly);
 });
 }
 );
 }

 /**
 * Render Plotly into this widget's node.
 */
 renderModel(model: IRenderMime.IMimeModel): Promise<void> {

 if (this.hasGraphElement()) {
 // We already have a graph, don't overwrite it
 return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._model = model;

 // Check for PNG data in mime bundle
 const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
 const png_data = <string>model.data["image/png"];
 if(png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 } else {
 // Create a new graph
 return this.createGraph(model);
 return import(
 /* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
 ).then((Plotly) => {
 this.createGraph(model, Plotly);
 });
 }
 }

 private hasGraphElement() {
 // Check for the presence of the .plot-container element that plotly.js
 // places at the top of the figure structure
 return this.node.querySelector('.plot-container') !== null
 return this.node.querySelector(".plot-container") !== null;
 }

 private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

 private hideGraph() {
 // Hide the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showGraph() {
 // Show the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private hideImage() {
 // Hide the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showImage() {
 // Show the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private createGraph(model: IRenderMime.IMimeModel) {
 private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
 const { data, layout, frames, config } = model.data[this._mimeType] as
 | any
 | IPlotlySpec;
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

 return Plotly.react(this.node, data, layout, config).then(plot => {
 return Plotly.react(this.node, data, layout, config).then((plot: any) => {
 this.showGraph();
 this.hideImage();
 this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 }
 if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
 Plotly.toImage(plot, {
 format: 'png',
 format: "png",
 width: this.node.offsetWidth,
 height: this.node.offsetHeight
 height: this.node.offsetHeight,
 }).then((url: string) => {
 const imageData = url.split(',')[1];
 if (model.data['image/png'] !== imageData) {
 const imageData = url.split(",")[1];
 if (model.data["image/png"] !== imageData) {
 model.setData({
 data: {
 ...model.data,
'image/png': imageData
 }
"image/png": imageData,
 },
 });
 }
 });
 }

 // Handle webgl context lost events
 (<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
 (<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
 const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 }
 });
 });
 }

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 */
 protected onUpdateRequest(msg: Message): void {
 if (this.isVisible && this.hasGraphElement()) {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 }
 );
 }
 }

 private _mimeType: string;
 private _img_el: HTMLImageElement;
 private _model: IRenderMime.IMimeModel
 private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
 safe: true,
 mimeTypes: [MIME_TYPE],
 createRenderer: options => new RenderedPlotly(options)
 createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
 {
 id: '@jupyterlab/plotly-extension:factory',
 id: "@jupyterlab/plotly-extension:factory",
 rendererFactory,
 rank: 0,
 dataType: 'json',
 dataType: "json",
 fileTypes: [
 {
 name: 'plotly',
 name: "plotly",
 mimeTypes: [MIME_TYPE],
 extensions: ['.plotly', '.plotly.json'],
 iconClass: CSS_ICON_CLASS
 }
 extensions: [".plotly", ".plotly.json"],
 iconClass: CSS_ICON_CLASS,
 },
 ],
 documentWidgetFactoryOptions: {
 name: 'Plotly',
 primaryFileType: 'plotly',
 fileTypes: ['plotly', 'json'],
 defaultFor: ['plotly']
 }
 }
 name: "Plotly",
 primaryFileType: "plotly",
 fileTypes: ["plotly", "json"],
 defaultFor: ["plotly"],
 },
 },
];

export default extensions;

6 changes: 3 additions & 3 deletions
packages/javascript/jupyterlab-plotly/src/lib.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
 export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
 export * from "plotly.js";
 export type Frame = { [key: string]: any };
 export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
 export function animate(root: Plotly.Root): void;

 export interface PlotlyHTMLElement extends HTMLElement {
 on(event: 'plotly_webglcontextlost', callback: () => void): void;
 on(event: "plotly_webglcontextlost", callback: () => void): void;
 }
}

2 changes: 1 addition & 1 deletion
packages/javascript/jupyterlab-plotly/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 "noUnusedLocals": true,
 "esModuleInterop": true,
 "preserveWatchOutput": true,
 "module": "commonjs",
 "module": "esnext",
 "moduleResolution": "node",
 "target": "es2015",
 "lib": ["dom", "es2015"],
Expand Down

2 changes: 1 addition & 1 deletion
packages/javascript/plotlywidget/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 ],
 "scripts": {
 "build": "webpack",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
 "test": "echo \"Error: no test specified\" && exit 1"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Lazyload#2454

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

 Closed

nicolaskruchten
wants to merge
5
commits into

from

 Closed


Lazyload
#2454
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
f4f726e

Added lazy loading to jupyterlab-plotly


pragyagarg642 Mar 10, 2020
1783857

Added lazy loading to plotlywidget


pragyagarg642 Mar 31, 2020
3662e90

Resolving merge conflicts


pragyagarg642 Apr 15, 2020
79b8066

wip


nicolaskruchten Apr 30, 2020
adda7ef

wip


nicolaskruchten May 9, 2020

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


140 changes: 75 additions & 65 deletions
packages/javascript/jupyterlab-plotly/src/javascript-renderer-extension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { Widget } from '@lumino/widgets';
import { Widget } from "@lumino/widgets";

import { Message } from '@lumino/messaging';
import { Message } from "@lumino/messaging";

import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IRenderMime } from "@jupyterlab/rendermime-interfaces";

import Plotly from 'plotly.js/dist/plotly.min';

import '../style/index.css';
import "../style/index.css";

/**
 * The CSS class to add to the Plotly Widget.
 */
const CSS_CLASS = 'jp-RenderedPlotly';
const CSS_CLASS = "jp-RenderedPlotly";

/**
 * The CSS class for a Plotly icon.
 */
const CSS_ICON_CLASS = 'jp-MaterialIcon jp-PlotlyIcon';
const CSS_ICON_CLASS = "jp-MaterialIcon jp-PlotlyIcon";

/**
 * The MIME type for Plotly.
 * The version of this follows the major version of Plotly.
 */
export const MIME_TYPE = 'application/vnd.plotly.v1+json';
export const MIME_TYPE = "application/vnd.plotly.v1+json";

interface IPlotlySpec {
 data: Plotly.Data;
 layout: Plotly.Layout;
 frames?: Plotly.Frame[];
interface PlotlyHTMLElement extends HTMLElement {
 on(event: "plotly_webglcontextlost", callback: () => void): void;
}

type Frame = { [key: string]: any };

export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 /**
 * Create a new widget for rendering Plotly.
Expand All@@ -43,21 +41,24 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._mimeType = options.mimeType;

 // Create image element
 this._img_el = <HTMLImageElement>(document.createElement("img"));
 this._img_el.className = 'plot-img';
 this._img_el = <HTMLImageElement>document.createElement("img");
 this._img_el.className = "plot-img";
 this.node.appendChild(this._img_el);

 // Install image hover callback
 this._img_el.addEventListener('mouseenter', event => {
 this.createGraph(this._model);
 })
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 this._img_el.addEventListener("mouseenter", (event) => {
 this.createGraph(this._model, Plotly);
 });
 }
 );
 }

 /**
 * Render Plotly into this widget's node.
 */
 renderModel(model: IRenderMime.IMimeModel): Promise<void> {

 if (this.hasGraphElement()) {
 // We already have a graph, don't overwrite it
 return Promise.resolve();
Expand All@@ -67,21 +68,25 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 this._model = model;

 // Check for PNG data in mime bundle
 const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
 const png_data = <string>model.data["image/png"];
 if(png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 } else {
 // Create a new graph
 return this.createGraph(model);
 return import(
 /* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly"
 ).then((Plotly) => {
 this.createGraph(model, Plotly);
 });
 }
 }

 private hasGraphElement() {
 // Check for the presence of the .plot-container element that plotly.js
 // places at the top of the figure structure
 return this.node.querySelector('.plot-container') !== null
 return this.node.querySelector(".plot-container") !== null;
 }

 private updateImage(png_data: string) {
Expand All@@ -92,42 +97,43 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {

 private hideGraph() {
 // Hide the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showGraph() {
 // Show the graph if there is one
 let el = <HTMLDivElement>this.node.querySelector('.plot-container');
 let el = <HTMLDivElement>this.node.querySelector(".plot-container");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private hideImage() {
 // Hide the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "none"
 el.style.display = "none";
 }
 }

 private showImage() {
 // Show the image element
 let el = <HTMLImageElement>this.node.querySelector('.plot-img');
 let el = <HTMLImageElement>this.node.querySelector(".plot-img");
 if (el !== null && el !== undefined) {
 el.style.display = "block"
 el.style.display = "block";
 }
 }

 private createGraph(model: IRenderMime.IMimeModel) {
 private createGraph(model: IRenderMime.IMimeModel, Plotly: any) {
 const { data, layout, frames, config } = model.data[this._mimeType] as
 | any
 | IPlotlySpec;
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Frame[] }
 | { data: Plotly.Data; layout: Plotly.Layout; frames?: Plotly.Frame[] };

 return Plotly.react(this.node, data, layout, config).then(plot => {
 return Plotly.react(this.node, data, layout, config).then((plot: any) => {
 this.showGraph();
 this.hideImage();
 this.update();
Expand All@@ -136,31 +142,31 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 }
 if (this.node.offsetWidth > 0 && this.node.offsetHeight > 0) {
 Plotly.toImage(plot, {
 format: 'png',
 format: "png",
 width: this.node.offsetWidth,
 height: this.node.offsetHeight
 height: this.node.offsetHeight,
 }).then((url: string) => {
 const imageData = url.split(',')[1];
 if (model.data['image/png'] !== imageData) {
 const imageData = url.split(",")[1];
 if (model.data["image/png"] !== imageData) {
 model.setData({
 data: {
 ...model.data,
'image/png': imageData
 }
"image/png": imageData,
 },
 });
 }
 });
 }

 // Handle webgl context lost events
 (<Plotly.PlotlyHTMLElement>(this.node)).on('plotly_webglcontextlost', () => {
const png_data = <string>model.data['image/png'];
 if(png_data !== undefined && png_data !== null) {
// We have PNG data, use it
this.updateImage(png_data);
return Promise.resolve();
}
});
 (<PlotlyHTMLElement>this.node).on("plotly_webglcontextlost", () => {
 const png_data = <string>model.data["image/png"];
if (png_data !== undefined && png_data !== null) {
 // We have PNG data, use it
 this.updateImage(png_data);
 return Promise.resolve();
 }
 });
 });
 }

Expand All@@ -183,15 +189,19 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
 */
 protected onUpdateRequest(msg: Message): void {
 if (this.isVisible && this.hasGraphElement()) {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 import(/* webpackChunkName: 'plotly'*/ "plotly.js/dist/plotly").then(
 (Plotly) => {
 Plotly.redraw(this.node).then(() => {
 Plotly.Plots.resize(this.node);
 });
 }
 );
 }
 }

 private _mimeType: string;
 private _img_el: HTMLImageElement;
 private _model: IRenderMime.IMimeModel
 private _model: IRenderMime.IMimeModel;
}

/**
Expand All@@ -200,30 +210,30 @@ export class RenderedPlotly extends Widget implements IRenderMime.IRenderer {
export const rendererFactory: IRenderMime.IRendererFactory = {
 safe: true,
 mimeTypes: [MIME_TYPE],
 createRenderer: options => new RenderedPlotly(options)
 createRenderer: (options) => new RenderedPlotly(options),
};

const extensions: IRenderMime.IExtension | IRenderMime.IExtension[] = [
 {
 id: '@jupyterlab/plotly-extension:factory',
 id: "@jupyterlab/plotly-extension:factory",
 rendererFactory,
 rank: 0,
 dataType: 'json',
 dataType: "json",
 fileTypes: [
 {
 name: 'plotly',
 name: "plotly",
 mimeTypes: [MIME_TYPE],
 extensions: ['.plotly', '.plotly.json'],
 iconClass: CSS_ICON_CLASS
 }
 extensions: [".plotly", ".plotly.json"],
 iconClass: CSS_ICON_CLASS,
 },
 ],
 documentWidgetFactoryOptions: {
 name: 'Plotly',
 primaryFileType: 'plotly',
 fileTypes: ['plotly', 'json'],
 defaultFor: ['plotly']
 }
 }
 name: "Plotly",
 primaryFileType: "plotly",
 fileTypes: ["plotly", "json"],
 defaultFor: ["plotly"],
 },
 },
];

export default extensions;

6 changes: 3 additions & 3 deletions
packages/javascript/jupyterlab-plotly/src/lib.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
declare module 'plotly.js/dist/plotly.min' {
 export * from 'plotly.js';
declare module "plotly.js/dist/plotly" {
 export * from "plotly.js";
 export type Frame = { [key: string]: any };
 export function addFrames(root: Plotly.Root, frames: Frame[]): Promise<void>;
 export function animate(root: Plotly.Root): void;

 export interface PlotlyHTMLElement extends HTMLElement {
 on(event: 'plotly_webglcontextlost', callback: () => void): void;
 on(event: "plotly_webglcontextlost", callback: () => void): void;
 }
}

2 changes: 1 addition & 1 deletion
packages/javascript/jupyterlab-plotly/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 "noUnusedLocals": true,
 "esModuleInterop": true,
 "preserveWatchOutput": true,
 "module": "commonjs",
 "module": "esnext",
 "moduleResolution": "node",
 "target": "es2015",
 "lib": ["dom", "es2015"],
Expand Down

2 changes: 1 addition & 1 deletion
packages/javascript/plotlywidget/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
 ],
 "scripts": {
 "build": "webpack",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static'",
 "clean": "rimraf dist/ && rimraf ../../python/plotly/plotlywidget/static",
 "test": "echo \"Error: no test specified\" && exit 1"
 },
 "devDependencies": {
Expand Down
Loading