From 5d4d969d8139049d7d9c556378b31fb188ea443c Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Sat, 11 Mar 2023 09:44:57 -0500 Subject: [PATCH] Enable separate grid and border dashes for cartesian axes --- docs/axes/styling.md | 2 + src/core/core.scale.defaults.js | 2 + src/core/core.scale.js | 7 +-- src/types/index.d.ts | 8 ++++ test/fixtures/core.scale/grid/borderDash.js | 41 ++++++++++++++++++ test/fixtures/core.scale/grid/borderDash.png | Bin 0 -> 14805 bytes ...table-borderDash.js => scriptable-dash.js} | 8 +--- ...ble-borderDash.png => scriptable-dash.png} | Bin 8 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 test/fixtures/core.scale/grid/borderDash.js create mode 100644 test/fixtures/core.scale/grid/borderDash.png rename test/fixtures/core.scale/grid/{scriptable-borderDash.js => scriptable-dash.js} (91%) rename test/fixtures/core.scale/grid/{scriptable-borderDash.png => scriptable-dash.png} (100%) diff --git a/docs/axes/styling.md b/docs/axes/styling.md index 4eb9bf0b428..6f77edd5de7 100644 --- a/docs/axes/styling.md +++ b/docs/axes/styling.md @@ -10,6 +10,8 @@ Namespace: `options.scales[scaleId].grid`, it defines options for the grid lines | ---- | ---- | :-------------------------------: | :-----------------------------: | ------- | ----------- | `circular` | `boolean` | | | `false` | If true, gridlines are circular (on radar and polar area charts only). | `color` | [`Color`](../general/colors.md) | Yes | Yes | `Chart.defaults.borderColor` | The color of the grid lines. If specified as an array, the first color applies to the first grid line, the second to the second grid line, and so on. +| `dash` | `number[]` | Yes | | `[]` | Length and spacing of dashes on grid lines. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash). +| `dashOffset` | `number` | Yes | | `0.0` | Offset for line dashes. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineDashOffset). | `display` | `boolean` | | | `true` | If false, do not display grid lines for this axis. | `drawOnChartArea` | `boolean` | | | `true` | If true, draw lines on the chart area inside the axis lines. This is useful when there are multiple axes and you need to control which grid lines are drawn. | `drawTicks` | `boolean` | | | `true` | If true, draw lines beside the ticks in the axis area beside the chart. diff --git a/src/core/core.scale.defaults.js b/src/core/core.scale.defaults.js index 85f9764ec0a..7cd04c846f7 100644 --- a/src/core/core.scale.defaults.js +++ b/src/core/core.scale.defaults.js @@ -24,6 +24,8 @@ export function applyScaleDefaults(defaults) { // grid line settings grid: { + dash: [], + dashOffset: 0, display: true, lineWidth: 1, drawOnChartArea: true, diff --git a/src/core/core.scale.js b/src/core/core.scale.js index 8b8bf347292..8ba19ba6873 100644 --- a/src/core/core.scale.js +++ b/src/core/core.scale.js @@ -1089,12 +1089,11 @@ export default class Scale extends Element { for (i = 0; i < ticksLength; i += step) { const context = this.getContext(i); const optsAtIndex = grid.setContext(context); - const optsAtIndexBorder = border.setContext(context); const lineWidth = optsAtIndex.lineWidth; const lineColor = optsAtIndex.color; - const borderDash = optsAtIndexBorder.dash || []; - const borderDashOffset = optsAtIndexBorder.dashOffset; + const borderDash = optsAtIndex.dash || []; + const borderDashOffset = optsAtIndex.dashOffset; const tickWidth = optsAtIndex.tickWidth; const tickColor = optsAtIndex.tickColor; @@ -1536,6 +1535,8 @@ export default class Scale extends Element { ctx.save(); ctx.lineWidth = borderOpts.width; ctx.strokeStyle = borderOpts.color; + ctx.lineDashOffset = borderOpts.dashOffset; + ctx.setLineDash(borderOpts.dash || []); ctx.beginPath(); ctx.moveTo(x1, y1); diff --git a/src/types/index.d.ts b/src/types/index.d.ts index c4f042ec16e..afbcf43ae05 100644 --- a/src/types/index.d.ts +++ b/src/types/index.d.ts @@ -2934,6 +2934,14 @@ export interface BorderOptions { } export interface GridLineOptions { + /** + * @default [] + */ + dash: number[]; + /** + * @default 0 + */ + dashOffset: Scriptable; /** * @default true */ diff --git a/test/fixtures/core.scale/grid/borderDash.js b/test/fixtures/core.scale/grid/borderDash.js new file mode 100644 index 00000000000..2979ff2f7d4 --- /dev/null +++ b/test/fixtures/core.scale/grid/borderDash.js @@ -0,0 +1,41 @@ +module.exports = { + config: { + type: 'scatter', + options: { + scales: { + x: { + position: {y: 0}, + min: -10, + max: 10, + border: { + dash: [6, 3], + color: 'red', + }, + grid: { + color: 'lightGray', + lineWidth: 3, + }, + ticks: { + display: false + }, + }, + y: { + position: {x: 0}, + min: -10, + max: 10, + border: { + color: 'red', + dash: [6, 3], + }, + grid: { + color: 'lightGray', + lineWidth: 3, + }, + ticks: { + display: false + }, + } + } + } + } +}; diff --git a/test/fixtures/core.scale/grid/borderDash.png b/test/fixtures/core.scale/grid/borderDash.png new file mode 100644 index 0000000000000000000000000000000000000000..a5a007ea27c2172819f9afec9718490b1b112ec1 GIT binary patch literal 14805 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

jrKfl(+DK_dP~1CJn((GSt>}+;^rjp1=L% z*-MU_v#9rngs+mRyXu;{PJh8cUetWI#quZ58B7-oN;h&;5)y;&QyX1nX6K8%J+QU@ zp@#H|k3OW_{XT1o4-#1hqhCkm-~#vrKEE<<-~U@ODJHg3{TcTJ8DlB0-xM6x=B)w{ zrxRC75m=NDq(kYEe&LoQZS+azz5>wJ zT)MRv8^51>x`*b3xl05C`85*F))Yp{n!_t}5+=;OQVk*lSx~1C8-LtXacTC1xrYit z3`^tXcOxOLG7+B0N#<@70xavvl&{N(jN}esqA~fL#mm_96(VR(-Ipr=g1~YFgU2Ns zNg3lwc%=sk#Ba&wSZVDfyduQoGmc9(*Y102j^UL)fuTzL5ODEO9R7SsF(@Mxd4vw< zU6f{TIT1M%NQlmkv>9}mS8n9wd?HJ@>D6H`%>iA#wU7|Ch8*5?1~!z?rEr-CDQr@u zdTCCHnI6j-Nll&a1S1u{25S&mgt|r1(iRiq)8%6@5CEIVNclKpzVRgSNrMXGl#6ah zBWh+b_v6|z@d;9Zm3Md^zsopSVg`|_<4Q_O2=ch3CCyH{4{PSvJN6t>QNc#7l98xm zdY8@tRB5+xC+*al3oGKTYhrzk9;9#fenx7o>7GK~AlgTtR#fy}_2yJKoXAwa0IY{47b!NI$E#Zf!g^6VjTB+MlT(x} zNQjT^Cgh%B!MrdJ4*p1k91Rd($rY(WWE}2X#;sl7U0Dm(#cDe<&j@fF;Gjv|WDX^@ zV#19kq6R&^+wTxVWg;z=kcC~AXhmzEi#XdZj0(f)r?eq5M89yJ9u2YW8>OXeCwjtP z-Q`UtzkFg3r+eaVcZL%h)DGpJMl$k#I?0I=GZfq*CzH{tDE|W6JRx%9HVG}hTi@GU z8LR8I4UYHM#<&b1&T&^|+~ko-?`*+tTFDbrDFAqrzjCzn0jImBIBOFqW&H=Vw8`C; zjm+~EI88T|&fSi<`<+^&p1*yOl9IA-nY0zwK4hF*J4$V3SMSi_XCclX))H)AStk!o z4JKd^$A9K>z2aiM{q%M4Ucd30fPB%IFuMce4yc)!D$hQD&tSQ zS8Kkhei;0==9}}0XbeHjLdq*+RO790*h)9LQI-hYl(kaw;1roWD+w7qcwJnJg9*yE zao~DQ-=$x01za${#ikVC;K|;78)u;AaIyC~3G>%>hqVA1HZ;yvrq(_|W?I3QdT_|=0v>=N_2oF9q{KR(%hNBK5qpletay~4Rn#i7>Dq7x--Tjqyn z;FE&^nMdNVPr8`ySuBq>^{O29Bs*WedIVhZ>a*TpAkzU&ORvtyAnl&I7)Yw!lF~Bd`8;mxy;4s%dIRid!Obk%h9?}lwE!

jb*BzYjh8Y5(LJ?4Q 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 C$f!O5 literal 0 HcmV?d00001 diff --git a/test/fixtures/core.scale/grid/scriptable-borderDash.js b/test/fixtures/core.scale/grid/scriptable-dash.js similarity index 91% rename from test/fixtures/core.scale/grid/scriptable-borderDash.js rename to test/fixtures/core.scale/grid/scriptable-dash.js index 2471e64304b..a7d6a57face 100644 --- a/test/fixtures/core.scale/grid/scriptable-borderDash.js +++ b/test/fixtures/core.scale/grid/scriptable-dash.js @@ -7,11 +7,9 @@ module.exports = { position: {y: 0}, min: -10, max: 10, - border: { - dash: (ctx) => ctx.index % 2 === 0 ? [6, 3] : [], - }, grid: { color: 'lightGray', + dash: (ctx) => ctx.index % 2 === 0 ? [6, 3] : [], lineWidth: 3, }, ticks: { @@ -22,11 +20,9 @@ module.exports = { position: {x: 0}, min: -10, max: 10, - border: { - dash: (ctx) => ctx.index % 2 === 0 ? [6, 3] : [], - }, grid: { color: 'lightGray', + dash: (ctx) => ctx.index % 2 === 0 ? [6, 3] : [], lineWidth: 3, }, ticks: { diff --git a/test/fixtures/core.scale/grid/scriptable-borderDash.png b/test/fixtures/core.scale/grid/scriptable-dash.png similarity index 100% rename from test/fixtures/core.scale/grid/scriptable-borderDash.png rename to test/fixtures/core.scale/grid/scriptable-dash.png