Make .subplot && .axisGroup private keys

Author: VeraZab

src/components/fields/AxesSelector.js

@@ -23,8 +23,8 @@ class AxesSelector extends Component {
       axesOptions &&
       axesOptions.some(option => {
         return (
-          option.axisGroup &&
-          this.context.fullLayout._subplots[option.axisGroup].length > 1
+          option._axisGroup &&
+          this.context.fullLayout._subplots[option._axisGroup].length > 1
         );
       });
 

src/components/fields/derived.js

@@ -17,14 +17,14 @@ export const AxisAnchorDropdown = connectToContainer(UnconnectedDropdown, {
     const {localize: _} = props;
     let options = [];
     plotProps.options = [{label: 'x', value: 'x'}];
-    if (plotProps.fullContainer.subplot.includes('xaxis')) {
+    if (plotProps.fullContainer._subplot.includes('xaxis')) {
       options = context.fullLayout._subplots.yaxis.map(axis => {
         return {
           label: getAxisTitle(context.fullLayout[axisIdToAxisName(axis)]),
           value: axis,
         };
       });
-    } else if (plotProps.fullContainer.subplot.includes('yaxis')) {
+    } else if (plotProps.fullContainer._subplot.includes('yaxis')) {
       options = context.fullLayout._subplots.xaxis.map(axis => {
         return {
           label: getAxisTitle(context.fullLayout[axisIdToAxisName(axis)]),
@@ -41,14 +41,14 @@ export const AxisAnchorDropdown = connectToContainer(UnconnectedDropdown, {
 export const AxisOverlayDropdown = connectToContainer(UnconnectedDropdown, {
   modifyPlotProps: (props, context, plotProps) => {
     let options = [];
-    if (plotProps.fullContainer.subplot.includes('xaxis')) {
+    if (plotProps.fullContainer._subplot.includes('xaxis')) {
       options = context.fullLayout._subplots.xaxis.map(axis => {
         return {
           label: getAxisTitle(context.fullLayout[axisIdToAxisName(axis)]),
           value: axis,
         };
       });
-    } else if (plotProps.fullContainer.subplot.includes('yaxis')) {
+    } else if (plotProps.fullContainer._subplot.includes('yaxis')) {
       options = context.fullLayout._subplots.yaxis.map(axis => {
         return {
           label: getAxisTitle(context.fullLayout[axisIdToAxisName(axis)]),

src/lib/connectAxesToLayout.js

@@ -15,17 +15,17 @@ function computeAxesOptions(axes, _) {
   for (let i = 0; i < axes.length; i++) {
     const ax = axes[i];
     const label = capitalize(ax._name.split('axis')[0]);
-    const value = (ax.subplot &&
-    !ax.subplot.includes('xaxis') &&
-    !ax.subplot.includes('yaxis')
-      ? ax.subplot + '.' + ax._name
-      : ax.subplot
+    const value = (ax._subplot &&
+    !ax._subplot.includes('xaxis') &&
+    !ax._subplot.includes('yaxis')
+      ? ax._subplot + '.' + ax._name
+      : ax._subplot
     ).trim();
 
     options[i + 1] = {
       label,
       value,
-      axisGroup: ax.axisGroup,
+      axisGroup: ax._axisGroup,
       title: getAxisTitle(ax),
     };
   }
@@ -105,7 +105,7 @@ export default function connectAxesToLayout(WrappedComponent) {
       const keys = Object.keys(update);
       for (let i = 0; i < keys.length; i++) {
         for (let j = 0; j < axes.length; j++) {
-          const subplot = axes[j].subplot;
+          const subplot = axes[j]._subplot;
           let axesKey = axes[j]._name;
 
           if (

src/lib/getAllAxes.js

@@ -19,15 +19,15 @@ export default function getAllAxes(fullLayout) {
                 ? subplot.slice(0, 1) + 'axis' + subplot.slice(1)
                 : subplot + 'axis';
 
-            fullLayout[subplot].subplot = subplot;
-            fullLayout[subplot].axisGroup = type;
+            fullLayout[subplot]._subplot = subplot;
+            fullLayout[subplot]._axisGroup = type;
             axes.push(fullLayout[subplot]);
           } else {
             Object.keys(fullLayout[subplot])
               .filter(key => key.includes('axis'))
               .forEach(axis => {
-                fullLayout[subplot][axis].subplot = subplot;
-                fullLayout[subplot][axis].axisGroup = type;
+                fullLayout[subplot][axis]._subplot = subplot;
+                fullLayout[subplot][axis]._axisGroup = type;
 
                 // it should be in plotly.js, but it's not there for geo axes..
                 if (!fullLayout[subplot][axis]._name) {