Refactor components

src/controls/border-color-control.tsx

@@ -39,10 +39,10 @@ type Props = {
 	help?: string;
 	onChange: ( event: any ) => void;
 	values: {
-		top?: Property.BorderTopColor;
-		right?: Property.BorderRightColor;
-		bottom?: Property.BorderBottomColor;
-		left?: Property.BorderLeftColor;
+		top?: Property.Color;
+		right?: Property.Color;
+		bottom?: Property.Color;
+		left?: Property.Color;
 	};
 };
 

src/controls/color-control.tsx

@@ -18,8 +18,8 @@ import {
 	FlexItem,
 	Popover,
 	ColorPalette,
-	__experimentalVStack as VStack,
 	__experimentalSpacer as Spacer,
+	__experimentalVStack as VStack,
 	__experimentalText as Text,
 } from '@wordpress/components';
 import { store as blockEditorStore } from '@wordpress/block-editor';