Prevent an error from colors possibly being undefined

Types of property 'colors' are incompatible. Type 'Colors | undefined' is not assignable to type '(Color | MultipleColors)[]'. Type 'undefined' is not assignable to type '(Color | MultipleColors)[]'.
kienstra · Oct 12, 2022 · 7fe648e · 7fe648e
1 parent 4a602dd
commit 7fe648e
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/packages/components/src/border-control/border-control-dropdown/component.tsx b/packages/components/src/border-control/border-control-dropdown/component.tsx
@@ -198,20 +198,22 @@ const BorderControlDropdown = (
 							/>
 						</HStack>
 					) : undefined }
-					<ColorPalette
-						className={ popoverContentClassName }
-						value={ color }
-						onChange={ onColorChange }
-						{ ...{ colors, disableCustomColors } }
-						__experimentalHasMultipleOrigins={
-							__experimentalHasMultipleOrigins
-						}
-						__experimentalIsRenderedInSidebar={
-							__experimentalIsRenderedInSidebar
-						}
-						clearable={ false }
-						enableAlpha={ enableAlpha }
-					/>
+					{ colors ? (
+						<ColorPalette
+							className={ popoverContentClassName }
+							value={ color }
+							onChange={ onColorChange }
+							{ ...{ colors, disableCustomColors } }
+							__experimentalHasMultipleOrigins={
+								__experimentalHasMultipleOrigins
+							}
+							__experimentalIsRenderedInSidebar={
+								__experimentalIsRenderedInSidebar
+							}
+							clearable={ false }
+							enableAlpha={ enableAlpha }
+						/>
+					) : undefined }
 					{ enableStyle && (
 						<BorderControlStylePicker
 							label={ __( 'Style' ) }