Merge pull request #8339 from guardian/ash/DocumentBlockElement

Mark DocumentBlockElement props as optional
guardian · Jul 21, 2023 · e234547 · e234547
2 parents e673e44 + 9bb704b
commit e234547
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/dotcom-rendering/src/components/DocumentBlockComponent.importable.tsx b/dotcom-rendering/src/components/DocumentBlockComponent.importable.tsx
@@ -25,14 +25,14 @@ export const getDocumentCloudAssetUrl = (
 
 type Props = {
 	embedUrl?: string;
-	height: number;
+	height?: number;
 	isMainMedia: boolean;
 	isTracking: boolean;
 	role?: RoleType;
 	source?: string;
 	sourceDomain?: string;
 	title?: string;
-	width: number;
+	width?: number;
 };
 
 export const DocumentBlockComponent = ({

diff --git a/dotcom-rendering/src/model/article-schema.json b/dotcom-rendering/src/model/article-schema.json
@@ -1666,10 +1666,7 @@
             "required": [
                 "_type",
                 "elementId",
-                "embedUrl",
-                "height",
-                "isThirdPartyTracking",
-                "width"
+                "isThirdPartyTracking"
             ]
         },
         "EmbedBlockElement": {

diff --git a/dotcom-rendering/src/model/block-schema.json b/dotcom-rendering/src/model/block-schema.json
@@ -1197,10 +1197,7 @@
             "required": [
                 "_type",
                 "elementId",
-                "embedUrl",
-                "height",
-                "isThirdPartyTracking",
-                "width"
+                "isThirdPartyTracking"
             ]
         },
         "EmbedBlockElement": {

diff --git a/dotcom-rendering/src/types/content.ts b/dotcom-rendering/src/types/content.ts
@@ -158,9 +158,9 @@ export interface DividerBlockElement {
 export interface DocumentBlockElement extends ThirdPartyEmbeddedContent {
 	_type: 'model.dotcomrendering.pageElements.DocumentBlockElement';
 	elementId: string;
-	embedUrl: string;
-	height: number;
-	width: number;
+	embedUrl?: string;
+	height?: number;
+	width?: number;
 	title?: string;
 	role?: RoleType;
 }