Merge pull request #19198 from strapi/fix/release-action-menu-styles

fix(content-releases): fix ReleaseActionMenu styles
This commit is contained in:
markkaylor 2024-01-11 11:51:38 +01:00 committed by GitHub
commit 4b33c7a01b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 5 deletions

View File

@ -356,7 +356,11 @@ export const CMReleasesContainer = () => {
<Typography fontSize={2} fontWeight="bold" variant="omega" textColor="neutral700">
{release.name}
</Typography>
<ReleaseActionMenu releaseId={release.id} actionId={release.action.id} />
<ReleaseActionMenu
releaseId={release.id}
actionId={release.action.id}
hasTriggerBorder
/>
</Flex>
</Flex>
);

View File

@ -34,12 +34,22 @@ const StyledCross = styled(Cross)`
padding: ${({ theme }) => theme.spaces[1]};
`;
const StyledIconButton = styled(IconButton)`
/* Setting this style inline with borderColor will not apply the style */
border: ${({ theme }) => `1px solid ${theme.colors.neutral200}`};
`;
interface ReleaseActionMenuProps {
releaseId: DeleteReleaseAction.Request['params']['releaseId'];
actionId: DeleteReleaseAction.Request['params']['actionId'];
hasTriggerBorder?: boolean;
}
export const ReleaseActionMenu = ({ releaseId, actionId }: ReleaseActionMenuProps) => {
export const ReleaseActionMenu = ({
releaseId,
actionId,
hasTriggerBorder = false,
}: ReleaseActionMenuProps) => {
const { formatMessage } = useIntl();
const toggleNotification = useNotification();
const { formatAPIError } = useAPIErrorHandler();
@ -90,7 +100,7 @@ export const ReleaseActionMenu = ({ releaseId, actionId }: ReleaseActionMenuProp
- The Icon doesn't actually show unless you hack it with some padding...and it's still a little strange
*/}
<Menu.Trigger
as={IconButton}
as={hasTriggerBorder ? StyledIconButton : IconButton}
paddingLeft={2}
paddingRight={2}
aria-label={formatMessage({
@ -106,10 +116,10 @@ export const ReleaseActionMenu = ({ releaseId, actionId }: ReleaseActionMenuProp
*/}
<Menu.Content top={1} popoverPlacement="bottom-end">
<CheckPermissions permissions={PERMISSIONS.deleteAction}>
<StyledMenuItem color="danger600" onSelect={handleDeleteAction}>
<StyledMenuItem onSelect={handleDeleteAction}>
<Flex gap={2}>
<StyledCross />
<Typography variant="omega">
<Typography textColor="danger600" variant="omega">
{formatMessage({
id: 'content-releases.content-manager-edit-view.remove-from-release',
defaultMessage: 'Remove from release',