diff --git a/assets/css/app.css b/assets/css/app.css index 4c170431b..ad1afe7e2 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -30,28 +30,28 @@ poi-main { position: relative; } -.bp4-popover-content, -.bp4-dialog { +.bp5-popover-content, +.bp5-dialog { backdrop-filter: blur(5px); } -.bp4-tooltip .bp4-popover-content { +.bp5-tooltip .bp5-popover-content { max-width: calc(50vw - 20px); overflow: hidden; } .plugin-dropdown-container, -.plugin-dropdown-container .bp4-popover-content { +.plugin-dropdown-container .bp5-popover-content { border-top-left-radius: 0; border-top-right-radius: 0; } -.plugin-dropdown-container > .bp4-popover-content > .bp4-menu { +.plugin-dropdown-container > .bp5-popover-content > .bp5-menu { background: transparent; } -.bp4-html-select select, -.bp4-select select { +.bp5-html-select select, +.bp5-select select { background-image: none; } @@ -81,8 +81,8 @@ poi-main { margin: 6px 10px !important; } -body:not(.bp4-dark) #electron-app-title-bar .window-controls button:not(:hover), -body:not(.bp4-dark) #electron-app-title-bar #app-menu-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:not(:hover) { +body:not(.bp5-dark) #electron-app-title-bar .window-controls button:not(:hover), +body:not(.bp5-dark) #electron-app-title-bar #app-menu-bar .toolbar-dropdown:not(.open) > .toolbar-button > button:not(:hover) { color: #24292e; } diff --git a/assets/css/global.css b/assets/css/global.css index ea08406d4..0314d4f6e 100644 --- a/assets/css/global.css +++ b/assets/css/global.css @@ -169,19 +169,19 @@ input[type="number"]::-webkit-outer-spin-button { } /* progress bar */ -.bp4-intent-red.bp4-intent-red.bp4-intent-red .bp4-progress-meter { +.bp5-intent-red.bp5-intent-red.bp5-intent-red .bp5-progress-meter { background-color: var(--poi-red); } -.bp4-intent-orange.bp4-intent-orange.bp4-intent-orange .bp4-progress-meter { +.bp5-intent-orange.bp5-intent-orange.bp5-intent-orange .bp5-progress-meter { background-color: var(--poi-orange); } -.bp4-intent-yellow.bp4-intent-yellow.bp4-intent-yellow .bp4-progress-meter { +.bp5-intent-yellow.bp5-intent-yellow.bp5-intent-yellow .bp5-progress-meter { background-color: var(--poi-yellow); } -.bp4-intent-green.bp4-intent-green.bp4-intent-green .bp4-progress-meter { +.bp5-intent-green.bp5-intent-green.bp5-intent-green .bp5-progress-meter { background-color: var(--poi-green); } diff --git a/package-lock.json b/package-lock.json index 0856d4f4e..01cf5f903 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", "@babel/register": "^7.18.9", - "@blueprintjs/core": "^4.19.5", + "@blueprintjs/core": "^5.7.2", "@blueprintjs/datetime": "^4.3.5", "@blueprintjs/popover2": "^1.5.1", "@blueprintjs/select": "^4.5.3", @@ -79,7 +79,7 @@ "pangu": "^4.0.7", "path-extra": "^4.3.0", "poi-asset-contributor-data": "^1.1.3", - "poi-asset-themes": "^4.5.0", + "poi-asset-themes": "^4.6.0", "poi-lib-battle": "^2.15.0", "polished": "^4.2.2", "prop-types": "^15.8.1", @@ -2308,6 +2308,58 @@ "dev": true }, "node_modules/@blueprintjs/colors": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-5.0.8.tgz", + "integrity": "sha512-Y/gpCMc/NAiScuH6vJGDI6vW2RqgR9ayEwtesVirQz3KnQSAHvbZWlgHzEO4Teyhc6FuXL3Tbj5kfq5JCeEyoQ==", + "dependencies": { + "tslib": "~2.6.2" + } + }, + "node_modules/@blueprintjs/core": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-5.7.2.tgz", + "integrity": "sha512-wzYSog3RGsNq95F0stYZ+C6/PBjPidFRzVRnQPeUO/M0tZCL4QEbKC4qNz1flGlXaQH5sD6rjaoRoFaJfouXVg==", + "dependencies": { + "@blueprintjs/colors": "^5.0.8", + "@blueprintjs/icons": "^5.5.0", + "@popperjs/core": "^2.11.7", + "classnames": "^2.3.1", + "normalize.css": "^8.0.1", + "react-popper": "^2.3.0", + "react-transition-group": "^4.4.5", + "tslib": "~2.6.2" + }, + "bin": { + "upgrade-blueprint-2.0.0-rename": "scripts/upgrade-blueprint-2.0.0-rename.sh", + "upgrade-blueprint-3.0.0-rename": "scripts/upgrade-blueprint-3.0.0-rename.sh" + }, + "peerDependencies": { + "@types/react": "^16.14.32 || 17 || 18", + "react": "^16.8 || 17 || 18", + "react-dom": "^16.8 || 17 || 18" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@blueprintjs/datetime": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.3.5.tgz", + "integrity": "sha512-qkumd3vOoSo/3PGiRPulZ/mcBBodHyv0EBi4ws1s+syQKToI4i4nkpVlT7fKB3SCZt+iN+/u2UAVc+pZadOLSA==", + "dependencies": { + "@blueprintjs/core": "^4.8.0", + "classnames": "^2.2", + "react-day-picker": "7.4.9", + "tslib": "~2.3.1" + }, + "peerDependencies": { + "react": "^16.8 || 17 || 18", + "react-dom": "^16.8 || 17 || 18" + } + }, + "node_modules/@blueprintjs/datetime/node_modules/@blueprintjs/colors": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", @@ -2315,10 +2367,15 @@ "tslib": "~2.5.0" } }, - "node_modules/@blueprintjs/core": { - "version": "4.19.5", - "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.19.5.tgz", - "integrity": "sha512-81z0rRHnRBy1PCJr8G11QWYk4v+GTFeIKm16WT4gADHcQ/1ZPVIaRoTexCHedYT7qQGCoHufQmYVum8k/bSMVw==", + "node_modules/@blueprintjs/datetime/node_modules/@blueprintjs/colors/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/datetime/node_modules/@blueprintjs/core": { + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", + "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", "dependencies": { "@blueprintjs/colors": "^4.2.1", "@blueprintjs/icons": "^4.16.0", @@ -2347,19 +2404,41 @@ } } }, - "node_modules/@blueprintjs/datetime": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.3.5.tgz", - "integrity": "sha512-qkumd3vOoSo/3PGiRPulZ/mcBBodHyv0EBi4ws1s+syQKToI4i4nkpVlT7fKB3SCZt+iN+/u2UAVc+pZadOLSA==", + "node_modules/@blueprintjs/datetime/node_modules/@blueprintjs/core/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/datetime/node_modules/@blueprintjs/icons": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", "dependencies": { - "@blueprintjs/core": "^4.8.0", - "classnames": "^2.2", - "react-day-picker": "7.4.9", - "tslib": "~2.3.1" + "change-case": "^4.1.2", + "classnames": "^2.3.1", + "tslib": "~2.5.0" + } + }, + "node_modules/@blueprintjs/datetime/node_modules/@blueprintjs/icons/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/datetime/node_modules/react-popper": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", + "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "dependencies": { + "@babel/runtime": "^7.1.2", + "@hypnosphi/create-react-context": "^0.3.1", + "deep-equal": "^1.1.1", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", + "warning": "^4.0.2" }, "peerDependencies": { - "react": "^16.8 || 17 || 18", - "react-dom": "^16.8 || 17 || 18" + "react": "0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "node_modules/@blueprintjs/datetime/node_modules/tslib": { @@ -2368,13 +2447,23 @@ "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/@blueprintjs/icons": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", - "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-5.5.0.tgz", + "integrity": "sha512-XnGWYZwtYh3+Cf9e2zYweZdwhZTevgufo287hu38Jfdhb7rcbWUwU7ktAmmf21QvGFqw6Ohyu8VVkoZZlE4eMg==", "dependencies": { "change-case": "^4.1.2", "classnames": "^2.3.1", - "tslib": "~2.5.0" + "tslib": "~2.6.2" + }, + "peerDependencies": { + "@types/react": "^16.14.32 || 17 || 18", + "react": "^16.8 || 17 || 18", + "react-dom": "^16.8 || 17 || 18" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/@blueprintjs/popover2": { @@ -2395,19 +2484,88 @@ "react-dom": "^16.8 || 17 || 18" } }, - "node_modules/@blueprintjs/popover2/node_modules/react-popper": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz", - "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==", + "node_modules/@blueprintjs/popover2/node_modules/@blueprintjs/colors": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", + "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", "dependencies": { - "react-fast-compare": "^3.0.1", + "tslib": "~2.5.0" + } + }, + "node_modules/@blueprintjs/popover2/node_modules/@blueprintjs/colors/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/popover2/node_modules/@blueprintjs/core": { + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", + "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", + "dependencies": { + "@blueprintjs/colors": "^4.2.1", + "@blueprintjs/icons": "^4.16.0", + "@juggle/resize-observer": "^3.4.0", + "@types/dom4": "^2.0.2", + "classnames": "^2.3.1", + "dom4": "^2.1.5", + "normalize.css": "^8.0.1", + "popper.js": "^1.16.1", + "react-popper": "^1.3.11", + "react-transition-group": "^4.4.5", + "tslib": "~2.5.0" + }, + "bin": { + "upgrade-blueprint-2.0.0-rename": "scripts/upgrade-blueprint-2.0.0-rename.sh", + "upgrade-blueprint-3.0.0-rename": "scripts/upgrade-blueprint-3.0.0-rename.sh" + }, + "peerDependencies": { + "@types/react": "^16.14.32 || 17 || 18", + "react": "^16.8 || 17 || 18", + "react-dom": "^16.8 || 17 || 18" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@blueprintjs/popover2/node_modules/@blueprintjs/core/node_modules/react-popper": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", + "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "dependencies": { + "@babel/runtime": "^7.1.2", + "@hypnosphi/create-react-context": "^0.3.1", + "deep-equal": "^1.1.1", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", "warning": "^4.0.2" }, "peerDependencies": { - "@popperjs/core": "^2.0.0", - "react": "^16.8.0 || ^17" + "react": "0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, + "node_modules/@blueprintjs/popover2/node_modules/@blueprintjs/core/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/popover2/node_modules/@blueprintjs/icons": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "dependencies": { + "change-case": "^4.1.2", + "classnames": "^2.3.1", + "tslib": "~2.5.0" } }, + "node_modules/@blueprintjs/popover2/node_modules/@blueprintjs/icons/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, "node_modules/@blueprintjs/popover2/node_modules/tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -2428,6 +2586,88 @@ "react-dom": "^16.8 || 17 || 18" } }, + "node_modules/@blueprintjs/select/node_modules/@blueprintjs/colors": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", + "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "dependencies": { + "tslib": "~2.5.0" + } + }, + "node_modules/@blueprintjs/select/node_modules/@blueprintjs/colors/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/select/node_modules/@blueprintjs/core": { + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", + "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", + "dependencies": { + "@blueprintjs/colors": "^4.2.1", + "@blueprintjs/icons": "^4.16.0", + "@juggle/resize-observer": "^3.4.0", + "@types/dom4": "^2.0.2", + "classnames": "^2.3.1", + "dom4": "^2.1.5", + "normalize.css": "^8.0.1", + "popper.js": "^1.16.1", + "react-popper": "^1.3.11", + "react-transition-group": "^4.4.5", + "tslib": "~2.5.0" + }, + "bin": { + "upgrade-blueprint-2.0.0-rename": "scripts/upgrade-blueprint-2.0.0-rename.sh", + "upgrade-blueprint-3.0.0-rename": "scripts/upgrade-blueprint-3.0.0-rename.sh" + }, + "peerDependencies": { + "@types/react": "^16.14.32 || 17 || 18", + "react": "^16.8 || 17 || 18", + "react-dom": "^16.8 || 17 || 18" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@blueprintjs/select/node_modules/@blueprintjs/core/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/select/node_modules/@blueprintjs/icons": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "dependencies": { + "change-case": "^4.1.2", + "classnames": "^2.3.1", + "tslib": "~2.5.0" + } + }, + "node_modules/@blueprintjs/select/node_modules/@blueprintjs/icons/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + }, + "node_modules/@blueprintjs/select/node_modules/react-popper": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", + "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "dependencies": { + "@babel/runtime": "^7.1.2", + "@hypnosphi/create-react-context": "^0.3.1", + "deep-equal": "^1.1.1", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", + "warning": "^4.0.2" + }, + "peerDependencies": { + "react": "0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, "node_modules/@blueprintjs/select/node_modules/tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -5317,9 +5557,9 @@ } }, "node_modules/@popperjs/core": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz", - "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==", + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -5626,9 +5866,9 @@ } }, "node_modules/@types/dom4": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz", - "integrity": "sha512-Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g==" + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.4.tgz", + "integrity": "sha512-PD+wqNhrjWFjAlSVd18jvChZvOXB2SOwAILBmuYev5zswBats5qmzs/QFoooLKd2omj9BT05a8MeSeRmXLGY+Q==" }, "node_modules/@types/electron-devtools-installer": { "version": "2.2.2", @@ -9526,16 +9766,19 @@ "dev": true }, "node_modules/deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", + "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==", "dependencies": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", + "is-arguments": "^1.1.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "object-is": "^1.1.5", "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "regexp.prototype.flags": "^1.5.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9585,11 +9828,25 @@ "node": ">= 0.10" } }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -11929,9 +12186,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.5", @@ -11988,13 +12248,14 @@ "dev": true }, "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12256,6 +12517,17 @@ "node": ">= 0.10" } }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -12470,6 +12742,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -12534,6 +12817,17 @@ "node": ">=0.10.0" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/header-case": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", @@ -13180,11 +13474,17 @@ } }, "node_modules/is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-descriptor": { @@ -21804,9 +22104,9 @@ "integrity": "sha512-S9NXn1qR2PFQJVoMOEwQl4/lLEeAF6Qm6vGb7FGpGVQJ7LZ/kevUibrkQCGXeUAYA/dzfoZUgF0DygxPPaTnGw==" }, "node_modules/poi-asset-themes": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/poi-asset-themes/-/poi-asset-themes-4.5.0.tgz", - "integrity": "sha512-fXMlWht3mleqeLl3ErMudHMxKdOJesLhZsJ2Eb4DFX5ZHE+q+rI5loAn63+wVud3fQ8L/R+4Ry3oPPiIiXpMBw==" + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/poi-asset-themes/-/poi-asset-themes-4.6.0.tgz", + "integrity": "sha512-rdpIfAS7cuj0SkzMA2sqFbamm+DbTfPloLhyq4ZVxqmnknxqDTGjBdsirVBHagjdxbt3Brtp6UW9lfkxznlhnA==" }, "node_modules/poi-lib-battle": { "version": "2.15.0", @@ -22417,20 +22717,17 @@ } }, "node_modules/react-popper": { - "version": "1.3.11", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", - "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", + "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==", "dependencies": { - "@babel/runtime": "^7.1.2", - "@hypnosphi/create-react-context": "^0.3.1", - "deep-equal": "^1.1.1", - "popper.js": "^1.14.4", - "prop-types": "^15.6.1", - "typed-styles": "^0.0.7", + "react-fast-compare": "^3.0.1", "warning": "^4.0.2" }, "peerDependencies": { - "react": "0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0" + "@popperjs/core": "^2.0.0", + "react": "^16.8.0 || ^17 || ^18", + "react-dom": "^16.8.0 || ^17 || ^18" } }, "node_modules/react-prop-types": { @@ -22886,13 +23183,13 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -23472,6 +23769,19 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -25381,9 +25691,9 @@ } }, "node_modules/tslib": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", - "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -27807,29 +28117,26 @@ "dev": true }, "@blueprintjs/colors": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", - "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-5.0.8.tgz", + "integrity": "sha512-Y/gpCMc/NAiScuH6vJGDI6vW2RqgR9ayEwtesVirQz3KnQSAHvbZWlgHzEO4Teyhc6FuXL3Tbj5kfq5JCeEyoQ==", "requires": { - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "@blueprintjs/core": { - "version": "4.19.5", - "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.19.5.tgz", - "integrity": "sha512-81z0rRHnRBy1PCJr8G11QWYk4v+GTFeIKm16WT4gADHcQ/1ZPVIaRoTexCHedYT7qQGCoHufQmYVum8k/bSMVw==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-5.7.2.tgz", + "integrity": "sha512-wzYSog3RGsNq95F0stYZ+C6/PBjPidFRzVRnQPeUO/M0tZCL4QEbKC4qNz1flGlXaQH5sD6rjaoRoFaJfouXVg==", "requires": { - "@blueprintjs/colors": "^4.2.1", - "@blueprintjs/icons": "^4.16.0", - "@juggle/resize-observer": "^3.4.0", - "@types/dom4": "^2.0.2", + "@blueprintjs/colors": "^5.0.8", + "@blueprintjs/icons": "^5.5.0", + "@popperjs/core": "^2.11.7", "classnames": "^2.3.1", - "dom4": "^2.1.5", "normalize.css": "^8.0.1", - "popper.js": "^1.16.1", - "react-popper": "^1.3.11", + "react-popper": "^2.3.0", "react-transition-group": "^4.4.5", - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "@blueprintjs/datetime": { @@ -27843,6 +28150,77 @@ "tslib": "~2.3.1" }, "dependencies": { + "@blueprintjs/colors": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", + "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "requires": { + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "@blueprintjs/core": { + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", + "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", + "requires": { + "@blueprintjs/colors": "^4.2.1", + "@blueprintjs/icons": "^4.16.0", + "@juggle/resize-observer": "^3.4.0", + "@types/dom4": "^2.0.2", + "classnames": "^2.3.1", + "dom4": "^2.1.5", + "normalize.css": "^8.0.1", + "popper.js": "^1.16.1", + "react-popper": "^1.3.11", + "react-transition-group": "^4.4.5", + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "@blueprintjs/icons": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "requires": { + "change-case": "^4.1.2", + "classnames": "^2.3.1", + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "react-popper": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", + "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "requires": { + "@babel/runtime": "^7.1.2", + "@hypnosphi/create-react-context": "^0.3.1", + "deep-equal": "^1.1.1", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", + "warning": "^4.0.2" + } + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -27851,13 +28229,13 @@ } }, "@blueprintjs/icons": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", - "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-5.5.0.tgz", + "integrity": "sha512-XnGWYZwtYh3+Cf9e2zYweZdwhZTevgufo287hu38Jfdhb7rcbWUwU7ktAmmf21QvGFqw6Ohyu8VVkoZZlE4eMg==", "requires": { "change-case": "^4.1.2", "classnames": "^2.3.1", - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "@blueprintjs/popover2": { @@ -27874,13 +28252,75 @@ "tslib": "~2.3.1" }, "dependencies": { - "react-popper": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz", - "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==", + "@blueprintjs/colors": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", + "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", "requires": { - "react-fast-compare": "^3.0.1", - "warning": "^4.0.2" + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "@blueprintjs/core": { + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", + "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", + "requires": { + "@blueprintjs/colors": "^4.2.1", + "@blueprintjs/icons": "^4.16.0", + "@juggle/resize-observer": "^3.4.0", + "@types/dom4": "^2.0.2", + "classnames": "^2.3.1", + "dom4": "^2.1.5", + "normalize.css": "^8.0.1", + "popper.js": "^1.16.1", + "react-popper": "^1.3.11", + "react-transition-group": "^4.4.5", + "tslib": "~2.5.0" + }, + "dependencies": { + "react-popper": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", + "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "requires": { + "@babel/runtime": "^7.1.2", + "@hypnosphi/create-react-context": "^0.3.1", + "deep-equal": "^1.1.1", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", + "warning": "^4.0.2" + } + }, + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "@blueprintjs/icons": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "requires": { + "change-case": "^4.1.2", + "classnames": "^2.3.1", + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } } }, "tslib": { @@ -27901,6 +28341,77 @@ "tslib": "~2.3.1" }, "dependencies": { + "@blueprintjs/colors": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", + "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "requires": { + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "@blueprintjs/core": { + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", + "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", + "requires": { + "@blueprintjs/colors": "^4.2.1", + "@blueprintjs/icons": "^4.16.0", + "@juggle/resize-observer": "^3.4.0", + "@types/dom4": "^2.0.2", + "classnames": "^2.3.1", + "dom4": "^2.1.5", + "normalize.css": "^8.0.1", + "popper.js": "^1.16.1", + "react-popper": "^1.3.11", + "react-transition-group": "^4.4.5", + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "@blueprintjs/icons": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "requires": { + "change-case": "^4.1.2", + "classnames": "^2.3.1", + "tslib": "~2.5.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + } + } + }, + "react-popper": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", + "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "requires": { + "@babel/runtime": "^7.1.2", + "@hypnosphi/create-react-context": "^0.3.1", + "deep-equal": "^1.1.1", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", + "warning": "^4.0.2" + } + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -30104,9 +30615,9 @@ } }, "@popperjs/core": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz", - "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==" + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" }, "@reduxjs/toolkit": { "version": "1.8.4", @@ -30376,9 +30887,9 @@ } }, "@types/dom4": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz", - "integrity": "sha512-Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g==" + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.4.tgz", + "integrity": "sha512-PD+wqNhrjWFjAlSVd18jvChZvOXB2SOwAILBmuYev5zswBats5qmzs/QFoooLKd2omj9BT05a8MeSeRmXLGY+Q==" }, "@types/electron-devtools-installer": { "version": "2.2.2", @@ -33475,16 +33986,16 @@ "dev": true }, "deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", + "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==", "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", + "is-arguments": "^1.1.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "object-is": "^1.1.5", "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "regexp.prototype.flags": "^1.5.1" } }, "deep-is": { @@ -33521,11 +34032,22 @@ "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", "dev": true }, + "define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "requires": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } @@ -35364,9 +35886,9 @@ } }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "function.prototype.name": { "version": "1.1.5", @@ -35408,13 +35930,14 @@ "dev": true }, "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-package-type": { @@ -35618,6 +36141,14 @@ "sparkles": "^1.0.0" } }, + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "requires": { + "get-intrinsic": "^1.1.3" + } + }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -35790,6 +36321,11 @@ "get-intrinsic": "^1.1.1" } }, + "has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==" + }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -35835,6 +36371,14 @@ } } }, + "hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "requires": { + "function-bind": "^1.1.2" + } + }, "header-case": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", @@ -36309,9 +36853,12 @@ } }, "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "requires": { + "has-tostringtag": "^1.0.0" + } }, "is-descriptor": { "version": "1.0.2", @@ -42656,9 +43203,9 @@ "integrity": "sha512-S9NXn1qR2PFQJVoMOEwQl4/lLEeAF6Qm6vGb7FGpGVQJ7LZ/kevUibrkQCGXeUAYA/dzfoZUgF0DygxPPaTnGw==" }, "poi-asset-themes": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/poi-asset-themes/-/poi-asset-themes-4.5.0.tgz", - "integrity": "sha512-fXMlWht3mleqeLl3ErMudHMxKdOJesLhZsJ2Eb4DFX5ZHE+q+rI5loAn63+wVud3fQ8L/R+4Ry3oPPiIiXpMBw==" + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/poi-asset-themes/-/poi-asset-themes-4.6.0.tgz", + "integrity": "sha512-rdpIfAS7cuj0SkzMA2sqFbamm+DbTfPloLhyq4ZVxqmnknxqDTGjBdsirVBHagjdxbt3Brtp6UW9lfkxznlhnA==" }, "poi-lib-battle": { "version": "2.15.0", @@ -43114,16 +43661,11 @@ } }, "react-popper": { - "version": "1.3.11", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", - "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", + "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==", "requires": { - "@babel/runtime": "^7.1.2", - "@hypnosphi/create-react-context": "^0.3.1", - "deep-equal": "^1.1.1", - "popper.js": "^1.14.4", - "prop-types": "^15.6.1", - "typed-styles": "^0.0.7", + "react-fast-compare": "^3.0.1", "warning": "^4.0.2" } }, @@ -43480,13 +44022,13 @@ } }, "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" } }, "regexpp": { @@ -43924,6 +44466,16 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, + "set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "requires": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + } + }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -45437,9 +45989,9 @@ } }, "tslib": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", - "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "tsutils": { "version": "3.21.0", diff --git a/package.json b/package.json index 5c8375f4b..a43cf39d3 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", "@babel/register": "^7.18.9", - "@blueprintjs/core": "^4.19.5", + "@blueprintjs/core": "^5.7.2", "@blueprintjs/datetime": "^4.3.5", "@blueprintjs/popover2": "^1.5.1", "@blueprintjs/select": "^4.5.3", @@ -109,7 +109,7 @@ "pangu": "^4.0.7", "path-extra": "^4.3.0", "poi-asset-contributor-data": "^1.1.3", - "poi-asset-themes": "^4.5.0", + "poi-asset-themes": "^4.6.0", "poi-lib-battle": "^2.15.0", "polished": "^4.2.2", "prop-types": "^15.8.1", diff --git a/views/components/etc/http-basic-auth.tsx b/views/components/etc/http-basic-auth.tsx index 9c8a74907..352834546 100644 --- a/views/components/etc/http-basic-auth.tsx +++ b/views/components/etc/http-basic-auth.tsx @@ -49,7 +49,6 @@ const BasicAuth: FC = () => { isOpen={showModal} onClose={close} title={t('Website requires login')} - portalContainer={document.body} >
diff --git a/views/components/etc/modal.tsx b/views/components/etc/modal.tsx index 3a5e52f6f..62d35c852 100644 --- a/views/components/etc/modal.tsx +++ b/views/components/etc/modal.tsx @@ -78,7 +78,6 @@ const ModalTrigger: React.FC = () => { onClose={handleNextModal} onClosing={onClosing} title={title} - portalContainer={document.body} > {content} = ({ children, ...props }) => ( - + {children} - + ) interface DialogProps extends BDialogProps { @@ -24,29 +28,29 @@ interface DialogProps extends BDialogProps { } export const Dialog: React.FC = ({ children, ...props }) => ( - + {children} - + ) -interface TooltipProps extends Tooltip2Props { +interface TooltipProps extends BTooltipProps { children: ReactNode } export const Tooltip: React.FC = ({ children, ...props }) => ( - + {children} - + ) -interface PopoverProps extends Popover2Props { +interface PopoverProps extends BPopoverProps { children: ReactNode } export const Popover: React.FC = ({ children, ...props }) => ( - + {children} - + ) interface OverlayProps extends BOverlayProps { @@ -54,7 +58,7 @@ interface OverlayProps extends BOverlayProps { } export const Overlay: React.FC = ({ children, ...props }) => ( - + {children} - + ) diff --git a/views/components/etc/scroll-shadow.tsx b/views/components/etc/scroll-shadow.tsx index 25a612b76..fa3dbaa4b 100644 --- a/views/components/etc/scroll-shadow.tsx +++ b/views/components/etc/scroll-shadow.tsx @@ -37,7 +37,7 @@ interface ScrollShadowProps { className?: string } -export const ScrollShadow: React.FC = ({ children, className }) => { +const ScrollShadow: React.FC = ({ children, className }) => { const rootRef = useRef(null) const topSentinelRef = useRef(null) const bottomSentinelRef = useRef(null) @@ -89,3 +89,5 @@ export const ScrollShadow: React.FC = ({ children, className ) } + +export default ScrollShadow diff --git a/views/components/info/alert.tsx b/views/components/info/alert.tsx index 6b516bd52..44b025e98 100644 --- a/views/components/info/alert.tsx +++ b/views/components/info/alert.tsx @@ -212,10 +212,10 @@ export const PoiAlert: React.FC = () => { // @ts-expect-error wrong type definition - + { { {history.reverse().map((h) => ( {h.content} diff --git a/views/components/info/toast.es b/views/components/info/toast.es index d8fb54075..b79c13d4d 100644 --- a/views/components/info/toast.es +++ b/views/components/info/toast.es @@ -1,5 +1,5 @@ import React, { createRef } from 'react' -import { Position, Toaster, Intent } from '@blueprintjs/core' +import { Position, OverlayToaster, Intent } from '@blueprintjs/core' import styled, { css } from 'styled-components' import { connect } from 'react-redux' import { get } from 'lodash' @@ -17,7 +17,7 @@ const toastPreload = (...props) => { window.toast = toastPreload -const ToasterPositioned = styled(Toaster)` +const ToasterPositioned = styled(OverlayToaster)` padding-bottom: 25px; ${({ inbound }) => inbound && diff --git a/views/components/main/parts/mini-ship/index.es b/views/components/main/parts/mini-ship/index.es index f4eb1281c..8e8566d90 100644 --- a/views/components/main/parts/mini-ship/index.es +++ b/views/components/main/parts/mini-ship/index.es @@ -20,7 +20,7 @@ import { import { CardWrapper as CardWrapperL } from '../styled-components' const FleetNameButton = styled(FleetNameButtonLarge)` - .bp4-button { + .bp5-button { border-width: 0 0 1px; height: 18px; min-height: 18px; diff --git a/views/components/main/parts/mini-ship/mini-ship-item.es b/views/components/main/parts/mini-ship/mini-ship-item.es index f57dca7bd..80e31dbc8 100644 --- a/views/components/main/parts/mini-ship/mini-ship-item.es +++ b/views/components/main/parts/mini-ship/mini-ship-item.es @@ -311,7 +311,7 @@ const ShipCond = styled.div` const HPProgress = styled.div` grid-row: 2 / 3; grid-column: 3 / 6; - .bp4-progress-bar { + .bp5-progress-bar { flex: auto; height: 7px; margin-top: 3px; diff --git a/views/components/main/parts/mini-ship/mini-ship-pane.es b/views/components/main/parts/mini-ship/mini-ship-pane.es index a2706eefa..508393e34 100644 --- a/views/components/main/parts/mini-ship/mini-ship-pane.es +++ b/views/components/main/parts/mini-ship/mini-ship-pane.es @@ -8,7 +8,7 @@ import { compose } from 'redux' import styled from 'styled-components' import { FleetStat } from 'views/components/ship-parts/fleet-stat' -import { ScrollShadow } from 'views/components/etc/scroll-shadow' +import ScrollShadow from 'views/components/etc/scroll-shadow' import { fleetShipsIdSelectorFactory } from 'views/utils/selectors' const miniShipRowWidthSelector = (state) => get(state, 'layout.minishippane.width', 250) @@ -29,21 +29,23 @@ export const PaneBodyMini = connect(() => { <> - {(!enableOverviewFleetDetail) ? (shipsId || []).map((shipId, i) => ( - - )) : (shipsId || []).map((shipId, i) => ( - - ))} + {!enableOverviewFleetDetail + ? (shipsId || []).map((shipId, i) => ( + + )) + : (shipsId || []).map((shipId, i) => ( + + ))} )) diff --git a/views/components/main/parts/styled-components.es b/views/components/main/parts/styled-components.es index 932404558..f9753479e 100644 --- a/views/components/main/parts/styled-components.es +++ b/views/components/main/parts/styled-components.es @@ -7,7 +7,7 @@ export const CardWrapper = styled(Card)` width: 100%; padding: 4px 8px; - .bp4-tag { + .bp5-tag { min-height: initial; font-size: 90%; line-height: 1.2; diff --git a/views/components/settings/components/folder-picker.es b/views/components/settings/components/folder-picker.es index bf218249b..3f6ed66b3 100644 --- a/views/components/settings/components/folder-picker.es +++ b/views/components/settings/components/folder-picker.es @@ -20,7 +20,7 @@ const PickerBox = styled.div` display: flex; width: 100%; - .bp4-overflow-list { + .bp5-overflow-list { flex: 1; } @@ -28,7 +28,7 @@ const PickerBox = styled.div` margin-left: 1em; } - .bp4-breadcrumb { + .bp5-breadcrumb { font-size: 12px; } ` diff --git a/views/components/settings/display/resolution-config.es b/views/components/settings/display/resolution-config.es index 56485baee..1fefc4182 100644 --- a/views/components/settings/display/resolution-config.es +++ b/views/components/settings/display/resolution-config.es @@ -20,7 +20,7 @@ const NumericResolution = styled.div` align-items: center; flex: 1; - .bp4-input-group { + .bp5-input-group { flex-shrink: 1; } ` diff --git a/views/components/settings/gaming/notification-config.es b/views/components/settings/gaming/notification-config.es index 999602001..065c77665 100644 --- a/views/components/settings/gaming/notification-config.es +++ b/views/components/settings/gaming/notification-config.es @@ -13,7 +13,7 @@ import { SwitchConfig } from 'views/components/settings/components/switch' import styled from 'styled-components' const InlineFormGroup = styled(FormGroup)` - .bp4-form-content { + .bp5-form-content { display: flex; align-items: center; } diff --git a/views/components/settings/index.es b/views/components/settings/index.es index 297aa7d88..7911c509b 100644 --- a/views/components/settings/index.es +++ b/views/components/settings/index.es @@ -54,11 +54,11 @@ const TABS = [ const SettingsTabs = styled(Tabs)` height: 100%; - .bp4-tab-list { + .bp5-tab-list { justify-content: space-between; } - .bp4-tab { + .bp5-tab { flex: 1 0 30px; text-align: center; justify-content: center; @@ -70,7 +70,7 @@ const SettingsTabs = styled(Tabs)` } } - .bp4-tab-panel { + .bp5-tab-panel { margin: 0; height: calc(100% - 30px); overflow-y: scroll; diff --git a/views/components/settings/main/navigator-bar.es b/views/components/settings/main/navigator-bar.es index 3e8ba3746..18fb081a7 100644 --- a/views/components/settings/main/navigator-bar.es +++ b/views/components/settings/main/navigator-bar.es @@ -14,7 +14,7 @@ import { } from '@blueprintjs/core' import { gameRefreshPage, gameReload } from 'views/services/utils' -import { ContextButtonTooltip } from 'views/components/etc/context-button-tooltip' +import ContextButtonTooltip from 'views/components/etc/context-button-tooltip' import { Section } from '../components/section' diff --git a/views/components/settings/main/storage-config.es b/views/components/settings/main/storage-config.es index 3c66ea3fa..22cd84fb2 100644 --- a/views/components/settings/main/storage-config.es +++ b/views/components/settings/main/storage-config.es @@ -19,12 +19,12 @@ const ButtonArea = styled(Wrapper)` margin-left: 10px; } - .bp4-callout { + .bp5-callout { margin-top: 0.5em; } ` const InlineFormGroup = styled(FormGroup)` - .bp4-form-content { + .bp5-form-content { display: flex; align-items: center; } diff --git a/views/components/ship-parts/landbase-button.es b/views/components/ship-parts/landbase-button.es index 2eea5aed3..55a512d7f 100644 --- a/views/components/ship-parts/landbase-button.es +++ b/views/components/ship-parts/landbase-button.es @@ -17,7 +17,7 @@ const LandbaseButtonContainer = styled(ButtonGroup)` isMini ? css` padding: 5px 5px 1px 5px; - .bp4-button { + .bp5-button { flex: 1; border-width: 0 0 1px; height: 18px; @@ -32,7 +32,7 @@ const LandbaseButtonContainer = styled(ButtonGroup)` padding-right: 5px; padding-top: 5px; width: 100%; - .bp4-button { + .bp5-button { flex: 1; overflow: hidden; } diff --git a/views/components/ship-parts/styled-components.es b/views/components/ship-parts/styled-components.es index 06e05683d..143ab0571 100644 --- a/views/components/ship-parts/styled-components.es +++ b/views/components/ship-parts/styled-components.es @@ -1,7 +1,7 @@ import { Avatar } from 'views/components/etc/avatar' import styled, { css } from 'styled-components' import { Tooltip, Card, ButtonGroup, Tag } from '@blueprintjs/core' -import { ScrollShadow } from 'views/components/etc/scroll-shadow' +import ScrollShadow from 'views/components/etc/scroll-shadow' export const ShipCard = styled(Card)` display: flex; @@ -77,7 +77,7 @@ export const FleetNameButton = styled(ButtonGroup)` padding: 5px 5px 1px; width: 100%; - .bp4-button { + .bp5-button { flex: 1; overflow: hidden; } @@ -112,7 +112,7 @@ export const ShipItem = styled.div` ` }} - .bp4-progress-bar { + .bp5-progress-bar { height: 7px; } ` @@ -312,7 +312,7 @@ export const ShipLabel = styled.span` css` position: relative; top: -1px; - .bp4-tag { + .bp5-tag { overflow: visible; max-width: initial; font-size: 80%; diff --git a/views/components/tab-area/index.es b/views/components/tab-area/index.es index 317700693..d6c9d4dde 100644 --- a/views/components/tab-area/index.es +++ b/views/components/tab-area/index.es @@ -67,7 +67,7 @@ const PluginAppTabpane = styled(PoiAppTabpane)` height: 100%; padding-bottom: 8px; - & > .bp4-card { + & > .bp5-card { padding: 4px; height: 100%; display: flex; diff --git a/views/components/tab-area/plugin-window-wrapper.es b/views/components/tab-area/plugin-window-wrapper.es index 804599229..a4c2c436f 100644 --- a/views/components/tab-area/plugin-window-wrapper.es +++ b/views/components/tab-area/plugin-window-wrapper.es @@ -71,7 +71,6 @@ const stylesheetTagsWithHref = [ 'electron-react-titlebar/assets/style.css', 'react-resizable/css/styles.css', 'react-grid-layout/css/styles.css', - '@blueprintjs/popover2/lib/css/blueprint-popover2.css', ] .map((href) => ``) .join('') diff --git a/views/env-parts/theme.es b/views/env-parts/theme.es index e3e4e89aa..81a6a402d 100644 --- a/views/env-parts/theme.es +++ b/views/env-parts/theme.es @@ -132,8 +132,8 @@ export function loadStyle( glass.style.backgroundColor = isDark ? 'rgb(47, 52, 60)' : 'rgb(246, 247, 249)' setFilter(config.get('poi.appearance.colorblindFilter')) delaySetClassName( - classNames('bp4-focus-disabled', { - 'bp4-dark': isDark, + classNames('bp5-focus-disabled', { + 'bp5-dark': isDark, }), ) if ($('#bootstrap-css')) { diff --git a/views/kan-game-wrapper.es b/views/kan-game-wrapper.es index 772900033..f78693570 100644 --- a/views/kan-game-wrapper.es +++ b/views/kan-game-wrapper.es @@ -39,7 +39,7 @@ const KanGame = styled(CustomTag)` overflow: hidden; width: 100%; - .bp4-toast-container { + .bp5-toast-container { overflow: hidden !important; } ` diff --git a/views/theme.es b/views/theme.es index dedb71e6d..945b239d9 100644 --- a/views/theme.es +++ b/views/theme.es @@ -2,14 +2,14 @@ import { Colors } from '@blueprintjs/core' export const darkTheme = { ...Colors, - name: 'bp4-dark', + name: 'bp5-dark', variant: 'dark', slotBg: 'rgb(33 33 33 / 0.7)', } export const lightTheme = { ...Colors, - name: 'bp4-light', + name: 'bp5-light', variant: 'light', slotBg: 'rgb(255 255 255 / 0.7)', }