Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306

Merged
valentijnnieman merged 6 commits into from
Sep 21, 2018
Merged

Fix Tabs and Tabs tests #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b48b18
Clone figure.layout in Graph (regression fix)
valentijnnieman Sep 18, 2018
24ee3b1
Removed debugging console.logs from Tabs
valentijnnieman Sep 18, 2018
f535e1e
Wait for content to be loaded in tabs test
valentijnnieman Sep 18, 2018
9132aff
Update tests to wait for Graph's internal svg to load
valentijnnieman Sep 18, 2018
e709448
Merged with master & fixed merge conflicts
valentijnnieman Sep 21, 2018
438d87d
Version bump to 0.30.2
valentijnnieman Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down
4 changes: 2 additions & 2 deletions dash_core_components/dash_core_components.min.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions dash_core_components/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
"name": "dash-core-components",
"version": "0.29.0",
"version": "0.30.2",
"description": "Core component suite for Dash",
"repository": {
"type": "git",
"url": "git://github.com/plotly/dash-core-components.git"
},
"main": "src/index.js",
"scripts": {
"build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
"build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
"copy-lib": "cp -f lib/* dash_core_components",
"generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
"install-local": "npm run copy-lib && python setup.py install",
"prepublish": "npm test && builder run build-dist && npm run copy-lib",
"prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
"publish-all": "npm publish && python setup.py sdist upload",
"publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
"start": "./node_modules/.bin/builder run build-dev",
"start": "webpack-serve ./webpack.serve.config.js --open",
"test": "eslint src",
"test-watch": "./node_modules/.bin/builder run test-frontend-watch",
"test-debug": "./node_modules/.bin/builder run test-frontend-debug",
"uninstall-local": "pip uninstall dash-core-components -y",
"build:js": "webpack --mode production",
"build:js-dev": "webpack --mode development",
"build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
},
"author": "Chris Parmer <chris@plot.ly>",
Expand Down
2 changes: 1 addition & 1 deletion dash_core_components/version.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "dash-core-components",
"version": "0.30.1",
"version": "0.30.2",
"description": "Core component suite for Dash",
"repository": {
"type": "git",
Expand Down
16 changes: 7 additions & 9 deletions src/components/Graph.react.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
return Plotly.animate(id, figure, animation_options);
}
return Plotly.react(id, figure.data, figure.layout, config).then(
() => {
if (!this._hasPlotted) {
this.bindEvents();
Plotly.Plots.resize(document.getElementById(id));
this._hasPlotted = true;
}
return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
if (!this._hasPlotted) {
this.bindEvents();
Plotly.Plots.resize(document.getElementById(id));
this._hasPlotted = true;
}
);
});
}

bindEvents() {
Expand Down
3 changes: 0 additions & 3 deletions src/components/Tabs.react.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

const amountOfTabs = this.props.children.length;

window.console.log('this.props.children', this.props.children);
EnhancedTabs = this.props.children.map((child, index) => {
// TODO: handle components that are not dcc.Tab components (throw error)
// enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
let childProps;

window.console.log('child', child);

if (child.props.children) {
// if props appears on .children, props are coming from Dash
childProps = child.props.children.props;
} else {
// else props are coming from React (Demo.react.js)
window.console.log('child props', child.props);
childProps = child.props;
}

Expand Down
21 changes: 20 additions & 1 deletion test/test_integration.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

button_one.click()

# wait for tabs to be loaded after clicking
WebDriverWait(self.driver, 10).until(
EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
)

self.snapshot("Tabs 1 rendered ")

button_two.click()
time.sleep(1)

# wait for tabs to be loaded after clicking
WebDriverWait(self.driver, 10).until(
EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
)

self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
self.snapshot("Tabs with Graph - initial (graph should not resize)")
tab_two.click()

# wait for Graph's internal svg to be loaded after clicking
WebDriverWait(self.driver, 10).until(
EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
)

self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

tab_one.click()

# wait for Graph to be loaded after clicking
WebDriverWait(self.driver, 10).until(
EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
)

self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix Tabs and Tabs tests by valentijnnieman · Pull Request #306 · plotly/dash-core-components · GitHub
Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306
 Merged

valentijnnieman
merged 6 commits into

from

Sep 21, 2018
 Merged


Fix Tabs and Tabs tests
#306
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7b48b18

Clone figure.layout in Graph (regression fix)


valentijnnieman Sep 18, 2018
24ee3b1

Removed debugging console.logs from Tabs


valentijnnieman Sep 18, 2018
f535e1e

Wait for content to be loaded in tabs test


valentijnnieman Sep 18, 2018
9132aff

Update tests to wait for Graph's internal svg to load


valentijnnieman Sep 18, 2018
e709448

Merged with master & fixed merge conflicts


valentijnnieman Sep 21, 2018
438d87d

Version bump to 0.30.2


valentijnnieman Sep 21, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down

4 changes: 2 additions & 2 deletions
dash_core_components/dash_core_components.min.js

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 4 additions & 6 deletions
dash_core_components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
 "name": "dash-core-components",
 "version": "0.29.0",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
 "url": "git://github.com/plotly/dash-core-components.git"
 },
 "main": "src/index.js",
 "scripts": {
 "build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
 "build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
 "copy-lib": "cp -f lib/* dash_core_components",
 "generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
 "install-local": "npm run copy-lib && python setup.py install",
 "prepublish": "npm test && builder run build-dist && npm run copy-lib",
 "prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
 "publish-all": "npm publish && python setup.py sdist upload",
 "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
 "start": "./node_modules/.bin/builder run build-dev",
 "start": "webpack-serve ./webpack.serve.config.js --open",
 "test": "eslint src",
 "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
 "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
 "uninstall-local": "pip uninstall dash-core-components -y",
 "build:js": "webpack --mode production",
 "build:js-dev": "webpack --mode development",
 "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
 },
 "author": "Chris Parmer <chris@plot.ly>",
Expand Down

2 changes: 1 addition & 1 deletion
dash_core_components/version.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "dash-core-components",
 "version": "0.30.1",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
Expand Down

16 changes: 7 additions & 9 deletions
src/components/Graph.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
 if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
 return Plotly.animate(id, figure, animation_options);
 }
 return Plotly.react(id, figure.data, figure.layout, config).then(
 () => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 );
});
 }

 bindEvents() {
Expand Down

3 changes: 0 additions & 3 deletions
src/components/Tabs.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

 const amountOfTabs = this.props.children.length;

 window.console.log('this.props.children', this.props.children);
 EnhancedTabs = this.props.children.map((child, index) => {
 // TODO: handle components that are not dcc.Tab components (throw error)
 // enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
 let childProps;

 window.console.log('child', child);

 if (child.props.children) {
 // if props appears on .children, props are coming from Dash
 childProps = child.props.children.props;
 } else {
 // else props are coming from React (Demo.react.js)
 window.console.log('child props', child.props);
 childProps = child.props;
 }

Expand Down

21 changes: 20 additions & 1 deletion
test/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

 button_one.click()

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
 )

 self.snapshot("Tabs 1 rendered ")

 button_two.click()
 time.sleep(1)

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
 )

 self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
 self.snapshot("Tabs with Graph - initial (graph should not resize)")
 tab_two.click()

 # wait for Graph's internal svg to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

 WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

 tab_one.click()

 # wait for Graph to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down

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

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306
 Merged

valentijnnieman
merged 6 commits into

from

Sep 21, 2018
 Merged


Fix Tabs and Tabs tests
#306
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7b48b18

Clone figure.layout in Graph (regression fix)


valentijnnieman Sep 18, 2018
24ee3b1

Removed debugging console.logs from Tabs


valentijnnieman Sep 18, 2018
f535e1e

Wait for content to be loaded in tabs test


valentijnnieman Sep 18, 2018
9132aff

Update tests to wait for Graph's internal svg to load


valentijnnieman Sep 18, 2018
e709448

Merged with master & fixed merge conflicts


valentijnnieman Sep 21, 2018
438d87d

Version bump to 0.30.2


valentijnnieman Sep 21, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down

4 changes: 2 additions & 2 deletions
dash_core_components/dash_core_components.min.js

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 4 additions & 6 deletions
dash_core_components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
 "name": "dash-core-components",
 "version": "0.29.0",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
 "url": "git://github.com/plotly/dash-core-components.git"
 },
 "main": "src/index.js",
 "scripts": {
 "build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
 "build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
 "copy-lib": "cp -f lib/* dash_core_components",
 "generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
 "install-local": "npm run copy-lib && python setup.py install",
 "prepublish": "npm test && builder run build-dist && npm run copy-lib",
 "prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
 "publish-all": "npm publish && python setup.py sdist upload",
 "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
 "start": "./node_modules/.bin/builder run build-dev",
 "start": "webpack-serve ./webpack.serve.config.js --open",
 "test": "eslint src",
 "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
 "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
 "uninstall-local": "pip uninstall dash-core-components -y",
 "build:js": "webpack --mode production",
 "build:js-dev": "webpack --mode development",
 "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
 },
 "author": "Chris Parmer <chris@plot.ly>",
Expand Down

2 changes: 1 addition & 1 deletion
dash_core_components/version.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "dash-core-components",
 "version": "0.30.1",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
Expand Down

16 changes: 7 additions & 9 deletions
src/components/Graph.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
 if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
 return Plotly.animate(id, figure, animation_options);
 }
 return Plotly.react(id, figure.data, figure.layout, config).then(
 () => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 );
});
 }

 bindEvents() {
Expand Down

3 changes: 0 additions & 3 deletions
src/components/Tabs.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

 const amountOfTabs = this.props.children.length;

 window.console.log('this.props.children', this.props.children);
 EnhancedTabs = this.props.children.map((child, index) => {
 // TODO: handle components that are not dcc.Tab components (throw error)
 // enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
 let childProps;

 window.console.log('child', child);

 if (child.props.children) {
 // if props appears on .children, props are coming from Dash
 childProps = child.props.children.props;
 } else {
 // else props are coming from React (Demo.react.js)
 window.console.log('child props', child.props);
 childProps = child.props;
 }

Expand Down

21 changes: 20 additions & 1 deletion
test/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

 button_one.click()

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
 )

 self.snapshot("Tabs 1 rendered ")

 button_two.click()
 time.sleep(1)

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
 )

 self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
 self.snapshot("Tabs with Graph - initial (graph should not resize)")
 tab_two.click()

 # wait for Graph's internal svg to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

 WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

 tab_one.click()

 # wait for Graph to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down

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

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306
 Merged

valentijnnieman
merged 6 commits into

from

Sep 21, 2018
 Merged


Fix Tabs and Tabs tests
#306
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7b48b18

Clone figure.layout in Graph (regression fix)


valentijnnieman Sep 18, 2018
24ee3b1

Removed debugging console.logs from Tabs


valentijnnieman Sep 18, 2018
f535e1e

Wait for content to be loaded in tabs test


valentijnnieman Sep 18, 2018
9132aff

Update tests to wait for Graph's internal svg to load


valentijnnieman Sep 18, 2018
e709448

Merged with master & fixed merge conflicts


valentijnnieman Sep 21, 2018
438d87d

Version bump to 0.30.2


valentijnnieman Sep 21, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down

4 changes: 2 additions & 2 deletions
dash_core_components/dash_core_components.min.js

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 4 additions & 6 deletions
dash_core_components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
 "name": "dash-core-components",
 "version": "0.29.0",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
 "url": "git://github.com/plotly/dash-core-components.git"
 },
 "main": "src/index.js",
 "scripts": {
 "build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
 "build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
 "copy-lib": "cp -f lib/* dash_core_components",
 "generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
 "install-local": "npm run copy-lib && python setup.py install",
 "prepublish": "npm test && builder run build-dist && npm run copy-lib",
 "prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
 "publish-all": "npm publish && python setup.py sdist upload",
 "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
 "start": "./node_modules/.bin/builder run build-dev",
 "start": "webpack-serve ./webpack.serve.config.js --open",
 "test": "eslint src",
 "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
 "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
 "uninstall-local": "pip uninstall dash-core-components -y",
 "build:js": "webpack --mode production",
 "build:js-dev": "webpack --mode development",
 "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
 },
 "author": "Chris Parmer <chris@plot.ly>",
Expand Down

2 changes: 1 addition & 1 deletion
dash_core_components/version.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "dash-core-components",
 "version": "0.30.1",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
Expand Down

16 changes: 7 additions & 9 deletions
src/components/Graph.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
 if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
 return Plotly.animate(id, figure, animation_options);
 }
 return Plotly.react(id, figure.data, figure.layout, config).then(
 () => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 );
});
 }

 bindEvents() {
Expand Down

3 changes: 0 additions & 3 deletions
src/components/Tabs.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

 const amountOfTabs = this.props.children.length;

 window.console.log('this.props.children', this.props.children);
 EnhancedTabs = this.props.children.map((child, index) => {
 // TODO: handle components that are not dcc.Tab components (throw error)
 // enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
 let childProps;

 window.console.log('child', child);

 if (child.props.children) {
 // if props appears on .children, props are coming from Dash
 childProps = child.props.children.props;
 } else {
 // else props are coming from React (Demo.react.js)
 window.console.log('child props', child.props);
 childProps = child.props;
 }

Expand Down

21 changes: 20 additions & 1 deletion
test/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

 button_one.click()

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
 )

 self.snapshot("Tabs 1 rendered ")

 button_two.click()
 time.sleep(1)

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
 )

 self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
 self.snapshot("Tabs with Graph - initial (graph should not resize)")
 tab_two.click()

 # wait for Graph's internal svg to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

 WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

 tab_one.click()

 # wait for Graph to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down

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

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306
 Merged

valentijnnieman
merged 6 commits into

from

Sep 21, 2018
 Merged


Fix Tabs and Tabs tests
#306
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7b48b18

Clone figure.layout in Graph (regression fix)


valentijnnieman Sep 18, 2018
24ee3b1

Removed debugging console.logs from Tabs


valentijnnieman Sep 18, 2018
f535e1e

Wait for content to be loaded in tabs test


valentijnnieman Sep 18, 2018
9132aff

Update tests to wait for Graph's internal svg to load


valentijnnieman Sep 18, 2018
e709448

Merged with master & fixed merge conflicts


valentijnnieman Sep 21, 2018
438d87d

Version bump to 0.30.2


valentijnnieman Sep 21, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down

4 changes: 2 additions & 2 deletions
dash_core_components/dash_core_components.min.js

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 4 additions & 6 deletions
dash_core_components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
 "name": "dash-core-components",
 "version": "0.29.0",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
 "url": "git://github.com/plotly/dash-core-components.git"
 },
 "main": "src/index.js",
 "scripts": {
 "build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
 "build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
 "copy-lib": "cp -f lib/* dash_core_components",
 "generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
 "install-local": "npm run copy-lib && python setup.py install",
 "prepublish": "npm test && builder run build-dist && npm run copy-lib",
 "prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
 "publish-all": "npm publish && python setup.py sdist upload",
 "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
 "start": "./node_modules/.bin/builder run build-dev",
 "start": "webpack-serve ./webpack.serve.config.js --open",
 "test": "eslint src",
 "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
 "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
 "uninstall-local": "pip uninstall dash-core-components -y",
 "build:js": "webpack --mode production",
 "build:js-dev": "webpack --mode development",
 "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
 },
 "author": "Chris Parmer <chris@plot.ly>",
Expand Down

2 changes: 1 addition & 1 deletion
dash_core_components/version.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "dash-core-components",
 "version": "0.30.1",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
Expand Down

16 changes: 7 additions & 9 deletions
src/components/Graph.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
 if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
 return Plotly.animate(id, figure, animation_options);
 }
 return Plotly.react(id, figure.data, figure.layout, config).then(
 () => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 );
});
 }

 bindEvents() {
Expand Down

3 changes: 0 additions & 3 deletions
src/components/Tabs.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

 const amountOfTabs = this.props.children.length;

 window.console.log('this.props.children', this.props.children);
 EnhancedTabs = this.props.children.map((child, index) => {
 // TODO: handle components that are not dcc.Tab components (throw error)
 // enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
 let childProps;

 window.console.log('child', child);

 if (child.props.children) {
 // if props appears on .children, props are coming from Dash
 childProps = child.props.children.props;
 } else {
 // else props are coming from React (Demo.react.js)
 window.console.log('child props', child.props);
 childProps = child.props;
 }

Expand Down

21 changes: 20 additions & 1 deletion
test/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

 button_one.click()

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
 )

 self.snapshot("Tabs 1 rendered ")

 button_two.click()
 time.sleep(1)

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
 )

 self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
 self.snapshot("Tabs with Graph - initial (graph should not resize)")
 tab_two.click()

 # wait for Graph's internal svg to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

 WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

 tab_one.click()

 # wait for Graph to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix Tabs and Tabs tests by valentijnnieman · Pull Request #306 · plotly/dash-core-components · GitHub
Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306
 Merged

valentijnnieman
merged 6 commits into

from

Sep 21, 2018
 Merged


Fix Tabs and Tabs tests
#306
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7b48b18

Clone figure.layout in Graph (regression fix)


valentijnnieman Sep 18, 2018
24ee3b1

Removed debugging console.logs from Tabs


valentijnnieman Sep 18, 2018
f535e1e

Wait for content to be loaded in tabs test


valentijnnieman Sep 18, 2018
9132aff

Update tests to wait for Graph's internal svg to load


valentijnnieman Sep 18, 2018
e709448

Merged with master & fixed merge conflicts


valentijnnieman Sep 21, 2018
438d87d

Version bump to 0.30.2


valentijnnieman Sep 21, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down

4 changes: 2 additions & 2 deletions
dash_core_components/dash_core_components.min.js

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 4 additions & 6 deletions
dash_core_components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
 "name": "dash-core-components",
 "version": "0.29.0",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
 "url": "git://github.com/plotly/dash-core-components.git"
 },
 "main": "src/index.js",
 "scripts": {
 "build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
 "build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
 "copy-lib": "cp -f lib/* dash_core_components",
 "generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
 "install-local": "npm run copy-lib && python setup.py install",
 "prepublish": "npm test && builder run build-dist && npm run copy-lib",
 "prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
 "publish-all": "npm publish && python setup.py sdist upload",
 "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
 "start": "./node_modules/.bin/builder run build-dev",
 "start": "webpack-serve ./webpack.serve.config.js --open",
 "test": "eslint src",
 "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
 "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
 "uninstall-local": "pip uninstall dash-core-components -y",
 "build:js": "webpack --mode production",
 "build:js-dev": "webpack --mode development",
 "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
 },
 "author": "Chris Parmer <chris@plot.ly>",
Expand Down

2 changes: 1 addition & 1 deletion
dash_core_components/version.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "dash-core-components",
 "version": "0.30.1",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
Expand Down

16 changes: 7 additions & 9 deletions
src/components/Graph.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
 if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
 return Plotly.animate(id, figure, animation_options);
 }
 return Plotly.react(id, figure.data, figure.layout, config).then(
 () => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 );
});
 }

 bindEvents() {
Expand Down

3 changes: 0 additions & 3 deletions
src/components/Tabs.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

 const amountOfTabs = this.props.children.length;

 window.console.log('this.props.children', this.props.children);
 EnhancedTabs = this.props.children.map((child, index) => {
 // TODO: handle components that are not dcc.Tab components (throw error)
 // enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
 let childProps;

 window.console.log('child', child);

 if (child.props.children) {
 // if props appears on .children, props are coming from Dash
 childProps = child.props.children.props;
 } else {
 // else props are coming from React (Demo.react.js)
 window.console.log('child props', child.props);
 childProps = child.props;
 }

Expand Down

21 changes: 20 additions & 1 deletion
test/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

 button_one.click()

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
 )

 self.snapshot("Tabs 1 rendered ")

 button_two.click()
 time.sleep(1)

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
 )

 self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
 self.snapshot("Tabs with Graph - initial (graph should not resize)")
 tab_two.click()

 # wait for Graph's internal svg to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

 WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

 tab_one.click()

 # wait for Graph to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix Tabs and Tabs tests by valentijnnieman · Pull Request #306 · plotly/dash-core-components · GitHub
Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306
 Merged

valentijnnieman
merged 6 commits into

from

Sep 21, 2018
 Merged


Fix Tabs and Tabs tests
#306
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7b48b18

Clone figure.layout in Graph (regression fix)


valentijnnieman Sep 18, 2018
24ee3b1

Removed debugging console.logs from Tabs


valentijnnieman Sep 18, 2018
f535e1e

Wait for content to be loaded in tabs test


valentijnnieman Sep 18, 2018
9132aff

Update tests to wait for Graph's internal svg to load


valentijnnieman Sep 18, 2018
e709448

Merged with master & fixed merge conflicts


valentijnnieman Sep 21, 2018
438d87d

Version bump to 0.30.2


valentijnnieman Sep 21, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down

4 changes: 2 additions & 2 deletions
dash_core_components/dash_core_components.min.js

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 4 additions & 6 deletions
dash_core_components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
 "name": "dash-core-components",
 "version": "0.29.0",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
 "url": "git://github.com/plotly/dash-core-components.git"
 },
 "main": "src/index.js",
 "scripts": {
 "build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
 "build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
 "copy-lib": "cp -f lib/* dash_core_components",
 "generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
 "install-local": "npm run copy-lib && python setup.py install",
 "prepublish": "npm test && builder run build-dist && npm run copy-lib",
 "prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
 "publish-all": "npm publish && python setup.py sdist upload",
 "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
 "start": "./node_modules/.bin/builder run build-dev",
 "start": "webpack-serve ./webpack.serve.config.js --open",
 "test": "eslint src",
 "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
 "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
 "uninstall-local": "pip uninstall dash-core-components -y",
 "build:js": "webpack --mode production",
 "build:js-dev": "webpack --mode development",
 "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
 },
 "author": "Chris Parmer <chris@plot.ly>",
Expand Down

2 changes: 1 addition & 1 deletion
dash_core_components/version.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "dash-core-components",
 "version": "0.30.1",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
Expand Down

16 changes: 7 additions & 9 deletions
src/components/Graph.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
 if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
 return Plotly.animate(id, figure, animation_options);
 }
 return Plotly.react(id, figure.data, figure.layout, config).then(
 () => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 );
});
 }

 bindEvents() {
Expand Down

3 changes: 0 additions & 3 deletions
src/components/Tabs.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

 const amountOfTabs = this.props.children.length;

 window.console.log('this.props.children', this.props.children);
 EnhancedTabs = this.props.children.map((child, index) => {
 // TODO: handle components that are not dcc.Tab components (throw error)
 // enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
 let childProps;

 window.console.log('child', child);

 if (child.props.children) {
 // if props appears on .children, props are coming from Dash
 childProps = child.props.children.props;
 } else {
 // else props are coming from React (Demo.react.js)
 window.console.log('child props', child.props);
 childProps = child.props;
 }

Expand Down

21 changes: 20 additions & 1 deletion
test/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

 button_one.click()

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
 )

 self.snapshot("Tabs 1 rendered ")

 button_two.click()
 time.sleep(1)

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
 )

 self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
 self.snapshot("Tabs with Graph - initial (graph should not resize)")
 tab_two.click()

 # wait for Graph's internal svg to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

 WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

 tab_one.click()

 # wait for Graph to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down

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

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Fix Tabs and Tabs tests#306
 Merged

valentijnnieman
merged 6 commits into

from

Sep 21, 2018
 Merged


Fix Tabs and Tabs tests
#306
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7b48b18

Clone figure.layout in Graph (regression fix)


valentijnnieman Sep 18, 2018
24ee3b1

Removed debugging console.logs from Tabs


valentijnnieman Sep 18, 2018
f535e1e

Wait for content to be loaded in tabs test


valentijnnieman Sep 18, 2018
9132aff

Update tests to wait for Graph's internal svg to load


valentijnnieman Sep 18, 2018
e709448

Merged with master & fixed merge conflicts


valentijnnieman Sep 21, 2018
438d87d

Version bump to 0.30.2


valentijnnieman Sep 21, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.30.2] - 2018-09-21
### Fixed
- Fixed regression in Graph component where it wouldn't resize correctly [#256](https://github.com/plotly/dash-core-components/issues/256)

## [0.30.1] - 2018-09-20
### Fixed
- Renamed `__init__.py` external_path to dash_core_components.min.js
Expand Down

4 changes: 2 additions & 2 deletions
dash_core_components/dash_core_components.min.js

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 4 additions & 6 deletions
dash_core_components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
{
 "name": "dash-core-components",
 "version": "0.29.0",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
 "url": "git://github.com/plotly/dash-core-components.git"
 },
 "main": "src/index.js",
 "scripts": {
 "build-dev": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && webpack -w --config=./config/webpack/webpack.config.dev.js",
 "build-dist": "builder run clean-lib && builder run extract-metadata && builder run generate-python-classes && cross-env NODE_ENV=production webpack --config=./config/webpack/webpack.config.dist.js",
 "copy-lib": "cp -f lib/* dash_core_components",
 "generate-python-classes": "python -c \"import dash; dash.development.component_loader.generate_classes('dash_core_components', 'dash_core_components/metadata.json');\"",
 "install-local": "npm run copy-lib && python setup.py install",
 "prepublish": "npm test && builder run build-dist && npm run copy-lib",
 "prepublish": "npm test && npm run build:js && npm run build:js-dev && npm run build:py",
 "publish-all": "npm publish && python setup.py sdist upload",
 "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
 "start": "./node_modules/.bin/builder run build-dev",
 "start": "webpack-serve ./webpack.serve.config.js --open",
 "test": "eslint src",
 "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
 "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
 "uninstall-local": "pip uninstall dash-core-components -y",
 "build:js": "webpack --mode production",
 "build:js-dev": "webpack --mode development",
 "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && cp package.json dash_core_components && npm run generate-python-classes"
 },
 "author": "Chris Parmer <chris@plot.ly>",
Expand Down

2 changes: 1 addition & 1 deletion
dash_core_components/version.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
__version__ = '0.30.1'
__version__ = '0.30.2'

2 changes: 1 addition & 1 deletion
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "dash-core-components",
 "version": "0.30.1",
 "version": "0.30.2",
 "description": "Core component suite for Dash",
 "repository": {
 "type": "git",
Expand Down

16 changes: 7 additions & 9 deletions
src/components/Graph.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, filter, has, isNil, type} from 'ramda';
import {contains, filter, clone, has, isNil, type} from 'ramda';
/* global Plotly:true */

const filterEventData = (gd, eventData, event) => {
Expand DownExpand Up@@ -77,15 +77,13 @@ export default class PlotlyGraph extends Component {
 if (animate && this._hasPlotted && figure.data.length === gd.data.length) {
 return Plotly.animate(id, figure, animation_options);
 }
 return Plotly.react(id, figure.data, figure.layout, config).then(
 () => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 return Plotly.react(id, figure.data, clone(figure.layout), config).then(() => {
 if (!this._hasPlotted) {
 this.bindEvents();
 Plotly.Plots.resize(document.getElementById(id));
 this._hasPlotted = true;
 }
 );
});
 }

 bindEvents() {
Expand Down

3 changes: 0 additions & 3 deletions
src/components/Tabs.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,20 +168,17 @@ export default class Tabs extends Component {

 const amountOfTabs = this.props.children.length;

 window.console.log('this.props.children', this.props.children);
 EnhancedTabs = this.props.children.map((child, index) => {
 // TODO: handle components that are not dcc.Tab components (throw error)
 // enhance Tab components coming from Dash (as dcc.Tab) with methods needed for handling logic
 let childProps;

 window.console.log('child', child);

 if (child.props.children) {
 // if props appears on .children, props are coming from Dash
 childProps = child.props.children.props;
 } else {
 // else props are coming from React (Demo.react.js)
 window.console.log('child props', child.props);
 childProps = child.props;
 }

Expand Down

21 changes: 20 additions & 1 deletion
test/test_integration.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -539,10 +539,19 @@ def on_click(n_clicks):

 button_one.click()

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-one .main-svg"))
 )

 self.snapshot("Tabs 1 rendered ")

 button_two.click()
 time.sleep(1)

 # wait for tabs to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-two .main-svg"))
 )

 self.snapshot("Tabs 2 rendered ")

Expand DownExpand Up@@ -629,6 +638,11 @@ def render_content(tab):
 self.snapshot("Tabs with Graph - initial (graph should not resize)")
 tab_two.click()

 # wait for Graph's internal svg to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-2-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 2 (graph should not resize)")

 WebDriverWait(self.driver, 10).until(
Expand All@@ -637,6 +651,11 @@ def render_content(tab):

 tab_one.click()

 # wait for Graph to be loaded after clicking
 WebDriverWait(self.driver, 10).until(
 EC.visibility_of_element_located((By.CSS_SELECTOR, "#graph-1-tabs .main-svg"))
 )

 self.snapshot("Tabs with Graph - clicked tab 1 (graph should not resize)")


Expand Down