Allow EmbeddedDisplay resize prop to be string or number

DiamondLightSource · Mar 18, 2024 · a43dc56 · a43dc56
1 parent eadc572
commit a43dc56
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/ui/widgets/EmbeddedDisplay/bobParser.ts b/src/ui/widgets/EmbeddedDisplay/bobParser.ts
@@ -183,7 +183,7 @@ function bobParseResizing(jsonProp: ElementCompact): string {
     case 4:
       return "crop-content";
     default:
-      return "scroll-widget";
+      return "scroll-content";
   }
 }
 

diff --git a/src/ui/widgets/EmbeddedDisplay/embeddedDisplay.tsx b/src/ui/widgets/EmbeddedDisplay/embeddedDisplay.tsx
@@ -25,6 +25,14 @@ import { useOpiFile } from "./useOpiFile";
 import { useId } from "react-id-generator";
 import { getOptionalValue, trimFromString } from "../utils";
 
+const RESIZE_STRINGS = [
+  "scroll-widget",
+  "size-content",
+  "crop-widget",
+  "stretch-content",
+  "crop-content"
+];
+
 const EmbeddedDisplayProps = {
   ...WidgetPropType,
   file: FilePropType,
@@ -34,15 +42,17 @@ const EmbeddedDisplayProps = {
   scroll: BoolPropOpt,
   scalingOrigin: StringPropOpt,
   overrideAutoZoomToFitValue: BoolPropOpt,
-  resize: StringPropOpt
+  resize: StringOrNumPropOpt
 };
 
 export const EmbeddedDisplay = (
   props: InferWidgetProps<typeof EmbeddedDisplayProps>
 ): JSX.Element => {
   const description = useOpiFile(props.file);
   const id = useId();
-  const resize = props.resize || "scroll-content";
+  let resize = props.resize || "scroll-content";
+  // If number, convert back to string
+  if (typeof resize === "number") resize = RESIZE_STRINGS[resize];
 
   log.debug(description);
 

diff --git a/src/ui/widgets/EmbeddedDisplay/opiParser.ts b/src/ui/widgets/EmbeddedDisplay/opiParser.ts
@@ -581,7 +581,7 @@ function opiParseResizing(jsonProp: ElementCompact): string {
     case 2:
       return "crop-content";
     case 3:
-      return "scroll-widget";
+      return "scroll-content";
     default:
       return "size-widget";
   }