Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚀 [EUEG-3147] - feat(Dialog): update close button style #735

Merged
merged 2 commits into from
Feb 23, 2024
Merged

🚀 [EUEG-3147] - feat(Dialog): update close button style #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7adea35
feat(Dialog): update close button style
leonardo-gympass Feb 20, 2024
25d05e5
refactor(Dialog): add tokens to CloseButton
leonardo-gympass Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions packages/yoga/src/Dialog/web/Dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useCallback } from 'react';
import { createPortal } from 'react-dom';
import styled from 'styled-components';
import styled, { css } from 'styled-components';
import { func, bool, node, number, string } from 'prop-types';

import { Close } from '@gympass/yoga-icons';
Expand Down Expand Up @@ -53,6 +53,29 @@ const Overlay = styled.div`
`}
`;

const CloseButton = styled(Button.Icon)`
${({ theme }) => {
const background = theme.yoga.colors.elements.lineAndBorders;
const containerSize = theme.yoga.spacing.xxlarge;
const svgSize = theme.yoga.spacing.medium;

return css`
width: ${containerSize}px;
height: ${containerSize}px;
background-color: ${background};

svg {
width: ${svgSize}px;
height: ${svgSize}px;
}

&:active {
background-color: ${background};
}
`;
}}
`;

const Dialog = React.forwardRef(
(
{ isOpen, hideCloseButton, children, dialogId, onClose, zIndex, ...props },
Expand Down Expand Up @@ -99,7 +122,12 @@ const Dialog = React.forwardRef(
<StyledDialog onClose={onClose} {...props}>
{isCloseButtonVisible && (
<Box d="flex" justifyContent="flex-end" w="100%">
<Button.Icon icon={Close} inverted onClick={onClose} />
<CloseButton
icon={Close}
inverted
secondary
onClick={onClose}
/>
</Box>
)}
{children}
Expand Down
61 changes: 38 additions & 23 deletions packages/yoga/src/Dialog/web/__snapshots__/Dialog.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,23 +182,23 @@ exports[`<Dialog /> should match snapshot 1`] = `
exports[`<Dialog /> should match snapshot with close button 1`] = `
<body>
<div />
.c6 {
.c7 {
margin-bottom: 24px;
color: #231B22;
font-size: 24px;
font-weight: 500;
text-align: center;
}

.c7 {
.c8 {
margin-bottom: 32px;
color: #6B6B78;
font-size: 16px;
font-weight: 400;
text-align: center;
}

.c8 {
.c9 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand All @@ -222,12 +222,12 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
justify-content: flex-end;
}

.c5 {
.c6 {
width: 24px;
height: 24px;
}

.c9 {
.c10 {
box-sizing: border-box;
text-align: center;
outline: none;
Expand Down Expand Up @@ -266,7 +266,7 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
text-decoration: none;
}

.c9 svg {
.c10 svg {
width: 24px;
height: 24px;
fill: #FFFFFF;
Expand All @@ -275,17 +275,17 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
transition: fill 0.2s;
}

.c9:not([disabled]):hover,
.c9:not([disabled]):focus {
.c10:not([disabled]):hover,
.c10:not([disabled]):focus {
box-shadow: 0 4px 8px rgba(35,27,34,0.45);
}

.c9:active {
.c10:active {
background-color: rgba(35,27,34,0.75);
color: #FFFFFF;
}

.c9:active svg {
.c10:active svg {
fill: #FFFFFF;
}

Expand All @@ -312,7 +312,7 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
height: 48px;
padding-left: 24px;
padding-right: 24px;
background-color: #D8385E;
background-color: #231B22;
border: none;
border-radius: 9999px;
color: #FFFFFF;
Expand All @@ -327,7 +327,7 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
-webkit-text-decoration: none;
text-decoration: none;
background-color: #FFFFFF;
color: #D8385E;
color: #231B22;
padding: 0;
width: 48px;
}
Expand All @@ -343,11 +343,11 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `

.c4:not([disabled]):hover,
.c4:not([disabled]):focus {
box-shadow: 0 4px 8px rgba(216,56,94,0.45);
box-shadow: 0 4px 8px rgba(35,27,34,0.45);
}

.c4:active {
background-color: rgba(216,56,94,0.75);
background-color: rgba(35,27,34,0.75);
color: #FFFFFF;
}

Expand All @@ -356,16 +356,16 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
}

.c4 svg {
fill: #D8385E;
fill: #231B22;
}

.c4:active {
background-color: rgba(255,255,255,0.75);
color: rgba(216,56,94,0.75);
color: rgba(35,27,34,0.75);
}

.c4:active svg {
fill: rgba(216,56,94,0.75);
fill: rgba(35,27,34,0.75);
}

.c4:not([disabled]):hover,
Expand Down Expand Up @@ -428,6 +428,21 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
background-color: rgba(35,27,34,0.48);
}

.c5 {
width: 40px;
height: 40px;
background-color: #D7D7E0;
}

.c5 svg {
width: 20px;
height: 20px;
}

.c5:active {
background-color: #D7D7E0;
}

<div
id="dialog"
>
Expand All @@ -443,35 +458,35 @@ exports[`<Dialog /> should match snapshot with close button 1`] = `
d="flex"
>
<button
class="c4"
class="c4 c5"
>
<svg
aria-hidden="true"
class="c5"
class="c6"
height="24"
role="img"
width="24"
/>
</button>
</div>
<header
class="c6"
class="c7"
color="text.primary"
>
Title
</header>
<div
class="c7"
class="c8"
color="text.secondary"
>
Subtitle
</div>
<footer
class="c8"
class="c9"
d="flex"
>
<button
class="c9"
class="c10"
>
Ok, got it
</button>
Expand Down
Loading