From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Tue, 22 Dec 2020 16:33:53 +0000 (-0500)
Subject: Horizontal axis with center position should display labels (#8221)
X-Git-Tag: v3.0.0-beta.8~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da0535e1ff9f5edc05051e0a9c87eaa4c31ac14a;p=thirdparty%2FChart.js.git

Horizontal axis with center position should display labels (#8221)

* Horizontal axes with center positions should have labels
* Linting
* Test updates
* Increase the tolerance for one test
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 21c212195..d04160bf7 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -1398,7 +1398,8 @@ export default class Scale extends Element {
 					} else {
 						textOffset = (-1 * labelSizes.highest.height) + (0.5 * lineHeight);
 					}
-				} else if (position === 'bottom') {
+				} else {
+					// eslint-disable-next-line no-lonely-if
 					if (crossAlign === 'near' || rotation !== 0) {
 						textOffset = Math.sin(rotation) * halfCount * lineHeight;
 						textOffset += (rotation === 0 ? 0.5 : Math.cos(rotation) * halfCount) * lineHeight;
diff --git a/test/fixtures/core.scale/x-axis-position-center.json b/test/fixtures/core.scale/x-axis-position-center.json
index cb15026bc..8f3ec1409 100644
--- a/test/fixtures/core.scale/x-axis-position-center.json
+++ b/test/fixtures/core.scale/x-axis-position-center.json
@@ -27,7 +27,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 },
                 "y": {
@@ -40,7 +40,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 }
             }
@@ -50,6 +50,7 @@
         "canvas": {
             "height": 256,
             "width": 512
-        }
+        },
+        "spriteText": true
     }
 }
diff --git a/test/fixtures/core.scale/x-axis-position-center.png b/test/fixtures/core.scale/x-axis-position-center.png
index c9ef8c878..f98457085 100644
Binary files a/test/fixtures/core.scale/x-axis-position-center.png and b/test/fixtures/core.scale/x-axis-position-center.png differ
diff --git a/test/fixtures/core.scale/x-axis-position-dynamic.json b/test/fixtures/core.scale/x-axis-position-dynamic.json
index 53954acd3..9661dedd2 100644
--- a/test/fixtures/core.scale/x-axis-position-dynamic.json
+++ b/test/fixtures/core.scale/x-axis-position-dynamic.json
@@ -29,7 +29,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 },
                 "y": {
@@ -42,7 +42,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 }
             }
@@ -52,6 +52,7 @@
         "canvas": {
             "height": 256,
             "width": 512
-        }
+        },
+        "spriteText": true
     }
 }
diff --git a/test/fixtures/core.scale/x-axis-position-dynamic.png b/test/fixtures/core.scale/x-axis-position-dynamic.png
index 0ac0a903c..856730964 100644
Binary files a/test/fixtures/core.scale/x-axis-position-dynamic.png and b/test/fixtures/core.scale/x-axis-position-dynamic.png differ
diff --git a/test/fixtures/core.scale/y-axis-position-center.json b/test/fixtures/core.scale/y-axis-position-center.json
index 1ba27c87c..ff0cf28f9 100644
--- a/test/fixtures/core.scale/y-axis-position-center.json
+++ b/test/fixtures/core.scale/y-axis-position-center.json
@@ -27,7 +27,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 },
                 "y": {
@@ -40,7 +40,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 }
             }
@@ -50,6 +50,7 @@
         "canvas": {
             "height": 256,
             "width": 512
-        }
+        },
+        "spriteText": true
     }
 }
diff --git a/test/fixtures/core.scale/y-axis-position-center.png b/test/fixtures/core.scale/y-axis-position-center.png
index ce00eada3..5d741d188 100644
Binary files a/test/fixtures/core.scale/y-axis-position-center.png and b/test/fixtures/core.scale/y-axis-position-center.png differ
diff --git a/test/fixtures/core.scale/y-axis-position-dynamic.json b/test/fixtures/core.scale/y-axis-position-dynamic.json
index 0eaeb8199..6e44d10fa 100644
--- a/test/fixtures/core.scale/y-axis-position-dynamic.json
+++ b/test/fixtures/core.scale/y-axis-position-dynamic.json
@@ -27,7 +27,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 },
                 "y": {
@@ -42,7 +42,7 @@
                         "drawOnChartArea": false
                     },
                     "ticks": {
-                        "display": false
+                        "display": true
                     }
                 }
             }
@@ -52,6 +52,8 @@
         "canvas": {
             "height": 256,
             "width": 512
-        }
-    }
+        },
+        "spriteText": true
+    },
+    "tolerance": 0.01
 }
diff --git a/test/fixtures/core.scale/y-axis-position-dynamic.png b/test/fixtures/core.scale/y-axis-position-dynamic.png
index 70f4efbf3..33863ea8f 100644
Binary files a/test/fixtures/core.scale/y-axis-position-dynamic.png and b/test/fixtures/core.scale/y-axis-position-dynamic.png differ