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

fix modal button spacing #799

Merged
merged 2 commits into from
Apr 19, 2024
Merged

fix modal button spacing #799

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
6540591
fix modal button spacing
fraincs Apr 19, 2024
6b41fe6
moved the solution to a gap
fraincs Apr 19, 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
5 changes: 5 additions & 0 deletions .changeset/healthy-mangos-flash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@igloo-ui/modal": patch
---

Fixed a margin issue with footer action buttons
5 changes: 3 additions & 2 deletions packages/Modal/src/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const Modal: React.FunctionComponent<ModalProps> = (props: ModalProps) => {
console.warn("Warning: The closeBtnAriaLabel prop in the Modal component is deprecated " +
"and will be removed in a future version.");
}

const stringFormatter = useLocalizedStringFormatter(intlMessages);

const displayBackBtn = carousel && carousel.currentSlide && carousel.currentSlide > 0;
Expand All @@ -119,7 +119,7 @@ const Modal: React.FunctionComponent<ModalProps> = (props: ModalProps) => {

const ref = React.useRef<HTMLDivElement>(null);
const { overlayProps, underlayProps } = useOverlay(
{ isOpen, onClose, isDismissable, isKeyboardDismissDisabled: !dismissOnEscape,
{ isOpen, onClose, isDismissable, isKeyboardDismissDisabled: !dismissOnEscape,
shouldCloseOnInteractOutside: element => {
// Don't close if a dropdown is clicked
if (element.closest("[data-floating-ui-portal]")) {
Expand Down Expand Up @@ -274,6 +274,7 @@ const Modal: React.FunctionComponent<ModalProps> = (props: ModalProps) => {
&& React.cloneElement(secondaryAction, {
className: cx(
"ids-modal__footer-action",
"ids-modal__footer-action--secondary",
secondaryAction.props?.className
)
})}
Expand Down
5 changes: 4 additions & 1 deletion packages/Modal/src/modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
--ids-modal-full-content-close-spacing-vertical: #{tokens.$space-1};
--ids-modal-footer-margin: #{tokens.$space-2} -#{tokens.$space-2} -#{tokens.$space-2};
--ids-modal-footer-action-margin: #{tokens.$space-2} #{tokens.$space-2};
--ids-modal-footer-action-gap: 0;
}

[data-brand="workleap"] {
Expand Down Expand Up @@ -87,7 +88,8 @@
--ids-modal-full-content-close-spacing-horizontal: calc(var(--hop-space-inline-xs) + var(--hop-space-inline-sm));
--ids-modal-full-content-close-spacing-vertical: calc(var(--hop-space-stack-xs) + var(--hop-space-stack-sm));
--ids-modal-footer-margin: var(--hop-space-stack-sm) calc(-1 * var(--hop-space-inline-sm)) calc(-1 * var(--hop-space-stack-sm));
--ids-modal-footer-action-margin: var(--hop-space-stack-sm) var(--hop-space-inline-sm);
--ids-modal-footer-action-margin: 0;
--ids-modal-footer-action-gap: var(--hop-space-inset-sm);
}

@media (width >= #{tokens.$breakpoints-sm}) {
Expand Down Expand Up @@ -323,6 +325,7 @@
align-items: center;
display: flex;
flex-wrap: wrap;
gap: var(--ids-modal-footer-action-gap);
justify-content: flex-end;
margin: var(--ids-modal-footer-margin);
margin-top: auto;
Expand Down
Loading