From 19f9c0be35ead2b1e253bcf89c310736f923889e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= <remi.dejuvigny@strapi.io>
Date: Mon, 22 Aug 2022 16:22:43 +0200
Subject: [PATCH 1/2] Display labelAction on color picker custom field

---
 .../components/ColorPicker/ColorPickerInput/index.js   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js b/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js
index 6e620d6ab4..bfc4c9d3e8 100644
--- a/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js
+++ b/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js
@@ -1,6 +1,8 @@
 import React from 'react';
 import { Stack } from '@strapi/design-system/Stack';
 import { Typography } from '@strapi/design-system/Typography';
+import { Flex } from '@strapi/design-system/Flex';
+import { Box } from '@strapi/design-system/Box';
 import { Field, FieldHint, FieldError, FieldLabel } from '@strapi/design-system/Field';
 import { useIntl } from 'react-intl';
 import getTrad from '../../../utils/getTrad';
@@ -11,6 +13,7 @@ const ColorPickerInput = ({
   disabled,
   error,
   intlLabel,
+  labelAction,
   name,
   onChange,
   required,
@@ -26,7 +29,12 @@ const ColorPickerInput = ({
       hint={description && formatMessage(description)}
     >
       <Stack spacing={1}>
-        <FieldLabel required={required}>{formatMessage(intlLabel)}</FieldLabel>
+        <Flex>
+          <FieldLabel required={required} labelAction={labelAction}>
+            {formatMessage(intlLabel)}
+          </FieldLabel>
+          {labelAction && <Box paddingLeft={1}>{labelAction}</Box>}
+        </Flex>
         <Typography variant="pi" as="p">
           {formatMessage(
             {

From 79d845e2926d4d02d3efdf6d7cd3c9a3c8af98eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= <remi.dejuvigny@strapi.io>
Date: Mon, 22 Aug 2022 16:46:48 +0200
Subject: [PATCH 2/2] Remove extraneous prop

---
 .../src/components/ColorPicker/ColorPickerInput/index.js      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js b/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js
index bfc4c9d3e8..96b9a0087d 100644
--- a/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js
+++ b/examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js
@@ -30,9 +30,7 @@ const ColorPickerInput = ({
     >
       <Stack spacing={1}>
         <Flex>
-          <FieldLabel required={required} labelAction={labelAction}>
-            {formatMessage(intlLabel)}
-          </FieldLabel>
+          <FieldLabel required={required}>{formatMessage(intlLabel)}</FieldLabel>
           {labelAction && <Box paddingLeft={1}>{labelAction}</Box>}
         </Flex>
         <Typography variant="pi" as="p">