From 8e47112d8e9fe86d57a587e3445b12d5f98d0161 Mon Sep 17 00:00:00 2001 From: Bill Wallace Date: Tue, 25 Mar 2025 09:32:29 -0400 Subject: [PATCH] fix: Delete study measurements instead of all measurements (#4882) --- bun.lock | 318 +++++++++--------- .../cornerstone-dicom-pmap/package.json | 4 +- extensions/cornerstone-dicom-seg/package.json | 4 +- extensions/cornerstone-dicom-sr/package.json | 6 +- .../cornerstone-dynamic-volume/package.json | 4 +- extensions/cornerstone/package.json | 12 +- extensions/cornerstone/src/commandsModule.ts | 3 + .../src/components/StudyMeasurements.tsx | 10 +- .../src/panels/PanelMeasurement.tsx | 22 +- extensions/measurement-tracking/package.json | 4 +- .../panels/PanelMeasurementTableTracking.tsx | 56 +-- platform/app/package.json | 2 +- platform/core/package.json | 2 +- .../ui-next/src/components/Dialog/Dialog.tsx | 19 +- .../components/PanelSection/PanelSection.tsx | 2 +- .../src/contextProviders/ManagedDialog.tsx | 1 + 16 files changed, 237 insertions(+), 232 deletions(-) diff --git a/bun.lock b/bun.lock index 2e2df38c5..5ec2ad734 100644 --- a/bun.lock +++ b/bun.lock @@ -33,7 +33,7 @@ }, "addOns/externals/devDependencies": { "name": "@externals/devDependencies", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "@kitware/vtk.js": "32.12.0", @@ -121,21 +121,21 @@ }, "addOns/externals/dicom-microscopy-viewer": { "name": "@externals/dicom-microscopy-viewer", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "dicom-microscopy-viewer": "^0.46.1", }, }, "extensions/cornerstone": { "name": "@ohif/extension-cornerstone", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/labelmap-interpolation": "^3.7.5", - "@cornerstonejs/polymorphic-segmentation": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/labelmap-interpolation": "^3.7.8", + "@cornerstonejs/polymorphic-segmentation": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", "@itk-wasm/morphological-contour-interpolation": "1.1.0", "@kitware/vtk.js": "32.12.0", "html2canvas": "^1.4.1", @@ -152,9 +152,9 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^3.7.5", - "@ohif/core": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@cornerstonejs/dicom-image-loader": "^3.7.8", + "@ohif/core": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "dcmjs": "*", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -166,19 +166,19 @@ }, "extensions/cornerstone-dicom-pmap": { "name": "@ohif/extension-cornerstone-dicom-pmap", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", "@kitware/vtk.js": "32.12.0", "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/i18n": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/i18n": "3.10.0-beta.134", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -189,16 +189,16 @@ }, "extensions/cornerstone-dicom-rt": { "name": "@ohif/extension-cornerstone-dicom-rt", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/i18n": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/i18n": "3.10.0-beta.134", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -209,19 +209,19 @@ }, "extensions/cornerstone-dicom-seg": { "name": "@ohif/extension-cornerstone-dicom-seg", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", "@kitware/vtk.js": "32.12.0", "react-color": "^2.19.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/i18n": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/i18n": "3.10.0-beta.134", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -232,19 +232,19 @@ }, "extensions/cornerstone-dicom-sr": { "name": "@ohif/extension-cornerstone-dicom-sr", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-measurement-tracking": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-measurement-tracking": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -254,19 +254,19 @@ }, "extensions/cornerstone-dynamic-volume": { "name": "@ohif/extension-cornerstone-dynamic-volume", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/i18n": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/i18n": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "dcmjs": "*", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -276,7 +276,7 @@ }, "extensions/default": { "name": "@ohif/extension-default", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/calculate-suv": "^1.1.0", @@ -284,8 +284,8 @@ "lodash.uniqby": "^4.7.0", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/i18n": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/i18n": "3.10.0-beta.134", "dcmjs": "*", "dicomweb-client": "^0.10.4", "prop-types": "^15.6.2", @@ -299,7 +299,7 @@ }, "extensions/dicom-microscopy": { "name": "@ohif/extension-dicom-microscopy", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/codec-charls": "^1.2.3", @@ -310,10 +310,10 @@ "mathjs": "^12.4.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/i18n": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/i18n": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -324,14 +324,14 @@ }, "extensions/dicom-pdf": { "name": "@ohif/extension-dicom-pdf", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -341,14 +341,14 @@ }, "extensions/dicom-video": { "name": "@ohif/extension-dicom-video", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -358,20 +358,20 @@ }, "extensions/measurement-tracking": { "name": "@ohif/extension-measurement-tracking", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/ui": "3.10.0-beta.134", "@xstate/react": "^3.2.2", "xstate": "^4.10.0", }, "peerDependencies": { - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "classnames": "^2.3.2", "dcmjs": "*", "lodash.debounce": "^4.0.8", @@ -384,14 +384,14 @@ }, "extensions/test-extension": { "name": "@ohif/extension-test", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "dcmjs": "0.38.0", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -401,14 +401,14 @@ }, "extensions/tmtv": { "name": "@ohif/extension-tmtv", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "classnames": "^2.3.2", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -418,7 +418,7 @@ }, "modes/basic-dev-mode": { "name": "@ohif/mode-basic-dev-mode", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -428,17 +428,17 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/extension-dicom-pdf": "3.10.0-beta.130", - "@ohif/extension-dicom-video": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/extension-dicom-pdf": "3.10.0-beta.134", + "@ohif/extension-dicom-video": "3.10.0-beta.134", }, }, "modes/basic-test-mode": { "name": "@ohif/mode-test", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -448,19 +448,19 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/extension-dicom-pdf": "3.10.0-beta.130", - "@ohif/extension-dicom-video": "3.10.0-beta.130", - "@ohif/extension-measurement-tracking": "3.10.0-beta.130", - "@ohif/extension-test": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/extension-dicom-pdf": "3.10.0-beta.134", + "@ohif/extension-dicom-video": "3.10.0-beta.134", + "@ohif/extension-measurement-tracking": "3.10.0-beta.134", + "@ohif/extension-test": "3.10.0-beta.134", }, }, "modes/longitudinal": { "name": "@ohif/mode-longitudinal", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -470,32 +470,32 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/extension-dicom-pdf": "3.10.0-beta.130", - "@ohif/extension-dicom-video": "3.10.0-beta.130", - "@ohif/extension-measurement-tracking": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/extension-dicom-pdf": "3.10.0-beta.134", + "@ohif/extension-dicom-video": "3.10.0-beta.134", + "@ohif/extension-measurement-tracking": "3.10.0-beta.134", }, }, "modes/microscopy": { "name": "@ohif/mode-microscopy", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-dicom-microscopy": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-dicom-microscopy": "3.10.0-beta.134", }, }, "modes/preclinical-4d": { "name": "@ohif/mode-preclinical-4d", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", }, @@ -504,17 +504,17 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dynamic-volume": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/extension-tmtv": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dynamic-volume": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/extension-tmtv": "3.10.0-beta.134", }, }, "modes/segmentation": { "name": "@ohif/mode-segmentation", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -546,19 +546,19 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/extension-dicom-pdf": "3.10.0-beta.130", - "@ohif/extension-dicom-video": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/extension-dicom-pdf": "3.10.0-beta.134", + "@ohif/extension-dicom-video": "3.10.0-beta.134", }, }, "modes/tmtv": { "name": "@ohif/mode-tmtv", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "i18next": "^17.0.3", @@ -568,43 +568,43 @@ "webpack-merge": "^5.7.3", }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/extension-dicom-pdf": "3.10.0-beta.130", - "@ohif/extension-dicom-video": "3.10.0-beta.130", - "@ohif/extension-measurement-tracking": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/extension-dicom-pdf": "3.10.0-beta.134", + "@ohif/extension-dicom-video": "3.10.0-beta.134", + "@ohif/extension-measurement-tracking": "3.10.0-beta.134", }, }, "platform/app": { "name": "@ohif/app", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "@cornerstonejs/codec-charls": "^1.2.3", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^3.7.5", + "@cornerstonejs/dicom-image-loader": "^3.7.8", "@emotion/serialize": "^1.1.3", - "@ohif/core": "3.10.0-beta.130", - "@ohif/extension-cornerstone": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.130", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130", - "@ohif/extension-default": "3.10.0-beta.130", - "@ohif/extension-dicom-microscopy": "3.10.0-beta.130", - "@ohif/extension-dicom-pdf": "3.10.0-beta.130", - "@ohif/extension-dicom-video": "3.10.0-beta.130", - "@ohif/extension-test": "3.10.0-beta.130", - "@ohif/i18n": "3.10.0-beta.130", - "@ohif/mode-basic-dev-mode": "3.10.0-beta.130", - "@ohif/mode-longitudinal": "3.10.0-beta.130", - "@ohif/mode-microscopy": "3.10.0-beta.130", - "@ohif/mode-test": "3.10.0-beta.130", - "@ohif/ui": "3.10.0-beta.130", - "@ohif/ui-next": "3.10.0-beta.130", + "@ohif/core": "3.10.0-beta.134", + "@ohif/extension-cornerstone": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.134", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", + "@ohif/extension-default": "3.10.0-beta.134", + "@ohif/extension-dicom-microscopy": "3.10.0-beta.134", + "@ohif/extension-dicom-pdf": "3.10.0-beta.134", + "@ohif/extension-dicom-video": "3.10.0-beta.134", + "@ohif/extension-test": "3.10.0-beta.134", + "@ohif/i18n": "3.10.0-beta.134", + "@ohif/mode-basic-dev-mode": "3.10.0-beta.134", + "@ohif/mode-longitudinal": "3.10.0-beta.134", + "@ohif/mode-microscopy": "3.10.0-beta.134", + "@ohif/mode-test": "3.10.0-beta.134", + "@ohif/ui": "3.10.0-beta.134", + "@ohif/ui-next": "3.10.0-beta.134", "@svgr/webpack": "^8.1.0", "@types/react": "^18.3.3", "classnames": "^2.3.2", @@ -645,7 +645,7 @@ }, "platform/cli": { "name": "@ohif/cli", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "bin": { "ohif-cli": "src/index.js", }, @@ -669,7 +669,7 @@ }, "platform/core": { "name": "@ohif/core", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "dcmjs": "*", @@ -694,15 +694,15 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^3.7.5", - "@ohif/ui": "3.10.0-beta.130", + "@cornerstonejs/dicom-image-loader": "^3.7.8", + "@ohif/ui": "3.10.0-beta.134", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21", }, }, "platform/i18n": { "name": "@ohif/i18n", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@babel/runtime": "^7.20.13", "i18next-locize-backend": "^2.0.0", @@ -727,7 +727,7 @@ }, "platform/ui": { "name": "@ohif/ui", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@testing-library/react": "^13.1.0", "browser-detect": "^0.2.28", @@ -787,7 +787,7 @@ }, "platform/ui-next": { "name": "@ohif/ui-next", - "version": "3.10.0-beta.130", + "version": "3.10.0-beta.134", "dependencies": { "@radix-ui/react-accordion": "^1.2.0", "@radix-ui/react-checkbox": "^1.1.1", @@ -1095,7 +1095,7 @@ "@colors/colors": ["@colors/colors@1.5.0", "", {}, "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="], - "@cornerstonejs/adapters": ["@cornerstonejs/adapters@3.7.5", "", { "dependencies": { "@babel/runtime-corejs2": "^7.17.8", "buffer": "^6.0.3", "dcmjs": "^0.29.8", "gl-matrix": "^3.4.3", "ndarray": "^1.0.19" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.5", "@cornerstonejs/tools": "^3.7.5" } }, "sha512-Pdrlx1dYVe/nakC7geec8QOQwqi4hJaAgTpN18y+/a7Vk3wpzj+/q+vf03lt4BhUygAu9+3t5gAUDm0kzXq02g=="], + "@cornerstonejs/adapters": ["@cornerstonejs/adapters@3.7.8", "", { "dependencies": { "@babel/runtime-corejs2": "^7.17.8", "buffer": "^6.0.3", "dcmjs": "^0.29.8", "gl-matrix": "^3.4.3", "ndarray": "^1.0.19" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.8", "@cornerstonejs/tools": "^3.7.8" } }, "sha512-GjhBweuyP2sxYcgXjAmwNiGFXJxHQorxk9fkBN4HCYIatH6FGGtLBziy6DRjeALG7+10c+HF2jIipLgl82+umQ=="], "@cornerstonejs/calculate-suv": ["@cornerstonejs/calculate-suv@1.1.0", "", {}, "sha512-Q9XraiDJif9aMFArD2iEuDO/HXbcRVCqB7KfaHgDrdTTjgDFovS91Psbdim7crypRSvE6dh/+HKeFNHdvNkA6w=="], @@ -1107,15 +1107,15 @@ "@cornerstonejs/codec-openjph": ["@cornerstonejs/codec-openjph@2.4.7", "", {}, "sha512-qvP4q4JDib7mi9r7LqKOwqz7YZ8gjtDX4ZCezeYf8+eb7MBXCz5uXAMeVF3yz9Axw4XiIMdB/pqXkm8tqCl13w=="], - "@cornerstonejs/core": ["@cornerstonejs/core@3.7.5", "", { "dependencies": { "@kitware/vtk.js": "32.12.1", "comlink": "^4.4.1", "gl-matrix": "^3.4.3", "loglevel": "^1.9.2" } }, "sha512-AMzZrl4nTTcoZejI3qomi5f9LNPr8QkHGconRnNe7aEjuUHUiT9uwX3ieoltJ2IDNmmqhK3wVzJ19EKVqfuESQ=="], + "@cornerstonejs/core": ["@cornerstonejs/core@3.7.8", "", { "dependencies": { "@kitware/vtk.js": "32.12.1", "comlink": "^4.4.1", "gl-matrix": "^3.4.3", "loglevel": "^1.9.2" } }, "sha512-J04qN6lMQ9BbPORlcvFp4LDKc8MwWeEPc6yVnQ1GX9kIZcTaqniIGAaiLikDh9iW1O05gCWmSlaEUEVoeepo/g=="], - "@cornerstonejs/dicom-image-loader": ["@cornerstonejs/dicom-image-loader@3.7.5", "", { "dependencies": { "@cornerstonejs/codec-charls": "^1.2.3", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.5", "comlink": "^4.4.1", "dicom-parser": "^1.8.9", "jpeg-lossless-decoder-js": "^2.1.0", "pako": "^2.0.4", "uuid": "^9.0.0" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.5" } }, "sha512-bDm4hx9NagD7tTU//ls+Z+U8duYgunOfLsAiU6SvNfB2vEINOSHVSnz7pAcnzfnE21ObJYnZnmH5aa8/sa/xCg=="], + "@cornerstonejs/dicom-image-loader": ["@cornerstonejs/dicom-image-loader@3.7.8", "", { "dependencies": { "@cornerstonejs/codec-charls": "^1.2.3", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.5", "comlink": "^4.4.1", "dicom-parser": "^1.8.9", "jpeg-lossless-decoder-js": "^2.1.0", "pako": "^2.0.4", "uuid": "^9.0.0" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.8" } }, "sha512-3RjYppVU1k9rGg5GoHaF9Gi1QxEZq3+37vPqUWf5Ly9/MDk8bCSa1Jc3Myh45K0sEieCG3MwrOWKufZpWYXYGA=="], - "@cornerstonejs/labelmap-interpolation": ["@cornerstonejs/labelmap-interpolation@3.7.5", "", { "dependencies": { "@itk-wasm/morphological-contour-interpolation": "1.1.0", "itk-wasm": "1.0.0-b.165" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.5", "@cornerstonejs/tools": "^3.7.5", "@kitware/vtk.js": "32.12.1" } }, "sha512-mIdT8qzQpps1my6daRMAQDejhAAj6QGvkZyU4vbcqIHqqEnWezWFdKNWIlZhm6MX52Vy3Jnl7qBlQ8JtPd+5gQ=="], + "@cornerstonejs/labelmap-interpolation": ["@cornerstonejs/labelmap-interpolation@3.7.8", "", { "dependencies": { "@itk-wasm/morphological-contour-interpolation": "1.1.0", "itk-wasm": "1.0.0-b.165" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.8", "@cornerstonejs/tools": "^3.7.8", "@kitware/vtk.js": "32.12.1" } }, "sha512-d3IBgcezBK2yHuJNacQ39KOzBjyrXXvO0LCNDCbhkwOs58bDACpjX1gwchD2ijeRC1JhNxYsXfoU4KUdWou0ew=="], - "@cornerstonejs/polymorphic-segmentation": ["@cornerstonejs/polymorphic-segmentation@3.7.5", "", { "dependencies": { "@icr/polyseg-wasm": "0.4.0" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.5", "@cornerstonejs/tools": "^3.7.5", "@kitware/vtk.js": "32.12.1" } }, "sha512-+4T5yKjfd0b4dGqy/Tj/V5biuQgjvJVkUv7qe5xU8L/0f8irvr4XtfYoeX9Hoo/iFrYKxdI5LrC35rsKWJttpQ=="], + "@cornerstonejs/polymorphic-segmentation": ["@cornerstonejs/polymorphic-segmentation@3.7.8", "", { "dependencies": { "@icr/polyseg-wasm": "0.4.0" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.8", "@cornerstonejs/tools": "^3.7.8", "@kitware/vtk.js": "32.12.1" } }, "sha512-vZVphS6d864DP4ifUd88xKdRJQkfVxvif6PNPBp0VlIOJzv0ld7MAlNGZLwob0LEK3AK2LiN/LqKRnHBY5CZDA=="], - "@cornerstonejs/tools": ["@cornerstonejs/tools@3.7.5", "", { "dependencies": { "@types/offscreencanvas": "2019.7.3", "comlink": "^4.4.1", "lodash.get": "^4.4.2" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.5", "@kitware/vtk.js": "32.12.1", "@types/d3-array": "^3.0.4", "@types/d3-interpolate": "^3.0.1", "d3-array": "^3.2.3", "d3-interpolate": "^3.0.1", "gl-matrix": "^3.4.3" } }, "sha512-9GcUI0meHqsO8uzePwv7k99Knr1ta6Q0OCb5AmTKGP6u6ZSEAi1aj2pBSoFZPlG/2vhcXh2NYHkNmeLTYlTP1g=="], + "@cornerstonejs/tools": ["@cornerstonejs/tools@3.7.8", "", { "dependencies": { "@types/offscreencanvas": "2019.7.3", "comlink": "^4.4.1", "lodash.get": "^4.4.2" }, "peerDependencies": { "@cornerstonejs/core": "^3.7.8", "@kitware/vtk.js": "32.12.1", "@types/d3-array": "^3.0.4", "@types/d3-interpolate": "^3.0.1", "d3-array": "^3.2.3", "d3-interpolate": "^3.0.1", "gl-matrix": "^3.4.3" } }, "sha512-hF7KqE0OSs/7BUITDGqVMwM3AxmA048SxN0zUyBSuWJMdssafKHZDlmIkF8zjNATvWrQNY8ZrZ1ZpSa+dCNfLg=="], "@csstools/postcss-cascade-layers": ["@csstools/postcss-cascade-layers@1.1.1", "", { "dependencies": { "@csstools/selector-specificity": "^2.0.2", "postcss-selector-parser": "^6.0.10" }, "peerDependencies": { "postcss": "^8.2" } }, "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA=="], diff --git a/extensions/cornerstone-dicom-pmap/package.json b/extensions/cornerstone-dicom-pmap/package.json index ec1179263..4a7b2b397 100644 --- a/extensions/cornerstone-dicom-pmap/package.json +++ b/extensions/cornerstone-dicom-pmap/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", "@kitware/vtk.js": "32.12.0", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index 538c81a60..d84ac8ab4 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", "@kitware/vtk.js": "32.12.0", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index d9313e780..58ded6381 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -46,9 +46,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json index 8120fcef1..21f112ada 100644 --- a/extensions/cornerstone-dynamic-volume/package.json +++ b/extensions/cornerstone-dynamic-volume/package.json @@ -42,8 +42,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index d644eb39c..d0b1c6655 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -38,7 +38,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^3.7.5", + "@cornerstonejs/dicom-image-loader": "^3.7.8", "@ohif/core": "3.10.0-beta.134", "@ohif/ui": "3.10.0-beta.134", "dcmjs": "*", @@ -51,11 +51,11 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^3.7.5", - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/labelmap-interpolation": "^3.7.5", - "@cornerstonejs/polymorphic-segmentation": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", + "@cornerstonejs/adapters": "^3.7.8", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/labelmap-interpolation": "^3.7.8", + "@cornerstonejs/polymorphic-segmentation": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", "@itk-wasm/morphological-contour-interpolation": "1.1.0", "@kitware/vtk.js": "32.12.0", "html2canvas": "^1.4.1", diff --git a/extensions/cornerstone/src/commandsModule.ts b/extensions/cornerstone/src/commandsModule.ts index f6282f97b..588f21702 100644 --- a/extensions/cornerstone/src/commandsModule.ts +++ b/extensions/cornerstone/src/commandsModule.ts @@ -888,6 +888,9 @@ function commandsModule({ }, scroll: (options: ToolTypes.ScrollOptions) => { const enabledElement = _getActiveViewportEnabledElement(); + // Allow either or direction for consistency in scroll implementation + options.delta ??= options.direction || 1; + options.direction ??= options.delta; if (!enabledElement) { return; diff --git a/extensions/cornerstone/src/components/StudyMeasurements.tsx b/extensions/cornerstone/src/components/StudyMeasurements.tsx index 111f30932..2c419b661 100644 --- a/extensions/cornerstone/src/components/StudyMeasurements.tsx +++ b/extensions/cornerstone/src/components/StudyMeasurements.tsx @@ -1,11 +1,13 @@ import React from 'react'; -import { useActiveViewportDisplaySets, useSystem } from '@ohif/core'; +import { useActiveViewportDisplaySets, useSystem, utils } from '@ohif/core'; // import { AccordionContent, AccordionItem, AccordionTrigger } from '@ohif/ui-next'; import { AccordionGroup } from './AccordionGroup'; import MeasurementsOrAdditionalFindings from './MeasurementsOrAdditionalFindings'; import StudySummaryWithActions from './StudySummaryWithActions'; +const { MeasurementFilters } = utils; + /** * Groups measurements by study in order to allow display and saving by study * @param {Object} servicesManager @@ -26,6 +28,10 @@ export const groupByStudy = (items, grouping, childProps) => { const studyUID = getItemStudyInstanceUID(item); if (!groups.has(studyUID)) { const items = []; + const filter = MeasurementFilters.filterAnd( + MeasurementFilters.filterMeasurementsByStudyUID(activeStudyUID), + grouping.filter + ); const group = { ...grouping, items, @@ -33,6 +39,8 @@ export const groupByStudy = (items, grouping, childProps) => { key: studyUID, isSelected: studyUID === activeStudyUID, StudyInstanceUID: activeStudyUID, + filter, + measurementFilter: filter, }; if (group.isSelected && !firstSelected) { firstSelected = group; diff --git a/extensions/cornerstone/src/panels/PanelMeasurement.tsx b/extensions/cornerstone/src/panels/PanelMeasurement.tsx index 9a11ec178..2f7179fce 100644 --- a/extensions/cornerstone/src/panels/PanelMeasurement.tsx +++ b/extensions/cornerstone/src/panels/PanelMeasurement.tsx @@ -58,12 +58,7 @@ import StudyMeasurements from '../components/StudyMeasurements'; *``` */ export default function PanelMeasurement(props): React.ReactNode { - const { - measurementFilter, - emptyComponent: EmptyComponent, - key = 'PanelMeasurement', - children, - } = props; + const { measurementFilter, emptyComponent: EmptyComponent, children } = props; const system = useSystem(); const displayMeasurements = useMeasurements(system.servicesManager, { @@ -72,11 +67,7 @@ export default function PanelMeasurement(props): React.ReactNode { if (!displayMeasurements.length) { return EmptyComponent ? ( - + ) : ( No Measurements ); @@ -87,17 +78,10 @@ export default function PanelMeasurement(props): React.ReactNode { React.cloneElement(child, { items: displayMeasurements, filter: measurementFilter, - 'data-cy': key, }) ); return cloned; } // Need to merge defaults on the content props to ensure they get passed to children - return ( - - ); + return ; } diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index 85281aab1..b1758c9d8 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -32,8 +32,8 @@ "start": "yarn run dev" }, "peerDependencies": { - "@cornerstonejs/core": "^3.7.5", - "@cornerstonejs/tools": "^3.7.5", + "@cornerstonejs/core": "^3.7.8", + "@cornerstonejs/tools": "^3.7.8", "@ohif/core": "3.10.0-beta.134", "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.134", "@ohif/extension-default": "3.10.0-beta.134", diff --git a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx index 62c70edc5..900c528f7 100644 --- a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx +++ b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx @@ -24,12 +24,14 @@ function PanelMeasurementTableTracking(props) { : filterPlanarMeasurement; const EmptyComponent = () => ( - - - +
+ + + +
); const actions = { @@ -55,27 +57,29 @@ function PanelMeasurementTableTracking(props) { ); return ( - - - +
+ + +
- - - - + + + + +
); } diff --git a/platform/app/package.json b/platform/app/package.json index 7f140402c..77f346e3c 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -54,7 +54,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^3.7.5", + "@cornerstonejs/dicom-image-loader": "^3.7.8", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.10.0-beta.134", "@ohif/extension-cornerstone": "3.10.0-beta.134", diff --git a/platform/core/package.json b/platform/core/package.json index eb6b18130..96a32dc06 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -37,7 +37,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^3.7.5", + "@cornerstonejs/dicom-image-loader": "^3.7.8", "@ohif/ui": "3.10.0-beta.134", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/platform/ui-next/src/components/Dialog/Dialog.tsx b/platform/ui-next/src/components/Dialog/Dialog.tsx index 4bb4cae6e..37205baef 100644 --- a/platform/ui-next/src/components/Dialog/Dialog.tsx +++ b/platform/ui-next/src/components/Dialog/Dialog.tsx @@ -63,14 +63,16 @@ const DialogOverlay = React.forwardRef< DialogOverlay.displayName = DialogPrimitive.Overlay.displayName; interface DialogContentProps - extends React.ComponentPropsWithoutRef {} + extends React.ComponentPropsWithoutRef { + unstyled?: boolean; +} const DialogContent = React.forwardRef< React.ElementRef, DialogContentProps & { children?: React.ReactNode; } ->(({ className, children, ...props }, ref) => { +>(({ className, children, unstyled, ...props }, ref) => { const { isDraggable, shouldCloseOnEsc, shouldCloseOnOverlayClick, showOverlay } = React.useContext(DialogContext); @@ -84,7 +86,8 @@ const DialogContent = React.forwardRef< // When not isDraggable, Tailwind centers the dialog. // When isDraggable, we remove the built‑in centering so our inline transform takes over. const contentClassName = cn( - 'max-w-md w-full bg-muted data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid gap-4 p-4 shadow-lg duration-200 sm:rounded-lg', + unstyled ? '' : 'w-full', + 'max-w-md bg-muted data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid gap-4 p-4 shadow-lg duration-200 sm:rounded-lg', !isDraggable ? 'translate-x-[-50%] translate-y-[-50%]' : '', className ); @@ -110,10 +113,12 @@ const DialogContent = React.forwardRef< }} > {children} - - - Close - + {!unstyled && ( + + + Close + + )} ); diff --git a/platform/ui-next/src/components/PanelSection/PanelSection.tsx b/platform/ui-next/src/components/PanelSection/PanelSection.tsx index b6c2d8f1d..37811601f 100644 --- a/platform/ui-next/src/components/PanelSection/PanelSection.tsx +++ b/platform/ui-next/src/components/PanelSection/PanelSection.tsx @@ -46,7 +46,7 @@ export const PanelSection: React.FC & { ); }; -PanelSection.Header = ({ children, className, showChevron = true }) => ( +PanelSection.Header = ({ children, className }) => ( = ({ >