yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-07 04:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'features/custom-fields' of github.com:strapi/strapi into features/custom-fields

Browse Source
This commit is contained in:
Mark Kaylor 2022-08-22 17:03:42 +02:00
commit 1ca7501c97
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/getstarted/src/plugins/mycustomfields/admin/src/components/ColorPicker/ColorPickerInput/index.js
View File

@ -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,10 @@ const ColorPickerInput = ({
hint={description && formatMessage(description)}
>
<Stack spacing={1}>
<FieldLabel required={required}>{formatMessage(intlLabel)}</FieldLabel>
<Flex>
<FieldLabel required={required}>{formatMessage(intlLabel)}</FieldLabel>
{labelAction && <Box paddingLeft={1}>{labelAction}</Box>}
</Flex>
<Typography variant="pi" as="p">
{formatMessage(
{