fix 6765 - ensure default range work with allowed min/max

plotly · archmoj · Dec 1, 2023 · Nov 21, 2023 · Nov 23, 2023 · Nov 24, 2023
commit d8ff2d53fffa794355d414f5901dee68ab0caad1
diff --git a/src/plots/cartesian/set_convert.js b/src/plots/cartesian/set_convert.js
@@ -447,6 +447,11 @@ module.exports = function setConvert(ax, fullLayout) {

        if(minallowed !== undefined && rng[0] < bounds[0]) range[axrev ? 1 : 0] = minallowed;
        if(maxallowed !== undefined && rng[1] > bounds[1]) range[axrev ? 0 : 1] = maxallowed;
+
+        if(range[0] === range[1]) {
+            if(minallowed !== undefined) range[axrev ? 1 : 0] = ax.l2r(minallowed + 1);
+            if(maxallowed !== undefined) range[axrev ? 0 : 1] = ax.l2r(maxallowed - 1);
+        }
    };

    /*

diff --git a/src/plots/polar/polar.js b/src/plots/polar/polar.js
@@ -390,6 +390,24 @@ proto.doAutoRange = function(fullLayout, polarLayout) {
        radialAxis.r2l(rng[0], null, 'gregorian'),
        radialAxis.r2l(rng[1], null, 'gregorian')
    ];
+
+    var minallowed = radialAxis.minallowed;
+    if(minallowed !== undefined) {
+        if(radialAxis._rl[0] > radialAxis._rl[1]) {
+            radialAxis._rl[1] = Math.max(radialAxis._rl[1], minallowed);
+        } else {
+            radialAxis._rl[0] = Math.max(radialAxis._rl[0], minallowed);
+        }
+    }
+
+    var maxallowed = radialAxis.maxallowed;
+    if(maxallowed !== undefined) {
+        if(radialAxis._rl[0] < radialAxis._rl[1]) {
+            radialAxis._rl[1] = Math.min(radialAxis._rl[1], maxallowed);
+        } else {
+            radialAxis._rl[0] = Math.min(radialAxis._rl[0], maxallowed);
+        }
+    }
 };

 proto.updateRadialAxis = function(fullLayout, polarLayout) {

diff --git a/test/image/baselines/zz-allowed-range.png b/test/image/baselines/zz-allowed-range.png
diff --git a/test/image/mocks/zz-allowed-range.json b/test/image/mocks/zz-allowed-range.json
@@ -0,0 +1,79 @@
+{
+    "data": [
+        {
+            "type": "scatter",
+            "mode": "markers",
+            "xaxis": "x",
+            "yaxis": "y",
+            "x": [0,1,2,3,4,5,6,7,8,9,10],
+            "y":[0,10,20,30,40,50,60,70,80,90,100]
+        },
+        {
+            "type": "scatter",
+            "mode": "markers",
+            "xaxis": "x2",
+            "yaxis": "y2",
+            "x": [0,1,2,3,4,5,6,7,8,9,10],
+            "y":[0,10,20,30,40,50,60,70,80,90,100]
+        },
+        {
+            "type": "scatterpolar",
+            "mode": "markers",
+            "subplot": "polar",
+            "r": [0,1,2,3,4,5,6,7,8,9,10],
+            "theta":[0,10,20,30,40,50,60,70,80,90,100]
+        },
+        {
+            "type": "scatterpolar",
+            "mode": "markers",
+            "subplot": "polar2",
+            "r": [0,1,2,3,4,5,6,7,8,9,10],
+            "theta":[0,10,20,30,40,50,60,70,80,90,100]
+        }
+    ],
+    "layout": {
+        "showlegend": false,
+        "width": 800,
+        "height": 800,
+        "xaxis": {
+            "anchor": "y",
+            "domain": [0, 0.45],
+            "minallowed": 6
+        },
+        "yaxis": {
+            "anchor": "x",
+            "domain": [0, 0.45],
+            "minallowed": 6
+        },
+        "xaxis2": {
+            "autorange": "reversed",
+            "anchor": "y2",
+            "domain": [0, 0.45],
+            "minallowed": 6
+        },
+        "yaxis2": {
+            "anchor": "x2",
+            "domain": [0.55, 1],
+            "minallowed": 6
+        },
+        "polar": {
+            "domain": {
+                "x": [0.55, 1],
+                "y": [0, 0.45]
+            },
+            "radialaxis": {
+                "minallowed": 6
+            }
+        },
+        "polar2": {
+            "domain": {
+                "x": [0.55, 1],
+                "y": [0.55, 1]
+            },
+            "radialaxis": {
+                "autorange": "reversed",
+                "minallowed": 6
+            }
+        }
+    }
+}
-Original file line number
+Diff line change
@@ -447,6 +447,11 @@ module.exports = function setConvert(ax, fullLayout) {
             if(minallowed !== undefined && rng[0] < bounds[0]) range[axrev ? 1 : 0] = minallowed;
             if(maxallowed !== undefined && rng[1] > bounds[1]) range[axrev ? 0 : 1] = maxallowed;
+            if(range[0] === range[1]) {
+                if(minallowed !== undefined) range[axrev ? 1 : 0] = ax.l2r(minallowed + 1);
             Copy link

  
      
    
  

  
      

  
    Collaborator


      

  

  
    
      

      
            alexcjohnson
  

      

      

      


        Nov 23, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      What if maxallowed-minallowed<1?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
            archmoj reacted with eyes emoji
      
        
            
    All reactions
  


          
              
                👀
                  1 reaction
              
          
        
      
    

    



    
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            archmoj
  

      

      

      


        Nov 24, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Good call.

Addressed in aadbd54
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+                if(maxallowed !== undefined) range[axrev ? 0 : 1] = ax.l2r(maxallowed - 1);
+            }
         };
         /*
-          Expand Down