From 042a842f4f9204d92d95d451d8af28eecaa76cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemek=20Wi=C4=99ch?= Date: Wed, 15 Jan 2025 00:45:57 +0100 Subject: [PATCH] Upgrade d3 to newest version --- package-lock.json | 308 ++++++++++++++++++++++++++-------------------- package.json | 35 ++++-- src/chart.tsx | 7 +- 3 files changed, 198 insertions(+), 152 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d7c09d..7b5a40f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,11 +12,11 @@ "array.prototype.flatmap": "^1.2.4", "buffer": "^6.0.3", "canvas-toBlob": "^1.0.0", - "d3-array": "^2.12.1", - "d3-interpolate": "^2.0.1", - "d3-selection": "^2.0.0", - "d3-transition": "^2.0.0", - "d3-zoom": "^2.0.0", + "d3-array": "^3.2.4", + "d3-interpolate": "^3.0.1", + "d3-selection": "^3.0.0", + "d3-transition": "^3.0.1", + "d3-zoom": "^3.0.0", "debounce": "^2.2.0", "detect-browser": "^5.2.0", "fflate": "^0.8.2", @@ -40,7 +40,7 @@ "remark-rehype": "^11.1.1", "semantic-ui-css": "^2.4.1", "semantic-ui-react": "^2.0.3", - "topola": "^3.7.4", + "topola": "^3.8.0", "turbocommons-ts": "^3.8.0", "unified": "^11.0.5", "wikitree-js": "^0.4.0" @@ -51,11 +51,11 @@ "@formatjs/intl": "^2.10.15", "@types/adm-zip": "^0.5.0", "@types/array.prototype.flatmap": "^1.2.2", - "@types/d3-array": "^2.9.0", - "@types/d3-interpolate": "^2.0.0", - "@types/d3-selection": "^2.0.0", - "@types/d3-transition": "^2.0.0", - "@types/d3-zoom": "^2.0.0", + "@types/d3-array": "^3.2.1", + "@types/d3-interpolate": "^3.0.4", + "@types/d3-selection": "^3.0.11", + "@types/d3-transition": "^3.0.9", + "@types/d3-zoom": "^3.0.8", "@types/debounce": "^1.2.0", "@types/file-saver": "^2.0.1", "@types/history": "^4.7.8", @@ -4199,9 +4199,9 @@ } }, "node_modules/@types/d3-array": { - "version": "2.12.7", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.7.tgz", - "integrity": "sha512-SVvxzxRVnIgtJbNTj5ZVJ9CZkVOANCpW0nQbRi7EOU5Q9G+JQQjXD2SCpr1OYCX09b3Yr7o0+CBofZAgU42rbQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz", + "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==", "dev": true }, "node_modules/@types/d3-color": { @@ -4211,37 +4211,37 @@ "dev": true }, "node_modules/@types/d3-interpolate": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-2.0.5.tgz", - "integrity": "sha512-UINE41RDaUMbulp+bxQMDnhOi51rh5lA2dG+dWZU0UY/IwQiG/u2x8TfnWYU9+xwGdXsJoAvrBYUEQl0r91atg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", + "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", "dev": true, "dependencies": { - "@types/d3-color": "^2" + "@types/d3-color": "*" } }, "node_modules/@types/d3-selection": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-2.0.5.tgz", - "integrity": "sha512-71BorcY0yXl12S7lvb01JdaN9TpeUHBDb4RRhSq8U8BEkX/nIk5p7Byho+ZRTsx5nYLMpAbY3qt5EhqFzfGJlw==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz", + "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==", "dev": true }, "node_modules/@types/d3-transition": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-2.0.6.tgz", - "integrity": "sha512-bbqOUh3Jcd9NmUxGLPqlynhNgwJO/Ic1kWl00k1IJ3vAxMYmrczi8kzlAL3UPCBmtiGN4B/2tATkbLDYZzyHww==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz", + "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==", "dev": true, "dependencies": { - "@types/d3-selection": "^2" + "@types/d3-selection": "*" } }, "node_modules/@types/d3-zoom": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-2.0.7.tgz", - "integrity": "sha512-JWke4E8ZyrKUQ68ESTWSK16fVb0OYnaiJ+WXJRYxKLn4aXU0o4CLYxMWBEiouUfO3TTCoyroOrGPcBG6u1aAxA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz", + "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==", "dev": true, "dependencies": { - "@types/d3-interpolate": "^2", - "@types/d3-selection": "^2" + "@types/d3-interpolate": "*", + "@types/d3-selection": "*" } }, "node_modules/@types/debounce": { @@ -7745,11 +7745,14 @@ } }, "node_modules/d3-array": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", - "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", "dependencies": { - "internmap": "^1.0.0" + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" } }, "node_modules/d3-color": { @@ -7771,10 +7774,18 @@ "d3-selection": "2" } }, - "node_modules/d3-ease": { + "node_modules/d3-drag/node_modules/d3-selection": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz", - "integrity": "sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==" + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", + "integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==" + }, + "node_modules/d3-ease": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "engines": { + "node": ">=12" + } }, "node_modules/d3-flextree": { "version": "2.1.2", @@ -7790,53 +7801,71 @@ "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==" }, "node_modules/d3-hierarchy": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz", - "integrity": "sha512-SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", + "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==", + "engines": { + "node": ">=12" + } }, "node_modules/d3-interpolate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", - "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", "dependencies": { - "d3-color": "1 - 2" + "d3-color": "1 - 3" + }, + "engines": { + "node": ">=12" } }, "node_modules/d3-selection": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", - "integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", + "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", + "engines": { + "node": ">=12" + } }, "node_modules/d3-timer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz", - "integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "engines": { + "node": ">=12" + } }, "node_modules/d3-transition": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz", - "integrity": "sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", + "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", "dependencies": { - "d3-color": "1 - 2", - "d3-dispatch": "1 - 2", - "d3-ease": "1 - 2", - "d3-interpolate": "1 - 2", - "d3-timer": "1 - 2" + "d3-color": "1 - 3", + "d3-dispatch": "1 - 3", + "d3-ease": "1 - 3", + "d3-interpolate": "1 - 3", + "d3-timer": "1 - 3" + }, + "engines": { + "node": ">=12" }, "peerDependencies": { - "d3-selection": "2" + "d3-selection": "2 - 3" } }, "node_modules/d3-zoom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz", - "integrity": "sha512-fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", + "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", "dependencies": { - "d3-dispatch": "1 - 2", - "d3-drag": "2", - "d3-interpolate": "1 - 2", - "d3-selection": "2", - "d3-transition": "2" + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "2 - 3", + "d3-transition": "2 - 3" + }, + "engines": { + "node": ">=12" } }, "node_modules/damerau-levenshtein": { @@ -21038,16 +21067,16 @@ } }, "node_modules/topola": { - "version": "3.7.6", - "resolved": "https://registry.npmjs.org/topola/-/topola-3.7.6.tgz", - "integrity": "sha512-HN91aBiwVnUvK/zqQBRZ7Tz4UpwUljiv5j9aL0FYA6gGWC5KKN056i4GASl5XknHFqXYyBPcqNvjoe61p9PEzA==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/topola/-/topola-3.8.0.tgz", + "integrity": "sha512-q1jLP+lYMkWtKUUhsIEFB9+sDnayN4H1Jgqs4uja0MQzYUMW3RpuAv54m3eBC6Lo7px/a1KTnbWnKofR7/kDGQ==", "dependencies": { "array-flat-polyfill": "^1.0.1", - "d3-array": "^2.12.1", + "d3-array": "^3.2.4", "d3-flextree": "^2.1.1", - "d3-hierarchy": "^2.0.0", - "d3-selection": "^2.0.0", - "d3-transition": "^2.0.0", + "d3-hierarchy": "^3.1.2", + "d3-selection": "^3.0.0", + "d3-transition": "^3.0.1", "parse-gedcom": "^1.0.5" } }, @@ -25701,9 +25730,9 @@ } }, "@types/d3-array": { - "version": "2.12.7", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.7.tgz", - "integrity": "sha512-SVvxzxRVnIgtJbNTj5ZVJ9CZkVOANCpW0nQbRi7EOU5Q9G+JQQjXD2SCpr1OYCX09b3Yr7o0+CBofZAgU42rbQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz", + "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==", "dev": true }, "@types/d3-color": { @@ -25713,37 +25742,37 @@ "dev": true }, "@types/d3-interpolate": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-2.0.5.tgz", - "integrity": "sha512-UINE41RDaUMbulp+bxQMDnhOi51rh5lA2dG+dWZU0UY/IwQiG/u2x8TfnWYU9+xwGdXsJoAvrBYUEQl0r91atg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", + "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", "dev": true, "requires": { - "@types/d3-color": "^2" + "@types/d3-color": "*" } }, "@types/d3-selection": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-2.0.5.tgz", - "integrity": "sha512-71BorcY0yXl12S7lvb01JdaN9TpeUHBDb4RRhSq8U8BEkX/nIk5p7Byho+ZRTsx5nYLMpAbY3qt5EhqFzfGJlw==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz", + "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==", "dev": true }, "@types/d3-transition": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-2.0.6.tgz", - "integrity": "sha512-bbqOUh3Jcd9NmUxGLPqlynhNgwJO/Ic1kWl00k1IJ3vAxMYmrczi8kzlAL3UPCBmtiGN4B/2tATkbLDYZzyHww==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz", + "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==", "dev": true, "requires": { - "@types/d3-selection": "^2" + "@types/d3-selection": "*" } }, "@types/d3-zoom": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-2.0.7.tgz", - "integrity": "sha512-JWke4E8ZyrKUQ68ESTWSK16fVb0OYnaiJ+WXJRYxKLn4aXU0o4CLYxMWBEiouUfO3TTCoyroOrGPcBG6u1aAxA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz", + "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==", "dev": true, "requires": { - "@types/d3-interpolate": "^2", - "@types/d3-selection": "^2" + "@types/d3-interpolate": "*", + "@types/d3-selection": "*" } }, "@types/debounce": { @@ -28367,11 +28396,11 @@ } }, "d3-array": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", - "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", "requires": { - "internmap": "^1.0.0" + "internmap": "1 - 2" } }, "d3-color": { @@ -28391,12 +28420,19 @@ "requires": { "d3-dispatch": "1 - 2", "d3-selection": "2" + }, + "dependencies": { + "d3-selection": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", + "integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==" + } } }, "d3-ease": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz", - "integrity": "sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==" }, "d3-flextree": { "version": "2.1.2", @@ -28414,50 +28450,50 @@ } }, "d3-hierarchy": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz", - "integrity": "sha512-SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", + "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==" }, "d3-interpolate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", - "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", "requires": { - "d3-color": "1 - 2" + "d3-color": "1 - 3" } }, "d3-selection": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", - "integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", + "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==" }, "d3-timer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz", - "integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==" }, "d3-transition": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz", - "integrity": "sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", + "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", "requires": { - "d3-color": "1 - 2", - "d3-dispatch": "1 - 2", - "d3-ease": "1 - 2", - "d3-interpolate": "1 - 2", - "d3-timer": "1 - 2" + "d3-color": "1 - 3", + "d3-dispatch": "1 - 3", + "d3-ease": "1 - 3", + "d3-interpolate": "1 - 3", + "d3-timer": "1 - 3" } }, "d3-zoom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz", - "integrity": "sha512-fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", + "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", "requires": { - "d3-dispatch": "1 - 2", - "d3-drag": "2", - "d3-interpolate": "1 - 2", - "d3-selection": "2", - "d3-transition": "2" + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "2 - 3", + "d3-transition": "2 - 3" } }, "damerau-levenshtein": { @@ -38062,16 +38098,16 @@ "dev": true }, "topola": { - "version": "3.7.6", - "resolved": "https://registry.npmjs.org/topola/-/topola-3.7.6.tgz", - "integrity": "sha512-HN91aBiwVnUvK/zqQBRZ7Tz4UpwUljiv5j9aL0FYA6gGWC5KKN056i4GASl5XknHFqXYyBPcqNvjoe61p9PEzA==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/topola/-/topola-3.8.0.tgz", + "integrity": "sha512-q1jLP+lYMkWtKUUhsIEFB9+sDnayN4H1Jgqs4uja0MQzYUMW3RpuAv54m3eBC6Lo7px/a1KTnbWnKofR7/kDGQ==", "requires": { "array-flat-polyfill": "^1.0.1", - "d3-array": "^2.12.1", + "d3-array": "^3.2.4", "d3-flextree": "^2.1.1", - "d3-hierarchy": "^2.0.0", - "d3-selection": "^2.0.0", - "d3-transition": "^2.0.0", + "d3-hierarchy": "^3.1.2", + "d3-selection": "^3.0.0", + "d3-transition": "^3.0.1", "parse-gedcom": "^1.0.5" } }, diff --git a/package.json b/package.json index 0ae0805..277d097 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,11 @@ "array.prototype.flatmap": "^1.2.4", "buffer": "^6.0.3", "canvas-toBlob": "^1.0.0", - "d3-array": "^2.12.1", - "d3-interpolate": "^2.0.1", - "d3-selection": "^2.0.0", - "d3-transition": "^2.0.0", - "d3-zoom": "^2.0.0", + "d3-array": "^3.2.4", + "d3-interpolate": "^3.0.1", + "d3-selection": "^3.0.0", + "d3-transition": "^3.0.1", + "d3-zoom": "^3.0.0", "debounce": "^2.2.0", "detect-browser": "^5.2.0", "fflate": "^0.8.2", @@ -35,7 +35,7 @@ "remark-rehype": "^11.1.1", "semantic-ui-css": "^2.4.1", "semantic-ui-react": "^2.0.3", - "topola": "^3.7.4", + "topola": "^3.8.0", "turbocommons-ts": "^3.8.0", "unified": "^11.0.5", "wikitree-js": "^0.4.0" @@ -46,11 +46,11 @@ "@formatjs/intl": "^2.10.15", "@types/adm-zip": "^0.5.0", "@types/array.prototype.flatmap": "^1.2.2", - "@types/d3-array": "^2.9.0", - "@types/d3-interpolate": "^2.0.0", - "@types/d3-selection": "^2.0.0", - "@types/d3-transition": "^2.0.0", - "@types/d3-zoom": "^2.0.0", + "@types/d3-array": "^3.2.1", + "@types/d3-interpolate": "^3.0.4", + "@types/d3-selection": "^3.0.11", + "@types/d3-transition": "^3.0.9", + "@types/d3-zoom": "^3.0.8", "@types/debounce": "^1.2.0", "@types/file-saver": "^2.0.1", "@types/history": "^4.7.8", @@ -76,7 +76,7 @@ "start": "GENERATE_SOURCEMAP=false run-script-os", "start:default": "REACT_APP_CHANGELOG=`cat CHANGELOG.md` REACT_APP_GIT_SHA=`git rev-parse --short HEAD` REACT_APP_GIT_TIME=`git log -1 --format=%ci` react-scripts start", "start:windows": "react-scripts start", - "build": "run-script-os", + "build": "GENERATE_SOURCEMAP=false run-script-os", "build:default": "REACT_APP_CHANGELOG=`cat CHANGELOG.md` REACT_APP_GIT_SHA=`git rev-parse --short HEAD` REACT_APP_GIT_TIME=`git log -1 --format=%ci` react-scripts build", "build:windows": "react-scripts build", "test": "react-scripts test --env=jsdom", @@ -100,5 +100,16 @@ "@typescript-eslint/no-unused-vars": "off", "@typescript-eslint/no-use-before-define": "off" } + }, + "jest": { + "moduleNameMapper": { + "d3-array": "/node_modules/d3-array/dist/d3-array.js", + "d3-ease": "/node_modules/d3-ease/dist/d3-ease.js", + "d3-hierarchy": "/node_modules/d3-hierarchy/dist/d3-hierarchy.js", + "d3-interpolate": "/node_modules/d3-interpolate/dist/d3-interpolate.js", + "d3-selection": "/node_modules/d3-selection/dist/d3-selection.js", + "d3-timer": "/node_modules/d3-timer/dist/d3-timer.js", + "d3-transition": "/node_modules/d3-transition/dist/d3-transition.js" + } } } diff --git a/src/chart.tsx b/src/chart.tsx index 8b9bcdf..6075d92 100644 --- a/src/chart.tsx +++ b/src/chart.tsx @@ -371,10 +371,9 @@ class ChartWrapper { ]); const svgTransition = svg.transition().delay(200).duration(500); const transition = args.initialRender ? svg : svgTransition; - transition - .attr('transform', `translate(${offsetX}, ${offsetY})`) - .attr('width', chartInfo.size[0] * scale) - .attr('height', chartInfo.size[1] * scale); + transition.attr('transform', `translate(${offsetX}, ${offsetY})`); + transition.attr('width', chartInfo.size[0] * scale); + transition.attr('height', chartInfo.size[1] * scale); if (args.resetPosition) { if (args.initialRender) { parent.scrollLeft = -dx;