diff --git a/packages/core/admin/admin/src/content-manager/components/BlocksEditor/Toolbar/index.js b/packages/core/admin/admin/src/content-manager/components/BlocksEditor/Toolbar/index.js index adf09309e8..b2838e5b68 100644 --- a/packages/core/admin/admin/src/content-manager/components/BlocksEditor/Toolbar/index.js +++ b/packages/core/admin/admin/src/content-manager/components/BlocksEditor/Toolbar/index.js @@ -1,15 +1,7 @@ import * as React from 'react'; import * as Toolbar from '@radix-ui/react-toolbar'; -import { - Flex, - Icon, - Tooltip, - SingleSelect, - SingleSelectOption, - Box, - Typography, -} from '@strapi/design-system'; +import { Flex, Icon, Tooltip, SingleSelect, SingleSelectOption, Box } from '@strapi/design-system'; import { pxToRem, prefixFileUrlWithBackendUrl, useLibrary } from '@strapi/helper-plugin'; import { Link } from '@strapi/icons'; import PropTypes from 'prop-types'; @@ -632,15 +624,6 @@ LinkButton.propTypes = { disabled: PropTypes.bool.isRequired, }; -// TODO: Remove after the RTE Blocks Beta release -const BetaTag = styled(Box)` - background-color: ${({ theme }) => theme.colors.secondary100}; - border: ${({ theme }) => `1px solid ${theme.colors.secondary200}`}; - border-radius: ${({ theme }) => theme.borderRadius}; - font-size: ${({ theme }) => theme.fontSizes[0]}; - padding: ${({ theme }) => `${2 / 16}rem ${theme.spaces[1]}`}; -`; - const BlocksToolbar = ({ disabled }) => { const modifiers = useModifiersStore(); const blocks = useBlocksStore(); @@ -673,8 +656,7 @@ const BlocksToolbar = ({ disabled }) => { return ( - {/* Remove after the RTE Blocks Beta release (paddingRight and width) */} - + @@ -700,14 +682,6 @@ const BlocksToolbar = ({ disabled }) => { - {/* TODO: Remove after the RTE Blocks Beta release */} - - - - BETA - - - ); diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js index 0532c14c88..05da15bdf1 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js @@ -6,24 +6,35 @@ import React from 'react'; -import { Box, Flex, Typography } from '@strapi/design-system'; +import { Box, Flex, Typography, Icon } from '@strapi/design-system'; +import { Spark } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import styled from 'styled-components'; import useFormModalNavigation from '../../../hooks/useFormModalNavigation'; import getTrad from '../../../utils/getTrad'; import AttributeIcon from '../../AttributeIcon'; import OptionBoxWrapper from '../OptionBoxWrapper'; -// TODO: Remove after the RTE Blocks Beta release -const BetaTag = styled(Box)` - background-color: ${({ theme }) => theme.colors.secondary100}; - border: ${({ theme }) => `1px solid ${theme.colors.secondary200}`}; - border-radius: ${({ theme }) => theme.borderRadius}; - font-size: ${({ theme }) => theme.fontSizes[0]}; - padding: ${({ theme }) => `${2 / 16}rem ${theme.spaces[1]}`}; -`; +// TODO: remove blocks from array on 4.16 release (after blocks stable) +const newAttributes = ['blocks']; + +const NewBadge = () => ( + + + + + New + + + +); const AttributeOption = ({ type }) => { const { formatMessage } = useIntl(); @@ -43,23 +54,13 @@ const AttributeOption = ({ type }) => { - {/* TODO: Remove after the RTE Blocks Beta release (width) */} - {/* TODO: Remove after the RTE Blocks Beta release (justifyContent) */} {formatMessage({ id: getTrad(`attribute.${type}`), defaultMessage: type })} - {/* Remove after the RTE Blocks Beta release */} - {type === 'blocks' && ( - - - BETA - - - )} + {newAttributes.includes(type) && } - {formatMessage({ diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/index.js index 24bd32ad43..447b792f1d 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/index.js @@ -13,7 +13,6 @@ import { TabPanel, TabPanels, Tabs, - Alert, } from '@strapi/design-system'; import { getYupInnerErrors, @@ -30,7 +29,6 @@ import toLower from 'lodash/toLower'; import { useIntl } from 'react-intl'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; -import styled from 'styled-components'; import useDataManager from '../../hooks/useDataManager'; import useFormModalNavigation from '../../hooks/useFormModalNavigation'; @@ -78,13 +76,6 @@ import makeSelectFormModal from './selectors'; import { canEditContentType, getAttributesToDisplay, getFormInputNames } from './utils'; import { createComponentUid, createUid } from './utils/createUid'; -// TODO: Remove after the RTE Blocks Beta release -const BetaFeatureAlert = styled(Alert)` - button { - display: none; - } -`; - /* eslint-disable indent */ /* eslint-disable react/no-array-index-key */ const FormModal = () => { @@ -1072,15 +1063,6 @@ const FormModal = () => { - {/* TODO: Remove after the RTE Blocks Beta release */} - {attributeType === 'blocks' && ( - - {formatMessage({ - id: getTrad('form.feature.beta'), - defaultMessage: 'This feature is in Beta.', - })} - - )} { - {/* TODO: Remove after the RTE Blocks Beta release */} - {attributeType === 'blocks' && ( - - {formatMessage({ - id: getTrad('form.feature.beta'), - defaultMessage: 'This feature is in Beta.', - })} - - )}