Skip to content

Commit 360f51a

Browse files
committed
Revert "Update svg.js dependency; initial tests look good"
This reverts commit 9ba538b.
1 parent 8772af4 commit 360f51a

4 files changed

Lines changed: 40 additions & 26 deletions

File tree

package-lock.json

Lines changed: 32 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"svg"
2828
],
2929
"dependencies": {
30-
"@svgdotjs/svg.js": "^3.2.5",
30+
"@svgdotjs/svg.js": "3.2.0",
3131
"@turf/union": "^6.5.0",
3232
"@types/fnv-plus": "^1.3.2",
3333
"ajv": "^8.12.0",
@@ -37,7 +37,6 @@
3737
"honeycomb-grid": "4.1.1",
3838
"json-stringify-deterministic": "^1.0.12",
3939
"monotone-chain-convex-hull": "^1.1.0",
40-
"svgdom": "^0.1.23",
4140
"tinycolor2": "^1.6.0",
4241
"transformation-matrix-js": "github:epistemex/transformation-matrix-js",
4342
"uuid": "^9.0.0"
@@ -67,6 +66,7 @@
6766
"rimraf": "^5.0.1",
6867
"serverless-finch": "^4.0.3",
6968
"shx": "^0.4.0",
69+
"svgdom": "^0.1.14",
7070
"ts-loader": "^9.4.2",
7171
"ts-node": "^10.9.1",
7272
"tsx": "^4.20.6",

src/renderers/_base.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,13 +1192,13 @@ export abstract class RendererBase {
11921192
.center(pt.x, pt.y)
11931193
.attr({ 'pointer-events': 'none' });
11941194
} else if (shape === "circle") {
1195-
notes.circle(this.cellsize * 1.1)
1195+
notes.circle(this.cellsize * 1.1, this.cellsize * 1.1)
11961196
.addClass(`aprender-annotation-${x2uid(cloned)}`)
11971197
.fill("none")
11981198
.stroke({color: this.options.colourContext.board ?? this.options.colourContext.background, width: strokeWeight, linecap: "round", linejoin: "round", opacity: bgopacity})
11991199
.center(pt.x, pt.y)
12001200
.attr({ 'pointer-events': 'none' });
1201-
notes.circle(this.cellsize * 1.1)
1201+
notes.circle(this.cellsize * 1.1, this.cellsize * 1.1)
12021202
.addClass(`aprender-annotation-${x2uid(cloned)}`)
12031203
.fill("none")
12041204
.stroke({color: colour, width: strokeWeight, dasharray, linecap: "round", linejoin: "round", opacity})
@@ -1319,13 +1319,13 @@ export abstract class RendererBase {
13191319
.center(pt.x, pt.y)
13201320
.attr({ 'pointer-events': 'none' });
13211321
} else if (shape === "circle") {
1322-
notes.circle(this.cellsize * 1.1)
1322+
notes.circle(this.cellsize * 1.1, this.cellsize * 1.1)
13231323
.addClass(`aprender-annotation-${x2uid(cloned)}`)
13241324
.fill("none")
13251325
.stroke({color: this.options.colourContext.board ?? this.options.colourContext.background, width: strokeWeight, linecap: "round", linejoin: "round", opacity: bgopacity})
13261326
.center(pt.x, pt.y)
13271327
.attr({ 'pointer-events': 'none' });
1328-
notes.circle(this.cellsize * 1.1)
1328+
notes.circle(this.cellsize * 1.1, this.cellsize * 1.1)
13291329
.addClass(`aprender-annotation-${x2uid(cloned)}`)
13301330
.fill("none")
13311331
.stroke({color: colour, width: strokeWeight, dasharray, linecap: "round", linejoin: "round", opacity})

src/renderers/treePyramid.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ export class TreePyramidRenderer extends RendererBase {
245245
.center(pt.x, pt.y)
246246
.attr({ 'pointer-events': 'none' });
247247
} else if (shape === "circle") {
248-
notes.circle(this.cellsize * 1.1)
248+
notes.circle(this.cellsize * 1.1, this.cellsize * 1.1)
249249
.addClass(`aprender-annotation-${x2uid(cloned)}`)
250250
.fill("none")
251251
.stroke({color: this.options.colourContext.background, width: strokeWeight, linecap: "round", linejoin: "round", opacity: bgopacity})
252252
.center(pt.x, pt.y)
253253
.attr({ 'pointer-events': 'none' });
254-
notes.circle(this.cellsize * 1.1)
254+
notes.circle(this.cellsize * 1.1, this.cellsize * 1.1)
255255
.addClass(`aprender-annotation-${x2uid(cloned)}`)
256256
.fill("none")
257257
.stroke({color: colour, width: strokeWeight, dasharray, linecap: "round", linejoin: "round"})

0 commit comments

Comments
 (0)