Merge pull request #36 from sgratzl/release/v4.1.2

Release v4.1.2

Author: sgratzl

.yarn/releases/yarn-3.3.1.cjs

@@ -3,4 +3,4 @@ packageExtensions:
     dependencies:
       eslint-import-resolver-node: "*"
 
-yarnPath: .yarn/releases/yarn-3.3.1.cjs
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

.yarn/releases/yarn-3.4.1.cjs

@@ -1,7 +1,7 @@
 {
   "name": "chartjs-plugin-hierarchical",
   "description": "Chart.js module for hierarchical categories",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "author": {
     "name": "Samuel Gratzl",
     "email": "[email protected]",
@@ -54,48 +54,48 @@
   ],
   "devDependencies": {
     "@chiogen/rollup-plugin-terser": "^7.1.3",
-    "@rollup/plugin-commonjs": "^24.0.0",
+    "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-typescript": "^11.0.0",
-    "@types/jest": "^29.2.5",
+    "@types/jest": "^29.4.0",
     "@types/jest-image-snapshot": "^6.1.0",
-    "@types/node": "^18.11.18",
-    "@types/seedrandom": "^3.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
-    "@yarnpkg/sdks": "^2.6.3",
+    "@types/node": "^18.14.6",
+    "@types/seedrandom": "^3.0.5",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
+    "@yarnpkg/sdks": "^2.7.0",
     "canvas": "^2.11.0",
     "canvas-5-polyfill": "^0.1.5",
-    "chart.js": "^4.1.2",
-    "eslint": "^8.31.0",
+    "chart.js": "^4.2.1",
+    "eslint": "^8.35.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-import": "^2.27.4",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.0",
+    "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
+    "jest": "^29.4.3",
+    "jest-environment-jsdom": "^29.4.3",
     "jest-image-snapshot": "^6.1.0",
-    "prettier": "^2.8.3",
-    "rimraf": "^4.0.5",
-    "rollup": "^3.10.0",
+    "prettier": "^2.8.4",
+    "rimraf": "^4.3.0",
+    "rollup": "^3.18.0",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-dts": "^5.1.1",
+    "rollup-plugin-dts": "^5.2.0",
     "seedrandom": "^3.0.5",
     "ts-jest": "^29.0.5",
-    "tslib": "^2.4.1",
-    "typedoc": "^0.23.24",
-    "typescript": "^4.9.4",
+    "tslib": "^2.5.0",
+    "typedoc": "^0.23.26",
+    "typescript": "^4.9.5",
     "us-atlas": "^3.0.0",
     "world-atlas": "^2.0.2"
   },
   "scripts": {
-    "clean": "rimraf build docs node_modules \"*.tgz\" \"*.tsbuildinfo\"",
+    "clean": "rimraf --glob build docs node_modules \"*.tgz\" \"*.tsbuildinfo\"",
     "compile": "tsc -b tsconfig.c.json",
     "compile:types": "tsc -p tsconfig.c.json --emitDeclarationOnly",
     "start": "yarn run watch",
@@ -113,5 +113,5 @@
     "docs": "typedoc src/index.ts",
     "prepare": "yarn run build"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.4.1"
 }

.yarnrc.yml

@@ -242,7 +242,7 @@ function zoomOut(chart: IEnhancedChart, parent: ILabelNode) {
 
 function resolveElement(event: { x: number; y: number }, scale: HierarchicalScale) {
   const hor = scale.isHorizontal();
-  const offset = hor ? scale.top + scale.options.padding : scale.left - scale.options.padding;
+  const offset = hor ? scale.bottom + scale.options.padding : scale.left - scale.options.padding;
   if ((hor && event.y <= offset) || (!hor && event.x > offset)) {
     return null;
   }
@@ -547,7 +547,7 @@ const hierarchicalPlugin: Plugin = {
     if (hor) {
       ctx.textAlign = 'center';
       ctx.textBaseline = renderLabel === 'above' ? 'bottom' : 'top';
-      ctx.translate(scale.left, scale.top + scale.options.padding);
+      ctx.translate(scale.left, scale.bottom + scale.options.padding);
       roots.forEach((n) => preOrderTraversal(n, renderHorLevel));
     } else {
       ctx.textAlign = 'right';

package.json

@@ -12,7 +12,7 @@ export interface IHierarchicalScaleOptions extends CategoryScaleOptions {
   levelPercentage: number;
   /**
    * padding of the first collapse to the start of the x-axis
-   * @default 25
+   * @default 5
    */
   padding: number;
   /**
@@ -89,7 +89,7 @@ const defaultConfig: Partial<Omit<IHierarchicalScaleOptions, 'grid'>> & {
   /**
    * top/left padding for showing the hierarchy marker
    */
-  padding: 25,
+  padding: 5,
   /**
    * position of the hierarchy label
    * possible values: 'below', 'above', null to disable