Merge pull request #609 from plotly/visfix

visibility nesting fix

Author: nicolaskruchten

src/default_panels/GraphCreatePanel.js

@@ -26,11 +26,11 @@ const GraphCreatePanel = (props, {localize: _}) => {
       <TraceSelector label={_('Type')} attr="type" show />
 
       <PlotlySection name={_('Data')}>
+        <DataSelector label={_('Latitude')} attr="lat" />
+        <DataSelector label={_('Longitude')} attr="lon" />
         <DataSelector label={_('Labels')} attr="labels" />
         <DataSelector label={_('Values')} attr="values" />
         <DataSelector label={_('Locations')} attr="locations" />
-        <DataSelector label={_('Latitude')} attr="lat" />
-        <DataSelector label={_('Longitude')} attr="lon" />
         <Radio
           label={_('Orientation')}
           attr="orientation"
@@ -156,54 +156,6 @@ const GraphCreatePanel = (props, {localize: _}) => {
             },
           ]}
         />
-        <LayoutSection>
-          <Dropdown
-            label={_('Map Region')}
-            attr="geo.scope"
-            options={[
-              {label: _('World'), value: 'world'},
-              {label: _('USA'), value: 'usa'},
-              {label: _('Europe'), value: 'europe'},
-              {label: _('Asia'), value: 'asia'},
-              {label: _('Africa'), value: 'africa'},
-              {label: _('North America'), value: 'north america'},
-              {label: _('South America'), value: 'south america'},
-            ]}
-            clearable={false}
-          />
-          <Dropdown
-            label={_('Projection')}
-            attr="geo.projection.type"
-            clearable={false}
-            options={[
-              {label: _('Equirectangular'), value: 'equirectangular'},
-              {label: _('Mercator'), value: 'mercator'},
-              {label: _('Orthographic'), value: 'orthographic'},
-              {label: _('Natural Earth'), value: 'natural earth'},
-              {label: _('Albers USA'), value: 'albers usa'},
-              {label: _('Winkel Tripel'), value: 'winkel tripel'},
-              {label: _('Robinson'), value: 'robinson'},
-              {label: _('Miller'), value: 'miller'},
-              {label: _('Kavrayskiy 7'), value: 'kavrayskiy7'},
-              {label: _('Eckert 4'), value: 'eckert4'},
-              {label: _('Azimuthal Equal Area'), value: 'azimuthal equal area'},
-              {
-                label: _('Azimuthal Equidistant'),
-                value: 'azimuthal equidistant',
-              },
-              {label: _('Conic Equal Area'), value: 'conic equal area'},
-              {label: _('Conic Conformal'), value: 'conic conformal'},
-              {label: _('Conic Equidistant'), value: 'conic equidistant'},
-              {label: _('Gnomonic'), value: 'gnomonic'},
-              {label: _('Stereographic'), value: 'stereographic'},
-              {label: _('Mollweide'), value: 'mollweide'},
-              {label: _('Hammer'), value: 'hammer'},
-              {label: _('Transverse Mercator'), value: 'transverse mercator'},
-              {label: _('Aitoff'), value: 'aitoff'},
-              {label: _('Sinusoidal'), value: 'sinusoidal'},
-            ]}
-          />
-        </LayoutSection>
         <Numeric label={_('Sum')} step={10} attr="sum" />
         <Radio
           label={_('Transpose')}
@@ -214,6 +166,54 @@ const GraphCreatePanel = (props, {localize: _}) => {
           ]}
         />
       </PlotlySection>
+      <LayoutSection name={_('Map Options')}>
+        <Dropdown
+          label={_('Map Region')}
+          attr="geo.scope"
+          options={[
+            {label: _('World'), value: 'world'},
+            {label: _('USA'), value: 'usa'},
+            {label: _('Europe'), value: 'europe'},
+            {label: _('Asia'), value: 'asia'},
+            {label: _('Africa'), value: 'africa'},
+            {label: _('North America'), value: 'north america'},
+            {label: _('South America'), value: 'south america'},
+          ]}
+          clearable={false}
+        />
+        <Dropdown
+          label={_('Projection')}
+          attr="geo.projection.type"
+          clearable={false}
+          options={[
+            {label: _('Equirectangular'), value: 'equirectangular'},
+            {label: _('Mercator'), value: 'mercator'},
+            {label: _('Orthographic'), value: 'orthographic'},
+            {label: _('Natural Earth'), value: 'natural earth'},
+            {label: _('Albers USA'), value: 'albers usa'},
+            {label: _('Winkel Tripel'), value: 'winkel tripel'},
+            {label: _('Robinson'), value: 'robinson'},
+            {label: _('Miller'), value: 'miller'},
+            {label: _('Kavrayskiy 7'), value: 'kavrayskiy7'},
+            {label: _('Eckert 4'), value: 'eckert4'},
+            {label: _('Azimuthal Equal Area'), value: 'azimuthal equal area'},
+            {
+              label: _('Azimuthal Equidistant'),
+              value: 'azimuthal equidistant',
+            },
+            {label: _('Conic Equal Area'), value: 'conic equal area'},
+            {label: _('Conic Conformal'), value: 'conic conformal'},
+            {label: _('Conic Equidistant'), value: 'conic equidistant'},
+            {label: _('Gnomonic'), value: 'gnomonic'},
+            {label: _('Stereographic'), value: 'stereographic'},
+            {label: _('Mollweide'), value: 'mollweide'},
+            {label: _('Hammer'), value: 'hammer'},
+            {label: _('Transverse Mercator'), value: 'transverse mercator'},
+            {label: _('Aitoff'), value: 'aitoff'},
+            {label: _('Sinusoidal'), value: 'sinusoidal'},
+          ]}
+        />
+      </LayoutSection>
     </TraceAccordion>
   );
 };