Merge remote-tracking branch 'origin-plotly/master' into fix-edit-shapes

Author: my-tien

.circleci/config.yml

@@ -217,11 +217,12 @@ jobs:
   make-baselines-virtual-webgl:
     parallelism: 8
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -235,11 +236,12 @@ jobs:
 
   make-baselines-mathjax3:
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -254,11 +256,12 @@ jobs:
   make-baselines:
     parallelism: 12
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -273,11 +276,12 @@ jobs:
   make-baselines-b64:
     parallelism: 12
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -347,11 +351,12 @@ jobs:
 
   make-exports:
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -362,7 +367,7 @@ jobs:
             sudo apt-get install poppler-utils
       - run:
           name: Create svg, jpg, jpeg, webp, pdf and eps files
-          command: python3 test/image/make_exports.py
+          command: sudo python3 test/image/make_exports.py
       - persist_to_workspace:
           root: ~/
           paths:
@@ -488,7 +493,7 @@ jobs:
       - store_artifacts:
           path: stackgl_modules/index.js
           destination: stackgl_modules/index.js
-  
+
   test-topojson-build:
     docker:
       - image: cimg/node:18.20.4

.circleci/env_image.sh

@@ -2,10 +2,20 @@
 set -e
 # install required fonts
 sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji
+
+# install pip
+sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+sudo python3 get-pip.py
+
+# install additional fonts
+sudo python3 -m pip install requests
 sudo python3 .circleci/download_google_fonts.py
 sudo cp -r .circleci/fonts/ /usr/share/
+sudo apt install fontconfig
 sudo fc-cache -f
+
 # install kaleido & plotly
-sudo python3 -m pip install kaleido==0.2.1 plotly==5.5.0 --progress-bar off
+sudo python3 -m pip install kaleido==0.2.1 plotly==6.2.0 --progress-bar off
+
 # install numpy i.e. to convert arrays to typed arrays
 sudo python3 -m pip install numpy==1.24.2

.circleci/test.sh

@@ -97,24 +97,24 @@ case $1 in
                   find $ROOT/test/image/mocks/gl*     -type f -printf "%f\n"; \
                   find $ROOT/test/image/mocks/map* -type f -printf "%f\n"; \
                 } | sed 's/\.json$//1' | circleci tests split)
-        python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     make-baselines-mathjax3)
-        python3 test/image/make_baseline.py mathjax3    legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax ternary-mathjax-title-place-subtitle || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py mathjax3    legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax ternary-mathjax-title-place-subtitle || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     make-baselines-b64)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
-        python3 test/image/make_baseline.py b64 $SUITE || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py b64 $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
     make-baselines)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
-        python3 test/image/make_baseline.py $SUITE || EXIT_STATE=$?
+        sudo python3 test/image/make_baseline.py $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 

draftlogs/7468_add.md

@@ -0,0 +1 @@
+ - Add `minorloglabels` to cartesian axes [#7468](https://github.com/plotly/plotly.js/pull/7468)

src/plots/cartesian/axes.js

@@ -1899,26 +1899,41 @@ function formatLog(ax, out, hover, extraPrecision, hideexp) {
 
     if(tickformat || (dtChar0 === 'L')) {
         out.text = numFormat(Math.pow(10, x), ax, hideexp, extraPrecision);
-    } else if(isNumeric(dtick) || ((dtChar0 === 'D') && (Lib.mod(x + 0.01, 1) < 0.1))) {
-        var p = Math.round(x);
+    } else if(isNumeric(dtick) || ((dtChar0 === 'D') &&
+        (ax.minorloglabels === 'complete' || Lib.mod(x + 0.01, 1) < 0.1))) {
+
+        var isMinor;
+        if(ax.minorloglabels === 'complete' && !(Lib.mod(x + 0.01, 1) < 0.1)) {
+            isMinor = true;
+            out.fontSize *= 0.75;
+        }
+
+        var exponentialString = Math.pow(10, x).toExponential(0);
+        var parts = exponentialString.split('e');
+
+        var p = +parts[1];
         var absP = Math.abs(p);
         var exponentFormat = ax.exponentformat;
         if(exponentFormat === 'power' || (isSIFormat(exponentFormat) && beyondSI(p))) {
-            if(p === 0) out.text = 1;
-            else if(p === 1) out.text = '10';
-            else out.text = '10<sup>' + (p > 1 ? '' : MINUS_SIGN) + absP + '</sup>';
+            out.text = parts[0];
+            if(absP > 0) out.text += 'x10';
+            if(out.text === '1x10') out.text = '10';
+            if(p !== 0 && p !== 1) out.text += '<sup>' + (p > 0 ? '' : MINUS_SIGN) + absP + '</sup>';
 
             out.fontSize *= 1.25;
         } else if((exponentFormat === 'e' || exponentFormat === 'E') && absP > 2) {
-            out.text = '1' + exponentFormat + (p > 0 ? '+' : MINUS_SIGN) + absP;
+            out.text = parts[0] + exponentFormat + (p > 0 ? '+' : MINUS_SIGN) + absP;
         } else {
             out.text = numFormat(Math.pow(10, x), ax, '', 'fakehover');
             if(dtick === 'D1' && ax._id.charAt(0) === 'y') {
                 out.dy -= out.fontSize / 6;
             }
         }
     } else if(dtChar0 === 'D') {
-        out.text = String(Math.round(Math.pow(10, Lib.mod(x, 1))));
+        out.text =
+            ax.minorloglabels === 'none' ? '' :
+            /* ax.minorloglabels === 'small digits' */ String(Math.round(Math.pow(10, Lib.mod(x, 1))));
+
         out.fontSize *= 0.75;
     } else throw 'unrecognized dtick ' + String(dtick);
 
@@ -3770,7 +3785,7 @@ axes.drawLabels = function(gd, ax, opts) {
 
                     var sel;
                     if(e.K === ZERO_PATH.K) {
-                        var zerolineLayer = zerolineIsAbove ? mainPlotinfo.zerolinelayerAbove : mainPlotinfo.zerolinelayer; 
+                        var zerolineLayer = zerolineIsAbove ? mainPlotinfo.zerolinelayerAbove : mainPlotinfo.zerolinelayer;
                         sel = zerolineLayer.selectAll('.' + ax._id + 'zl');
                     } else if(e.K === MINORGRID_PATH.K) sel = mainPlotinfo.minorGridlayer.selectAll('.' + ax._id);
                     else if(e.K === GRID_PATH.K) sel = mainPlotinfo.gridlayer.selectAll('.' + ax._id);

src/plots/cartesian/layout_attributes.js

@@ -1136,6 +1136,19 @@ module.exports = {
         editType: 'ticks'
     },
 
+    minorloglabels: {
+        valType: 'enumerated',
+        values: ['small digits', 'complete', 'none'],
+        dflt: 'small digits',
+        editType: 'calc',
+        description: [
+            'Determines how minor log labels are displayed.',
+            'If *small digits*, small digits i.e. 2 or 5 are displayed.',
+            'If *complete*, complete digits are displayed.',
+            'If *none*, no labels are displayed.',
+        ].join(' ')
+    },
+
     layer: {
         valType: 'enumerated',
         values: ['above traces', 'below traces'],

src/plots/cartesian/tick_label_defaults.js

@@ -70,6 +70,10 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
                 coerce('separatethousands');
             }
         }
+
+        if(!options.noMinorloglabels && axType === 'log') {
+            coerce('minorloglabels');
+        }
     }
 };
 

src/plots/gl3d/layout/axis_defaults.js

@@ -42,6 +42,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
                 data: options.data,
                 showGrid: true,
                 noAutotickangles: true,
+                noMinorloglabels: true,
                 noTicklabelindex: true,
                 noTickson: true,
                 noTicklabelmode: true,

src/plots/polar/layout_attributes.js

@@ -36,6 +36,7 @@ var axisTickAttrs = overrideAll({
     ticklabelstep: axesAttrs.ticklabelstep,
     showticklabels: axesAttrs.showticklabels,
     labelalias: axesAttrs.labelalias,
+    minorloglabels: axesAttrs.minorloglabels,
     showtickprefix: axesAttrs.showtickprefix,
     tickprefix: axesAttrs.tickprefix,
     showticksuffix: axesAttrs.showticksuffix,