Merge branch 'master' into eleanor-gptdraw

1 files changed, 16 insertions, 76 deletions

diff --git a/package-lock.json b/package-lock.json
index 70f53156c..be3fac8dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,6 +49,7 @@
                 "@types/pdf-parse": "^1.1.4",
                 "@types/reveal": "^4.2.0",
                 "@types/supercluster": "^7.1.3",
+                "@types/textfit": "^2.4.4",
                 "@types/web": "^0.0.151",
                 "@types/webpack-hot-middleware": "^2.25.9",
                 "@typescript-eslint/parser": "^7.8.0",
@@ -220,8 +221,8 @@
                 "stream-browserify": "^3.0.0",
                 "styled-components": "^6.1.1",
                 "supercluster": "^8.0.1",
-                "svgson": "^5.3.1",
                 "textarea-caret": "^3.1.0",
+                "textfit": "^2.4.0",
                 "tough-cookie": "^4.1.3",
                 "tslint": "^6.1.3",
                 "tslint-loader": "^3.5.4",
@@ -9413,7 +9414,6 @@
             "version": "3.5.30",
             "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.30.tgz",
             "integrity": "sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==",
-            "dev": true,
             "dependencies": {
                 "@types/sizzle": "*"
             }
@@ -9817,8 +9817,7 @@
         "node_modules/@types/sizzle": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
-            "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
-            "dev": true
+            "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg=="
         },
         "node_modules/@types/sockjs": {
             "version": "0.3.36",
@@ -9854,6 +9853,14 @@
                 "@types/geojson": "*"
             }
         },
+        "node_modules/@types/textfit": {
+            "version": "2.4.4",
+            "resolved": "https://registry.npmjs.org/@types/textfit/-/textfit-2.4.4.tgz",
+            "integrity": "sha512-AYlNcJ5j/WspQfbHIhoF0Wo63F5+REnX/VPFSH5unUUuwRcr6IoXxZki3vYhG4DRVUQe51AsFYyRxml5u+qaAg==",
+            "dependencies": {
+                "@types/jquery": "*"
+            }
+        },
         "node_modules/@types/tough-cookie": {
             "version": "4.0.5",
             "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
@@ -16771,29 +16778,6 @@
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
             "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
         },
-        "node_modules/deep-rename-keys": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/deep-rename-keys/-/deep-rename-keys-0.2.1.tgz",
-            "integrity": "sha512-RHd9ABw4Fvk+gYDWqwOftG849x0bYOySl/RgX0tLI9i27ZIeSO91mLZJEp7oPHOMFqHvpgu21YptmDt0FYD/0A==",
-            "dependencies": {
-                "kind-of": "^3.0.2",
-                "rename-keys": "^1.1.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/deep-rename-keys/node_modules/kind-of": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-            "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-            "dependencies": {
-                "is-buffer": "^1.1.5"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/deepmerge": {
             "version": "4.3.1",
             "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -22612,11 +22596,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-        },
         "node_modules/is-callable": {
             "version": "1.2.7",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -37180,14 +37159,6 @@
                 "@types/unist": "*"
             }
         },
-        "node_modules/rename-keys": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/rename-keys/-/rename-keys-1.2.0.tgz",
-            "integrity": "sha512-U7XpAktpbSgHTRSNRrjKSrjYkZKuhUukfoBlXWXUExCAqhzh1TU3BDRAfJmarcl5voKS+pbKU9MvyLWKZ4UEEg==",
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
         "node_modules/renderkid": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
@@ -39279,15 +39250,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/svgson": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/svgson/-/svgson-5.3.1.tgz",
-            "integrity": "sha512-qdPgvUNWb40gWktBJnbJRelWcPzkLed/ShhnRsjbayXz8OtdPOzbil9jtiZdrYvSDumAz/VNQr6JaNfPx/gvPA==",
-            "dependencies": {
-                "deep-rename-keys": "^0.2.1",
-                "xml-reader": "2.4.3"
-            }
-        },
         "node_modules/symbol-tree": {
             "version": "3.2.4",
             "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -39567,6 +39529,11 @@
             "resolved": "https://registry.npmjs.org/textarea-caret/-/textarea-caret-3.1.0.tgz",
             "integrity": "sha512-cXAvzO9pP5CGa6NKx0WYHl+8CHKZs8byMkt3PCJBCmq2a34YA9pO1NrQET5pzeqnBjBdToF5No4rrmkDUgQC2Q=="
         },
+        "node_modules/textfit": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/textfit/-/textfit-2.4.0.tgz",
+            "integrity": "sha512-/x4aoY5+/tJmu+iwpBH1yw75TFp86M6X15SvaaY/Eep7YySQYtqdOifEtfvVyMwzl7SZ+G4RQw00FD9g5R6i1Q=="
+        },
         "node_modules/thingies": {
             "version": "1.21.0",
             "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
@@ -42152,19 +42119,6 @@
                 "xtend": "^4.0.0"
             }
         },
-        "node_modules/xml-lexer": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/xml-lexer/-/xml-lexer-0.2.2.tgz",
-            "integrity": "sha512-G0i98epIwiUEiKmMcavmVdhtymW+pCAohMRgybyIME9ygfVu8QheIi+YoQh3ngiThsT0SQzJT4R0sKDEv8Ou0w==",
-            "dependencies": {
-                "eventemitter3": "^2.0.0"
-            }
-        },
-        "node_modules/xml-lexer/node_modules/eventemitter3": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
-            "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
-        },
         "node_modules/xml-name-validator": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
@@ -42179,20 +42133,6 @@
             "resolved": "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz",
             "integrity": "sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g=="
         },
-        "node_modules/xml-reader": {
-            "version": "2.4.3",
-            "resolved": "https://registry.npmjs.org/xml-reader/-/xml-reader-2.4.3.tgz",
-            "integrity": "sha512-xWldrIxjeAMAu6+HSf9t50ot1uL5M+BtOidRCWHXIeewvSeIpscWCsp4Zxjk8kHHhdqFBrfK8U0EJeCcnyQ/gA==",
-            "dependencies": {
-                "eventemitter3": "^2.0.0",
-                "xml-lexer": "^0.2.2"
-            }
-        },
-        "node_modules/xml-reader/node_modules/eventemitter3": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
-            "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
-        },
         "node_modules/xml2js": {
             "version": "0.5.0",
             "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",