Skip to content

adjustments for plotly.js 1.44.0 #837

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 3, 2019
Merged

adjustments for plotly.js 1.44.0 #837

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
8f70325
adjustments for plotly.js 1.44.0
VeraZab Jan 22, 2019
7455974
add srcAttributePath as argument
VeraZab Feb 3, 2019
df12c14
update plotly.js version
VeraZab Feb 3, 2019
8269ed0
translation keys update
VeraZab Feb 3, 2019
039d292
Add Meta DataSelector in layout
VeraZab Feb 3, 2019
391046f
v0.35.0
VeraZab Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-chart-editor",
"description": "plotly.js chart editor react component UI",
"version": "0.34.4",
"version": "0.35.0",
"author": "Plotly, Inc.",
"bugs": {
"url": "https://github.com/plotly/react-chart-editor/issues"
Expand All @@ -15,7 +15,7 @@
"fast-isnumeric": "^1.1.1",
"immutability-helper": "^2.7.1",
"plotly-icons": "1.2.3",
"plotly.js": "1.43.2",
"plotly.js": "1.44.1",
"prop-types": "^15.5.10",
"raf": "^3.4.0",
"react-color": "^2.13.8",
Expand Down
31 changes: 16 additions & 15 deletions scripts/translationKeys/combined-translation-keys.txt
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions scripts/translationKeys/translation-keys.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $
2D Contour Histogram // /lib/computeTraceOptionsFromSchema.js:33
2D Histogram // /lib/computeTraceOptionsFromSchema.js:29
3D // /lib/traceTypes.js:29
3D Line // /lib/computeTraceOptionsFromSchema.js:148
3D Line // /lib/computeTraceOptionsFromSchema.js:152
3D Mesh // /lib/computeTraceOptionsFromSchema.js:61
3D Scatter // /lib/computeTraceOptionsFromSchema.js:53
3D Surface // /lib/traceTypes.js:102
Expand Down Expand Up @@ -343,6 +343,7 @@ Intensity
Interactions // /default_panels/StyleLayoutPanel.js:106
Interpolate // /default_panels/StyleTracesPanel.js:383
Interpolate Gaps // /default_panels/StyleTracesPanel.js:517
Isosurface // /lib/computeTraceOptionsFromSchema.js:137
J (Optional) // /default_panels/GraphCreatePanel.js:93
January // /components/widgets/DateTimePicker.js:70
Jitter // /default_panels/StyleTracesPanel.js:305
Expand Down Expand Up @@ -547,7 +548,7 @@ Roughness
SVG // /components/fields/TraceSelector.js:101
Sankey // /lib/computeTraceOptionsFromSchema.js:97
Satellite // /default_panels/GraphSubplotsPanel.js:81
Satellite Map // /lib/computeTraceOptionsFromSchema.js:155
Satellite Map // /lib/computeTraceOptionsFromSchema.js:159
Satellite with Streets // /default_panels/GraphSubplotsPanel.js:82
Scale // /default_panels/GraphSubplotsPanel.js:213
Scale Group // /default_panels/StyleTracesPanel.js:561
Expand Down Expand Up @@ -656,7 +657,7 @@ Tick Spacing
Tick spacing // /default_panels/StyleColorbarsPanel.js:213
Ticks // /default_panels/StyleColorbarsPanel.js:221
Timescale Buttons // /default_panels/StyleAxesPanel.js:342
Timeseries // /lib/computeTraceOptionsFromSchema.js:144
Timeseries // /lib/computeTraceOptionsFromSchema.js:148
Tip // /default_panels/StyleTracesPanel.js:71
Title // /default_panels/StyleColorbarsPanel.js:37
Titles // /default_panels/StyleAxesPanel.js:32
Expand Down
4 changes: 4 additions & 0 deletions src/default_panels/StyleLayoutPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
Radio,
} from '../components';
import {HoverColor} from '../components/fields/derived';
import DataSelector from '../components/fields/DataSelector';

const StyleLayoutPanel = (props, {localize: _}) => (
<LayoutPanel>
Expand Down Expand Up @@ -165,6 +166,9 @@ const StyleLayoutPanel = (props, {localize: _}) => (
</HovermodeDropdown>
</PlotlySection>
</PlotlyFold>
<PlotlyFold name={_('Meta')}>
<DataSelector label={_('Custom Data')} attr="meta" />
</PlotlyFold>
</LayoutPanel>
);

Expand Down
4 changes: 4 additions & 0 deletions src/lib/computeTraceOptionsFromSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ function computeTraceOptionsFromSchema(schema, _, context) {
value: 'barpolar',
label: _('Polar Bar'),
},
{
value: 'isosurface',
label: _('Isosurface'),
},
].filter(obj => traceTypes.indexOf(obj.value) !== -1);

const traceIndex = traceType => traceOptions.findIndex(opt => opt.value === traceType);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function maybeAdjustSrc(src, srcAttributePath, traceType, config) {
return src[0];
}

return config && config.fromSrc ? config.fromSrc(src, traceType) : src;
return config && config.fromSrc ? config.fromSrc(src, traceType, srcAttributePath) : src;
}

function adjustColorscale(colorscale, numberOfNeededColors, colorscaleType, config) {
Expand Down
5 changes: 5 additions & 0 deletions src/lib/traceTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,9 @@ export const traceTypes = _ => [
label: _('Carpet'),
category: chartCategory(_).HIDDEN,
},
{
value: 'isosurface',
label: _('Isosurface'),
category: chartCategory(_).HIDDEN,
},
];