{children}
diff --git a/platform/ui/src/components/index.js b/platform/ui/src/components/index.js
index 6b4bb9b87cb..aac18fba4e3 100644
--- a/platform/ui/src/components/index.js
+++ b/platform/ui/src/components/index.js
@@ -61,6 +61,7 @@ import UserPreferences from './UserPreferences';
import HotkeysPreferences from './HotkeysPreferences';
import HotkeyField from './HotkeyField';
import Header from './Header';
+import ImageScrollbar from './ImageScrollbar';
export {
AboutModal,
@@ -87,6 +88,7 @@ export {
InputLabelWrapper,
InputMultiSelect,
InputText,
+ ImageScrollbar,
Label,
LayoutSelector,
MeasurementTable,
diff --git a/platform/ui/src/contextProviders/ViewportGridProvider.tsx b/platform/ui/src/contextProviders/ViewportGridProvider.tsx
index 08fdc0db0cc..bed9347c0a0 100644
--- a/platform/ui/src/contextProviders/ViewportGridProvider.tsx
+++ b/platform/ui/src/contextProviders/ViewportGridProvider.tsx
@@ -65,8 +65,15 @@ export function ViewportGridProvider({ children, service }) {
return { ...state, ...{ viewports }, cachedLayout: null };
}
case 'SET_LAYOUT': {
- const { numCols, numRows, layoutType, viewportsPos } = action.payload;
- const numPanes = viewportsPos ? viewportsPos.length : numCols * numRows;
+ const {
+ numCols,
+ numRows,
+ layoutType,
+ viewportOptions,
+ } = action.payload;
+
+ // If empty viewportOptions, we use numRow and numCols to calculate number of viewports
+ const numPanes = viewportOptions.length || numRows * numCols;
const viewports = state.viewports.slice();
const activeViewportIndex =
state.activeViewportIndex >= numPanes ? 0 : state.activeViewportIndex;
@@ -81,8 +88,8 @@ export function ViewportGridProvider({ children, service }) {
for (let i = 0; i < numPanes; i++) {
let xPos, yPos, w, h;
- if (viewportsPos && viewportsPos[i]) {
- ({ x: xPos, y: yPos, width: w, height: h } = viewportsPos[i]);
+ if (viewportOptions && viewportOptions[i]) {
+ ({ x: xPos, y: yPos, width: w, height: h } = viewportOptions[i]);
} else {
const { row, col } = unravelIndex(i, numRows, numCols);
w = 1 / numCols;
@@ -177,14 +184,14 @@ export function ViewportGridProvider({ children, service }) {
);
const setLayout = useCallback(
- ({ layoutType, numRows, numCols, viewportsPos }) =>
+ ({ layoutType, numRows, numCols, viewportOptions = [] }) =>
dispatch({
type: 'SET_LAYOUT',
payload: {
layoutType,
numRows,
numCols,
- viewportsPos,
+ viewportOptions,
},
}),
[dispatch]
diff --git a/platform/ui/src/index.js b/platform/ui/src/index.js
index d80db595de9..e6cb88c3e81 100644
--- a/platform/ui/src/index.js
+++ b/platform/ui/src/index.js
@@ -96,6 +96,7 @@ export {
ViewportGrid,
ViewportPane,
WindowLevelMenuItem,
+ ImageScrollbar,
} from './components';
/** These are mostly used in the docs */
diff --git a/platform/viewer/public/config/default.js b/platform/viewer/public/config/default.js
index ccad643070f..86161bc7899 100644
--- a/platform/viewer/public/config/default.js
+++ b/platform/viewer/public/config/default.js
@@ -4,6 +4,7 @@ window.config = {
extensions: [],
modes: [],
showStudyList: true,
+ maxNumberOfWebWorkers: 3,
// filterQueryParam: false,
dataSources: [
{
diff --git a/platform/viewer/src/components/ViewportGrid.tsx b/platform/viewer/src/components/ViewportGrid.tsx
index 0cd23371dcf..ef1c74a0783 100644
--- a/platform/viewer/src/components/ViewportGrid.tsx
+++ b/platform/viewer/src/components/ViewportGrid.tsx
@@ -10,15 +10,8 @@ import classNames from 'classnames';
function ViewerViewportGrid(props) {
const { servicesManager, viewportComponents, dataSource } = props;
const [viewportGrid, viewportGridService] = useViewportGrid();
- const [, setState] = useState({});
- const {
- numCols,
- numRows,
- activeViewportIndex,
- viewports,
- cachedLayout,
- } = viewportGrid;
+ const { numCols, numRows, activeViewportIndex, viewports } = viewportGrid;
// TODO -> Need some way of selecting which displaySets hit the viewports.
const {
@@ -58,7 +51,7 @@ function ViewerViewportGrid(props) {
const { displaySetsInfo, viewportOptions } = matchDetails[i];
const displaySetUIDsToHang = [];
- const displaySetOptions = [];
+ const displaySetUIDsToHangOptions = [];
displaySetsInfo.forEach(({ SeriesInstanceUID, displaySetOptions }) => {
const matchingDisplaySet = availableDisplaySets.find(ds => {
return ds.SeriesInstanceUID === SeriesInstanceUID;
@@ -69,7 +62,7 @@ function ViewerViewportGrid(props) {
}
displaySetUIDsToHang.push(matchingDisplaySet.displaySetInstanceUID);
- displaySetOptions.push(displaySetOptions);
+ displaySetUIDsToHangOptions.push(displaySetOptions);
});
if (!displaySetUIDsToHang.length) {
@@ -80,7 +73,7 @@ function ViewerViewportGrid(props) {
viewportIndex: i,
displaySetInstanceUIDs: displaySetUIDsToHang,
viewportOptions,
- displaySetOptions,
+ displaySetOptions: displaySetUIDsToHangOptions,
});
// During setting displaySets for viewport, we need to update the hanging protocol
@@ -101,31 +94,12 @@ function ViewerViewportGrid(props) {
useEffect(() => {
const { unsubscribe } = HangingProtocolService.subscribe(
HangingProtocolService.EVENTS.NEW_LAYOUT,
- ({ gridType, numRows, numCols, viewportsPos }) => {
+ ({ layoutType, numRows, numCols, viewportOptions }) => {
viewportGridService.setLayout({
numRows,
numCols,
- gridType,
- viewportsPos,
- });
- }
- );
-
- return () => {
- unsubscribe();
- };
- }, [viewports]);
-
- // Layout change based on hanging protocols
- useEffect(() => {
- const { unsubscribe } = HangingProtocolService.subscribe(
- HangingProtocolService.EVENTS.NEW_LAYOUT,
- ({ gridType, numRows, numCols, viewportsPos }) => {
- viewportGridService.setLayout({
- numRows,
- numCols,
- gridType,
- viewportsPos,
+ layoutType,
+ viewportOptions,
});
}
);
@@ -149,28 +123,6 @@ function ViewerViewportGrid(props) {
};
}, [viewports]);
- /**
- * Layout Change
- */
- // Layout change based on hanging protocols
- useEffect(() => {
- const { unsubscribe } = HangingProtocolService.subscribe(
- HangingProtocolService.EVENTS.NEW_LAYOUT,
- ({ gridType, numRows, numCols, viewportsPos }) => {
- viewportGridService.setLayout({
- numRows,
- numCols,
- gridType,
- viewportsPos,
- });
- }
- );
-
- return () => {
- unsubscribe();
- };
- }, [viewports]);
-
useEffect(() => {
const { unsubscribe } = MeasurementService.subscribe(
MeasurementService.EVENTS.JUMP_TO_MEASUREMENT,
@@ -344,39 +296,35 @@ function ViewerViewportGrid(props) {
// onDoubleClick={() => onDoubleClick(viewportIndex)}
viewportPanes[i] = (
-
+
+
+
);
}
diff --git a/yarn.lock b/yarn.lock
index 09083aa93ad..b894bff846f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1320,24 +1320,24 @@
integrity sha512-HOMMOLV6xy8O/agNGGvrl0a8DwShpBvWxAzEzv2pqq12d3r5z/3MyIgNA3Oj/8bIBVvvVXxh9RX7rMDRHJdowg==
"@cornerstonejs/core@^0.6.0":
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-0.6.0.tgz#e9924f4dfe87ffe8c674202eae3e2bb9fe161158"
- integrity sha512-XAu7J49c1zE5Dj/X/NKiyZ+lwEQpUfqi3NQGbQ7AcBvqXvuOAm0twO5vZ9qmD2z1Q6ga3a9ruIH7gr6Z/2xDSw==
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-0.6.1.tgz#ac5af33b62b3efa6a3b9408f788250a92a134a78"
+ integrity sha512-dhWN6kVVPfV6DMddwvurlQNCI4zgSF08/e/dhyHynbbwTz7EaM3amHq3szSb7qiF00hKxu4IAuRsEpKWBCK6WQ==
dependencies:
detect-gpu "^4.0.7"
lodash.clonedeep "4.5.0"
"@cornerstonejs/streaming-image-volume-loader@^0.2.13":
- version "0.2.19"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-0.2.19.tgz#f7bfdf25659fcf220821134aba4ef685baf9b0d0"
- integrity sha512-yCAjL/BXZnLZbeSvulBKkyfKeZm7v33825vGfPL51blJ9kQSvtkTEQ0z844VPftAB8oB6vRGo9022soeBSyiBQ==
+ version "0.2.20"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-0.2.20.tgz#71d98f66d3577b513155a7be8f930ea16c24bf45"
+ integrity sha512-HWzyAyEoDW+xnDZ5GGXik9CNHy0o3gLSwc6Wm9N1AKvT6mEmKPkuq+BT+11IVc7JHgFPv0XqzU2KE/jy7zQ9Tw==
dependencies:
cornerstone-wado-image-loader "^4.1.2"
"@cornerstonejs/tools@^0.9.0":
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-0.9.0.tgz#dcef538197c8f66d5359ab826d68cb639cf5f0eb"
- integrity sha512-MrSq9fEdlreHE3uffKGJPKRqqnBOcj/hu6yBycMVuVztHYl7oEPxqS3kis0P2doyJWE2SEK78+ty7wNAJxNNZA==
+ version "0.9.1"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-0.9.1.tgz#4d680062714572c230502c7140d82400c7870317"
+ integrity sha512-OXpm7JYEiseP55SDY8qk7cLrJVOjL7bpbX0ntEWZacGa+YWbdJV0H/XIezMKeHejiJvR55WDUIRFxtEzhlxe5Q==
dependencies:
lodash.clonedeep "4.5.0"
@@ -3409,17 +3409,17 @@
dependencies:
"@percy/sdk-utils" "^1.0.0-beta.44"
-"@percy/logger@1.0.7":
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/@percy/logger/-/logger-1.0.7.tgz#b6cba3cefaf0f3f74a6d9cc5108073fc953b7ed4"
- integrity sha512-pYW6i0/M9h2PMDGiAYpRzWBt2DMyafsF6fNnIlNGOukQKlqlcae4dxPQFq6Mu3tVv3JMUfIx9h2lew5WquF95g==
+"@percy/logger@1.0.8":
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/@percy/logger/-/logger-1.0.8.tgz#c30606b39bdbf646fe896056b772a93314fcf409"
+ integrity sha512-uHIk6YW7iJGcl/y/QHRl1R8t4NavyTZwji6oe1WW0BUGpR4xE6WjzXqSWv6UezfLLvZGV0AI8vrFqD95d8LLXg==
"@percy/sdk-utils@^1.0.0-beta.44":
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/@percy/sdk-utils/-/sdk-utils-1.0.7.tgz#aada1fbf3cf16b07b1e256acf7ebf5c4dda571f9"
- integrity sha512-02dL6yLUSvVjbHZz2/ATLg2gRJFKeYvyIADsomuFKzSUQ2WW6pDEaRk/pBWcfS5PR/7sQ5/mV5kN389F/kU7lw==
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/@percy/sdk-utils/-/sdk-utils-1.0.8.tgz#70eba8b0a6b684048f6e6b03fc050edc191af089"
+ integrity sha512-cA45Wk9c2MFutso9W5uwj2yMbX6RRbVwsmeqwqNZUpVk6V84Tvc2Ci0gPswbc9fCC0OOHIXOq5FZ3920McVeLA==
dependencies:
- "@percy/logger" "1.0.7"
+ "@percy/logger" "1.0.8"
"@philpl/buble@^0.19.7":
version "0.19.7"
@@ -4978,9 +4978,9 @@
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
"@types/lodash@^4.14.53":
- version "4.14.181"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.181.tgz#d1d3740c379fda17ab175165ba04e2d03389385d"
- integrity sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==
+ version "4.14.182"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
+ integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
"@types/mdast@^3.0.0":
version "3.0.10"
@@ -5013,9 +5013,9 @@
form-data "^3.0.0"
"@types/node@*", "@types/node@>= 8", "@types/node@^17.0.5":
- version "17.0.24"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f"
- integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==
+ version "17.0.25"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.25.tgz#527051f3c2f77aa52e5dc74e45a3da5fb2301448"
+ integrity sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==
"@types/node@12.12.50":
version "12.12.50"
@@ -5218,9 +5218,9 @@
integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
"@types/webpack-env@^1.16.0":
- version "1.16.3"
- resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a"
- integrity sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==
+ version "1.16.4"
+ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.4.tgz#1f4969042bf76d7ef7b5914f59b3b60073f4e1f4"
+ integrity sha512-llS8qveOUX3wxHnSykP5hlYFFuMfJ9p5JvIyCiBgp7WTfl6K5ZcyHj8r8JsN/J6QODkAsRRCLIcTuOCu8etkUw==
"@types/webpack-sources@*":
version "3.2.0"
@@ -5660,9 +5660,9 @@ JSONStream@^1.0.4, JSONStream@^1.3.4:
through ">=2.2.7 <3"
abab@^2.0.0:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
- integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+ integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
abbrev@1:
version "1.1.1"
@@ -6937,7 +6937,7 @@ browserslist@4.14.2:
escalade "^3.0.2"
node-releases "^1.1.61"
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.20.2, browserslist@^4.8.3:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.20.2, browserslist@^4.8.3:
version "4.20.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
@@ -8090,17 +8090,17 @@ copy-webpack-plugin@^9.0.0, copy-webpack-plugin@^9.0.1:
serialize-javascript "^6.0.0"
core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.1:
- version "3.21.1"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
- integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
+ version "3.22.0"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.0.tgz#7ce17ab57c378be2c717c7c8ed8f82a50a25b3e4"
+ integrity sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==
dependencies:
- browserslist "^4.19.1"
+ browserslist "^4.20.2"
semver "7.0.0"
core-js-pure@^3.20.2, core-js-pure@^3.8.1, core-js-pure@^3.8.2:
- version "3.21.1"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51"
- integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==
+ version "3.22.0"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.0.tgz#0eaa54b6d1f4ebb4d19976bb4916dfad149a3747"
+ integrity sha512-ylOC9nVy0ak1N+fPIZj00umoZHgUVqmucklP5RT5N+vJof38klKn8Ze6KGyvchdClvEBr6LcQqJpI216LUMqYA==
core-js@^2.5.7, core-js@^2.6.5:
version "2.6.12"
@@ -8108,9 +8108,9 @@ core-js@^2.5.7, core-js@^2.6.5:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.0.4, core-js@^3.14.0, core-js@^3.16.1, core-js@^3.2.1, core-js@^3.6.5, core-js@^3.8.2, core-js@^3.8.3, core-js@^3.9.1:
- version "3.21.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94"
- integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==
+ version "3.22.0"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.0.tgz#b52007870c5e091517352e833b77f0b2d2b259f3"
+ integrity sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==
core-util-is@1.0.2:
version "1.0.2"
@@ -8834,9 +8834,9 @@ dateformat@^3.0.0:
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
dayjs@^1.9.3:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805"
- integrity sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.1.tgz#90b33a3dda3417258d48ad2771b415def6545eb0"
+ integrity sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==
dcmjs@0.16.1:
version "0.16.1"
@@ -9000,11 +9000,12 @@ define-lazy-prop@^2.0.0:
integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
define-properties@^1.1.2, define-properties@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
- integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+ integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
dependencies:
- object-keys "^1.0.12"
+ has-property-descriptors "^1.0.0"
+ object-keys "^1.1.1"
define-property@^0.2.5:
version "0.2.5"
@@ -9127,9 +9128,9 @@ detab@2.0.4:
repeat-string "^1.5.4"
detect-gpu@^4.0.16, detect-gpu@^4.0.7:
- version "4.0.17"
- resolved "https://registry.yarnpkg.com/detect-gpu/-/detect-gpu-4.0.17.tgz#e65a14f327e1be78c6861e1224d9b96843120629"
- integrity sha512-e5G1RSOcKEVeIGJ76RFg8q6q9Ol2BgU5feu+1XGKOU9XWg5f+Oh5zbUVmERm4h0RueT9kepCchFawDCnT7gbFA==
+ version "4.0.18"
+ resolved "https://registry.yarnpkg.com/detect-gpu/-/detect-gpu-4.0.18.tgz#5f367d9fea3e0570ccbe47fec920fa03f5705b4d"
+ integrity sha512-dqBIrt6EJ7YfSWN9d1HylWI/2j7YbnDNdU4jH4zm7/l4XJQhsEk77WrNEYfp9v8OWPmho3hqv54up1zafwxgzw==
dependencies:
webgl-constants "^1.1.1"
@@ -9519,9 +9520,9 @@ ejs@^3.1.6:
jake "^10.6.1"
electron-to-chromium@^1.3.564, electron-to-chromium@^1.4.84:
- version "1.4.107"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz#564257014ab14033b4403a309c813123c58a3fb9"
- integrity sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg==
+ version "1.4.113"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz#b3425c086e2f4fc31e9e53a724c6f239e3adb8b9"
+ integrity sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==
elegant-spinner@^1.0.1:
version "1.0.1"
@@ -10974,9 +10975,9 @@ fs-extra@^0.30.0:
rimraf "^2.2.8"
fs-extra@^10.0.0:
- version "10.0.1"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
- integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+ integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
dependencies:
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
@@ -11605,6 +11606,13 @@ has-glob@^1.0.0:
dependencies:
is-glob "^3.0.0"
+has-property-descriptors@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+ integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+ dependencies:
+ get-intrinsic "^1.1.1"
+
has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -15062,9 +15070,9 @@ moment@2.24.0:
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
moment@>=1.6.0, moment@^2.24.0, moment@^2.29.1:
- version "2.29.2"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
- integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
+ version "2.29.3"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
+ integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
moo-color@^1.0.2:
version "1.0.3"
@@ -15168,9 +15176,9 @@ nan@^2.12.1:
integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
nanoid@^3.1.23, nanoid@^3.3.1:
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
- integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
+ integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
nanomatch@^1.2.9:
version "1.2.13"
@@ -15649,7 +15657,7 @@ object-is@^1.0.1, object-is@^1.1.2:
call-bind "^1.0.2"
define-properties "^1.1.3"
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -17553,7 +17561,12 @@ prism-react-renderer@^1.2.1:
resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d"
integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ==
-prismjs@^1.21.0, prismjs@^1.23.0, prismjs@~1.27.0:
+prismjs@^1.21.0, prismjs@^1.23.0:
+ version "1.28.0"
+ resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6"
+ integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==
+
+prismjs@~1.27.0:
version "1.27.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
@@ -18322,22 +18335,22 @@ react-router-dom@6.3.0, react-router-dom@^6.0.0:
react-router "6.3.0"
react-router-dom@^5.2.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363"
- integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.1.tgz#0151baf2365c5fcd8493f6ec9b9b31f34d0f8ae1"
+ integrity sha512-f0pj/gMAbv9e8gahTmCEY20oFhxhrmHwYeIwH5EO5xu0qme+wXtsdB8YfUOAZzUz4VaXmb58m3ceiLtjMhqYmQ==
dependencies:
"@babel/runtime" "^7.12.13"
history "^4.9.0"
loose-envify "^1.3.1"
prop-types "^15.6.2"
- react-router "5.2.1"
+ react-router "5.3.1"
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
-react-router@5.2.1, react-router@^5.2.0:
- version "5.2.1"
- resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d"
- integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==
+react-router@5.3.1, react-router@^5.2.0:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.1.tgz#b13e84a016c79b9e80dde123ca4112c4f117e3cf"
+ integrity sha512-v+zwjqb7bakqgF+wMVKlAPTca/cEmPOvQ9zt7gpSNyPXau1+0qvuYZ5BWzzNDP1y6s15zDwgb9rPN63+SIniRQ==
dependencies:
"@babel/runtime" "^7.12.13"
history "^4.9.0"
@@ -18687,9 +18700,9 @@ reduce-css-calc@^2.1.8:
postcss-value-parser "^3.3.0"
redux@^4.0.5:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
- integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
+ integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
dependencies:
"@babel/runtime" "^7.9.2"
@@ -18747,12 +18760,13 @@ regex-not@^1.0.0, regex-not@^1.0.2:
safe-regex "^1.1.0"
regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.1:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.2.tgz#bf635117a2f4b755595ebb0c0ee2d2a49b2084db"
- integrity sha512-Ynz8fTQW5/1elh+jWU2EDDzeoNbD0OQ0R+D1VJU5ATOkUaro4A9YEkdN2ODQl/8UQFPPpZNw91fOcLFamM7Pww==
+ version "1.4.3"
+ resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+ integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
dependencies:
call-bind "^1.0.2"
define-properties "^1.1.3"
+ functions-have-names "^1.2.2"
regexpp@^3.0.0, regexpp@^3.1.0:
version "3.2.0"
@@ -19239,9 +19253,9 @@ rollup-plugin-terser@^7.0.0:
terser "^5.0.0"
rollup@^2.43.1:
- version "2.70.1"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.1.tgz#824b1f1f879ea396db30b0fc3ae8d2fead93523e"
- integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==
+ version "2.70.2"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.2.tgz#808d206a8851628a065097b7ba2053bd83ba0c0d"
+ integrity sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==
optionalDependencies:
fsevents "~2.3.2"
@@ -20125,9 +20139,9 @@ std-env@^2.2.1:
ci-info "^3.1.1"
std-env@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182"
- integrity sha512-mC1Ps9l77/97qeOZc+HrOL7TIaOboHqMZ24dGVQrlxFcpPpfCHpH+qfUT7Dz+6mlG8+JPA1KfBQo19iC/+Ngcw==
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.1.1.tgz#1f19c4d3f6278c52efd08a94574a2a8d32b7d092"
+ integrity sha512-/c645XdExBypL01TpFKiG/3RAa/Qmu+zRi0MwAmrdEkwHNuN0ebo8ccAXBBDa5Z0QOJgBskUIbuCK91x0sCVEw==
stealthy-require@^1.1.1:
version "1.1.1"