Merge branch 'master' into customizable-TS

extensions/cornerstone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "3.6.0-beta.0",
+  "version": "3.7.0-beta.0",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -37,8 +37,8 @@
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.2",
     "@cornerstonejs/dicom-image-loader": "^0.6.8",
-    "@ohif/core": "3.6.0-beta.0",
-    "@ohif/ui": "3.6.0-beta.0",
+    "@ohif/core": "3.7.0-beta.0",
+    "@ohif/ui": "3.7.0-beta.0",
     "dcmjs": "^0.29.6",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",

extensions/cornerstone/src/components/DicomUpload/DicomUploadProgressItem.tsx

@@ -97,7 +97,7 @@ const DicomUploadProgressItem = memo(
               )}
               <div className="flex cursor-pointer ml-auto">
                 <Icon
-                  className="w-6 h-6 self-center text-primary-active"
+                  className="self-center text-primary-active"
                   name="close"
                   onClick={cancelUpload}
                 />

extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts

@@ -117,7 +117,7 @@ class SegmentationService extends PubSubService {
    * -- opacity: the opacity of the segment
    * -- visibility: the visibility of the segment (boolean)
    * -- isLocked: whether the segment is locked for editing
-   * -- active: whether the segment is currently the active segment to be edited or not
+   * -- active: whether the segment is currently the active segment to be edited
    */
   public addSegment(
     segmentationId: string,

extensions/cornerstone/src/utils/callInputDialog.tsx

@@ -27,8 +27,8 @@ function callInputDialog(
       : data.label
     : '';
   const {
-    dialogTitle = 'Enter your annotation',
-    inputLabel = '',
+    dialogTitle = 'Annotation',
+    inputLabel = 'Enter your annotation',
     validateFunc = value => true,
   } = dialogConfig;
 
@@ -66,27 +66,24 @@ function callInputDialog(
         onSubmit: onSubmitHandler,
         body: ({ value, setValue }) => {
           return (
-            <div className="p-4 bg-primary-dark">
-              <Input
-                autoFocus
-                className="mt-2 bg-black border-primary-main"
-                type="text"
-                id="annotation"
-                containerClassName="mr-2"
-                label={inputLabel}
-                labelClassName="text-primary-light"
-                value={value.label}
-                onChange={event => {
-                  event.persist();
-                  setValue(value => ({ ...value, label: event.target.value }));
-                }}
-                onKeyPress={event => {
-                  if (event.key === 'Enter') {
-                    onSubmitHandler({ value, action: { id: 'save' } });
-                  }
-                }}
-              />
-            </div>
+            <Input
+              autoFocus
+              className="bg-black border-primary-main"
+              type="text"
+              id="annotation"
+              label={inputLabel}
+              labelClassName="text-white text-[14px] leading-[1.2]"
+              value={value.label}
+              onChange={event => {
+                event.persist();
+                setValue(value => ({ ...value, label: event.target.value }));
+              }}
+              onKeyPress={event => {
+                if (event.key === 'Enter') {
+                  onSubmitHandler({ value, action: { id: 'save' } });
+                }
+              }}
+            />
           );
         },
       },