Merge branch 'chartjs:master' into colors-plugin

Author: igorlukanin

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/[email protected].2
+      - uses: pnpm/[email protected].4
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:

.github/workflows/compressed-size.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: pnpm/[email protected].2
+    - uses: pnpm/[email protected].4
     - uses: preactjs/compressed-size-action@v2
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: pnpm/[email protected].2
+    - uses: pnpm/[email protected].4
     - uses: andresz1/size-limit-action@master
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy-docs.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/[email protected].2
+      - uses: pnpm/[email protected].4
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/[email protected].2
+      - uses: pnpm/[email protected].4
       - uses: actions/setup-node@v3
         with:
           registry-url: https://registry.npmjs.org/
@@ -71,7 +71,7 @@ jobs:
     if: "!github.event.release.prerelease"
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/[email protected].2
+      - uses: pnpm/[email protected].4
       - uses: actions/setup-node@v3
         with:
           registry-url: https://registry.npmjs.org/

docs/configuration/legend.md

@@ -67,7 +67,7 @@ Namespace: `options.plugins.legend.labels`
 | `textAlign` | `string` | `'center'` | Horizontal alignment of the label text. Options are: `'left'`, `'right'` or `'center'`.
 | `usePointStyle` | `boolean` | `false` | Label style will match corresponding point style (size is based on pointStyleWidth or the minimum value between boxWidth and font.size).
 | `pointStyleWidth` | `number` | `null` | If `usePointStyle` is true, the width of the point style used for the legend.
-| `useBorderRadius` | `boolean` | `false` | Label borderRadius will match coresponding borderRadius.
+| `useBorderRadius` | `boolean` | `false` | Label borderRadius will match corresponding borderRadius.
 | `borderRadius` | `number` | `undefined` | Override the borderRadius to use.
 
 ## Legend Title Configuration

docs/configuration/tooltip.md

@@ -304,8 +304,8 @@ const myPieChart = new Chart(ctx, {
                             let style = 'background:' + colors.backgroundColor;
                             style += '; border-color:' + colors.borderColor;
                             style += '; border-width: 2px';
-                            const span = '<span style="' + style + '"></span>';
-                            innerHtml += '<tr><td>' + span + body + '</td></tr>';
+                            const span = '<span style="' + style + '">' + body + '</span>';
+                            innerHtml += '<tr><td>' + span + '</td></tr>';
                         });
                         innerHtml += '</tbody>';
 

docs/developers/publishing.md

@@ -1,6 +1,6 @@
 # Publishing an extension
 
-If you are planning on publishing an extension for Chart.js, here are a some pointers.
+If you are planning on publishing an extension for Chart.js, here are some pointers.
 
 ## Awesome
 

docs/samples/area/line-stacked.md

@@ -173,7 +173,7 @@ module.exports = {
 
 ## Docs
 * [Area](../../charts/area.html)
-  * [Filling modes](../../charts/area.htmll#filling-modes)
+  * [Filling modes](../../charts/area.html#filling-modes)
 * [Line](../../charts/line.html)
 * [Data structures (`labels`)](../../general/data-structures.html)
 * [Axes scales](../../axes/)

docs/samples/area/radar.md

@@ -142,7 +142,7 @@ module.exports = {
 
 ## Docs
 * [Area](../../charts/area.html)
-  * [Filling modes](../../charts/area.htmll#filling-modes)
+  * [Filling modes](../../charts/area.html#filling-modes)
   * [`propagate`](../../charts/area.html#propagate)
 * [Radar](../../charts/radar.html)
 * [Data structures (`labels`)](../../general/data-structures.html)

docs/samples/line/point-styling.md

@@ -7,7 +7,7 @@ const actions = [
     name: 'pointStyle: circle (default)',
     handler: (chart) => {
       chart.data.datasets.forEach(dataset => {
-        dataset.pointStyle = 'cirlce';
+        dataset.pointStyle = 'circle';
       });
       chart.update();
     }