Skip to content

Commit 1c55de3

Browse files
VeraZabVeraZab
authored
Merge pull request #462 from plotly/logo
UI components api adjustments
2 parents fc458c4 + 402dbf9 commit 1c55de3

File tree

6 files changed

+73
-49
lines changed

6 files changed

+73
-49
lines changed

‎scripts/translationKeys/combined-translation-keys.txt‎

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

‎scripts/translationKeys/translation-keys.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Atlas Map
4040
Auto // /components/fields/derived.js:482
4141
Auto margins // /default_panels/StyleAxesPanel.js:209
4242
Average // /default_panels/GraphTransformsPanel.js:31
43-
Axes // /DefaultEditor.js:29
43+
Axes // /DefaultEditor.js:33
4444
Axes to Use // /default_panels/GraphCreatePanel.js:86
4545
Axis Background // /default_panels/StyleAxesPanel.js:187
4646
Axis Line // /default_panels/StyleAxesPanel.js:134
@@ -89,7 +89,7 @@ Close
8989
Collapse All // /components/containers/PanelHeader.js:41
9090
Color // /default_panels/GraphCreatePanel.js:186
9191
Color Bar // /default_panels/StyleColorbarsPanel.js:304
92-
Color Bars // /DefaultEditor.js:31
92+
Color Bars // /DefaultEditor.js:35
9393
Coloring // /default_panels/StyleTracesPanel.js:256
9494
Colorscale // /default_panels/StyleTracesPanel.js:139
9595
Column Options // /default_panels/GraphCreatePanel.js:114
@@ -116,7 +116,7 @@ Count
116116
Counter Clockwise // /default_panels/StyleAxesPanel.js:127
117117
Country Abbreviations (ISO-3) // /default_panels/GraphCreatePanel.js:129
118118
Country Names // /default_panels/GraphCreatePanel.js:128
119-
Create // /DefaultEditor.js:24
119+
Create // /DefaultEditor.js:28
120120
Custom // /default_panels/StyleAxesPanel.js:108
121121
Custom Color // /components/widgets/ColorPicker.js:51
122122
Custom Data // /components/fields/ErrorBars.js:110
@@ -184,7 +184,7 @@ Gnomonic
184184
Go back // /components/widgets/text_editors/MultiFormat.js:198
185185
Go to the 'Create' tab to define traces. // /components/containers/TraceRequiredPanel.js:19
186186
Gradians // /default_panels/GraphCreatePanel.js:79
187-
Graph // /DefaultEditor.js:24
187+
Graph // /DefaultEditor.js:28
188188
Grid Lines // /default_panels/StyleAxesPanel.js:164
189189
Hammer // /default_panels/GraphCreatePanel.js:177
190190
Header // /default_panels/StyleTracesPanel.js:63
@@ -212,7 +212,7 @@ Hover Projections
212212
Hover on // /default_panels/StyleTracesPanel.js:370
213213
I (Optional) // /default_panels/GraphCreatePanel.js:54
214214
Image // /components/containers/ImageAccordion.js:23
215-
Images // /DefaultEditor.js:33
215+
Images // /DefaultEditor.js:37
216216
Increasing Trace Styles // /default_panels/StyleTracesPanel.js:306
217217
Individual // /components/containers/TraceAccordion.js:76
218218
Inside // /components/fields/derived.js:480
@@ -262,7 +262,7 @@ Max Number of Labels
262262
Max Number of Markers // /default_panels/StyleAxesPanel.js:347
263263
Mean // /default_panels/StyleTracesPanel.js:339
264264
Median // /default_panels/GraphTransformsPanel.js:32
265-
Menus // /DefaultEditor.js:35
265+
Menus // /DefaultEditor.js:39
266266
Mercator // /default_panels/GraphCreatePanel.js:157
267267
Middle // /default_panels/StyleAxesPanel.js:475
268268
Middle Center // /components/fields/derived.js:472
@@ -285,7 +285,7 @@ None
285285
Normal // /default_panels/StyleLegendPanel.js:79
286286
North America // /default_panels/GraphCreatePanel.js:146
287287
Note Text // /default_panels/StyleNotesPanel.js:20
288-
Notes // /DefaultEditor.js:28
288+
Notes // /DefaultEditor.js:32
289289
Number of Contours // /default_panels/StyleTracesPanel.js:273
290290
Number of Labels // /default_panels/StyleColorbarsPanel.js:233
291291
Number of Markers // /default_panels/StyleColorbarsPanel.js:279
@@ -343,7 +343,7 @@ Select Trace Type
343343
Select an Option // /components/widgets/Dropdown.js:66
344344
Separate Thousands // /default_panels/StyleAxesPanel.js:242
345345
Shape // /components/containers/ShapeAccordion.js:23
346-
Shapes // /DefaultEditor.js:32
346+
Shapes // /DefaultEditor.js:36
347347
Show // /default_panels/StyleAxesPanel.js:138
348348
Show Contour // /default_panels/StyleTracesPanel.js:357
349349
Show Sides // /default_panels/StyleAxesPanel.js:513
@@ -354,7 +354,7 @@ Size
354354
Size and Positioning // /default_panels/StyleColorbarsPanel.js:61
355355
Size and Spacing // /default_panels/StyleTracesPanel.js:147
356356
Slider // /components/containers/SliderAccordion.js:17
357-
Sliders // /DefaultEditor.js:34
357+
Sliders // /DefaultEditor.js:38
358358
Smoothing // /default_panels/StyleTracesPanel.js:185
359359
Sorted // /default_panels/StyleTracesPanel.js:126
360360
South America // /default_panels/GraphCreatePanel.js:147
@@ -410,8 +410,8 @@ Top Left
410410
Top Right // /components/fields/derived.js:470
411411
Trace // /components/containers/TraceAccordion.js:34
412412
Trace Order // /default_panels/StyleLegendPanel.js:75
413-
Traces // /DefaultEditor.js:26
414-
Transforms // /DefaultEditor.js:25
413+
Traces // /DefaultEditor.js:30
414+
Transforms // /DefaultEditor.js:29
415415
Transpose // /default_panels/GraphCreatePanel.js:189
416416
Transverse Mercator // /default_panels/GraphCreatePanel.js:178
417417
True // /default_panels/StyleAxesPanel.js:212

‎src/DefaultEditor.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ import {
1515
StyleColorbarsPanel,
1616
StyleUpdateMenusPanel,
1717
} from './default_panels';
18+
import Logo from './components/widgets/Logo';
1819

1920
class DefaultEditor extends Component {
2021
render() {
2122
const _ = this.context.localize;
23+
const logo = this.props.logoSrc && <Logo src={this.props.logoSrc} />;
24+
2225
return (
2326
<PanelMenuWrapper>
27+
{logo ? logo : null}
2428
<GraphCreatePanel group={_('Graph')} name={_('Create')} />
2529
<GraphTransformsPanel group={_('Graph')} name={_('Transforms')} />
2630
<StyleTracesPanel group={_('Style')} name={_('Traces')} />
@@ -41,6 +45,7 @@ class DefaultEditor extends Component {
4145

4246
DefaultEditor.propTypes = {
4347
children: PropTypes.node,
48+
logoSrc: PropTypes.string,
4449
};
4550

4651
DefaultEditor.contextTypes = {

‎src/components/PanelMenuWrapper.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ class PanelsWithSidebar extends Component {
88
super(props);
99

1010
const opts = this.computeMenuOptions(props);
11+
const firstSidebarGroup = opts.filter(o => o.panels)[0];
1112

1213
this.state = {
13-
group: opts[0].name,
14-
panel: opts[0].panels[0],
14+
group: firstSidebarGroup.name,
15+
panel: firstSidebarGroup.panels[0],
1516
};
1617

1718
this.setPanel = this.setPanel.bind(this);

‎src/components/widgets/Logo.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import PropTypes from 'prop-types';
2+
import React, {Component} from 'react';
3+
4+
export default class Logo extends Component {
5+
render() {
6+
return <img className="sidebar__logo" src={this.props.src} />;
7+
}
8+
}
9+
10+
Logo.plotly_editor_traits = {sidebar_element: true};
11+
12+
Logo.propTypes = {
13+
src: PropTypes.string,
14+
};

‎src/styles/components/sidebar/_main.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,8 @@
150150
}
151151
}
152152
}
153+
&__logo {
154+
height: 50px;
155+
margin: 10px;
156+
}
153157
}

0 commit comments

Comments
 (0)