Skip to content
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
12 changes: 9 additions & 3 deletions packages/scratch-gui/src/components/alerts/alert.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
body .alert {
width: 100%;
display: flex;
box-sizing: border-box;
flex-direction: row;
overflow: hidden;
justify-content: flex-start;
Expand All @@ -19,8 +20,8 @@ body .alert {
}

.alert.warn {
background: #FFF0DF;
border: 1px solid #FF8C1A;
background: $ui-alert-orange;
border: 1px solid $data-primary;
box-shadow: 0px 0px 0px 2px rgba(255, 140, 26, 0.25);
}

Expand All @@ -30,6 +31,11 @@ body .alert {
box-shadow: 0px 0px 0px 2px $extensions-light;
}

.alert.info-blue {
border: 1px solid $motion-primary;
background: $ui-primary;
}

.alert-spinner {
self-align: center;
}
Expand Down Expand Up @@ -76,7 +82,7 @@ body .alert {
width: 6.5rem;
padding: 0.55rem 0.9rem;
border-radius: 0.35rem;
background: #FF8C1A;
background: $data-primary;
color: white;
font-weight: 700;
font-size: 0.77rem;
Expand Down
8 changes: 7 additions & 1 deletion packages/scratch-gui/src/components/button/button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const ButtonComponent = ({
iconSrc,
onClick,
children,
componentRef,
...props
}) => {

Expand All @@ -33,6 +34,7 @@ const ButtonComponent = ({
className
)}
onClick={onClick}
ref={componentRef}
{...props}
>
{icon}
Expand All @@ -47,7 +49,11 @@ ButtonComponent.propTypes = {
disabled: PropTypes.bool,
iconClassName: PropTypes.string,
iconSrc: PropTypes.string,
onClick: PropTypes.func
onClick: PropTypes.func,
componentRef: PropTypes.oneOfType([
PropTypes.func,
PropTypes.shape({current: PropTypes.instanceOf(Element)})
])
};

export default ButtonComponent;
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
@import "../../css/colors.css";
@import "../../css/units.css";

.modal-container {
display: flex;
width: 12.5rem;
padding: 0.75rem;
flex-direction: column;
align-items: flex-start;
border-radius: 0.5rem;
background: $looks-secondary;
gap: 0.9375rem;
box-sizing: border-box;
}

.label {
align-self: stretch;
color: $ui-white;
text-align: center;
font-family: "Helvetica Neue";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably redundant

font-size: 1rem;
font-style: normal;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: is this needed?

font-weight: 700;
line-height: 1.5rem;
}

.button-row {
font-weight: bolder;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: would it be clearer to use a numeric value here as well?

display: flex;
gap: 0.5rem;
width: 100%;
}

.button-row button {
all: unset;
display: flex;
padding: 0.5rem 1rem;
justify-content: center;
align-items: center;
gap: 0.5rem;
flex: 1;
border-radius: 2.5rem;
background: inherit;
cursor: pointer;
}

.button-row button:focus {
outline: auto;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed?

}

.button-row button span {
color: $ui-white;
font-family: "Helvetica Neue";
font-size: 0.75rem;
font-style: normal;
font-weight: 700;
line-height: 1rem;
}

.button-row button.confirm-button {
background: $ui-white;
}

.button-row button.confirm-button span {
color: $looks-secondary;
}

.button-row button.cancel-button {
border: 0.0625rem solid $ui-white;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
import React, {useRef, useCallback, useEffect} from 'react';
import debounce from 'lodash.debounce';
import PropTypes from 'prop-types';
import ReactModal from 'react-modal';
import {defineMessages, FormattedMessage, useIntl} from 'react-intl';

import Box from '../box/box.jsx';

import arrowLeftIcon from './icon--arrow-left.svg';
import arrowRightIcon from './icon--arrow-right.svg';
import arrowDownIcon from './icon--arrow-down.svg';
import arrowUpIcon from './icon--arrow-up.svg';

import styles from './confirmation-prompt.css';
import useCalculatePopupPosition, {PopupAlign, PopupSide} from '../../hooks/calculatePopupPosition.js';

const messages = defineMessages({
defaultConfirmLabel: {
defaultMessage: 'yes',
description: 'Label for confirm button in confirmation prompt',
id: 'gui.confirmationPrompt.confirm'
},
defaultCancelLabel: {
defaultMessage: 'no',
description: 'Label for cancel button in confirmation prompt',
id: 'gui.confirmationPrompt.cancel'
}
});

const defaultConfig = {
modalWidth: 200,
spaceForArrow: 16,
counterOffset: 7,
arrowLongSide: 29,
arrowShortSide: 13
};

const SIDE_TO_ARROW_ICON = {
[PopupSide.UP]: arrowDownIcon,
[PopupSide.DOWN]: arrowUpIcon,
[PopupSide.LEFT]: arrowRightIcon,
[PopupSide.RIGHT]: arrowLeftIcon
};

const ConfirmationPrompt = ({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we reuse this new ConfirmationPrompt for the DeleteConfirmationPrompt?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we:

  • pass the positioning params (width, arrow sizes, ..) as a configuration object to the ConfirmationPrompt
  • reuse this component for the delete confirmation prompt, since it already contains a less complex version of the logic used here

title,
message,
confirmLabel,
cancelLabel,
onConfirm,
onCancel,
isOpen,
relativeElementRef,
side,
align,
config
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: can we use a more precise name, such as layoutConfig?

}) => {
const intl = useIntl();
const {
modalWidth,
spaceForArrow,
counterOffset,
arrowLongSide,
arrowShortSide
} = {...defaultConfig, ...config};
const arrowIcon = SIDE_TO_ARROW_ICON[side];

const modalRef = useRef(null);
const [modalPositionValues, setModalPositionValues] = React.useState({});
const [arrowHeight, arrowWidth] = (side === PopupSide.LEFT || side === PopupSide.RIGHT) ?
[arrowLongSide, arrowShortSide] : [arrowShortSide, arrowLongSide];

const updatePosition = useCallback(() => {
if (relativeElementRef.current && modalRef.current) {
const pos = useCalculatePopupPosition({
relativeElementRef,
popupRef: modalRef,
side,
align,
popupWidth: modalWidth,
arrowLeftIcon,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: maybe we can just pass an arrowIcons object containing the arrows for different sides.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additionally, if the icons are the same, could we pass a single arrow icon and flip it in the desired direction with css?

arrowRightIcon,
arrowUpIcon,
arrowDownIcon,
spaceForArrow,
counterOffset,
arrowShortSide,
arrowLongSide
});
setModalPositionValues(pos);
}
}, [
relativeElementRef,
side,
align,
modalWidth,
spaceForArrow,
counterOffset,
arrowShortSide,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What did arrowShortSide / arrowLongSide denote?

arrowLongSide
]);

useEffect(() => {
if (!isOpen) return;

const debouncedUpdate = debounce(updatePosition, 50, {leading: true});

debouncedUpdate();

window.addEventListener('resize', debouncedUpdate);
return () => {
window.removeEventListener('resize', debouncedUpdate);
debouncedUpdate.cancel();
};
}, [isOpen, updatePosition]);

const onModalMount = useCallback(el => {
if (!el || !isOpen) return;
modalRef.current = el;

updatePosition();
}, [isOpen, updatePosition]);

return (
isOpen && (
<ReactModal
isOpen
onRequestClose={onCancel}
contentLabel={intl.formatMessage(title)}
style={{
content: {
top: modalPositionValues.top,
left: modalPositionValues.left,
width: modalWidth,
border: 'none',
height: 'fit-content',
backgroundColor: 'transparent',
padding: 0,
margin: 0,
position: 'fixed',
overflowX: 'hidden',
zIndex: 1000
},
overlay: {
position: 'fixed',
top: 0,
left: 0,
right: 0,
bottom: 0,
zIndex: 510,
backgroundColor: 'transparent'
}
}}
>
{arrowIcon && (
<img
src={arrowIcon}
alt=""
aria-hidden="true"
style={{
position: 'fixed',
top: modalPositionValues.arrowTop,
left: modalPositionValues.arrowLeft,
width: arrowWidth,
height: arrowHeight,
zIndex: 1001
}}
/>
)}
<Box
className={styles.modalContainer}
componentRef={onModalMount}
>
<Box className={styles.label}>
{message}
</Box>

<Box className={styles.buttonRow}>
<button
onClick={onCancel}
className={styles.cancelButton}
>
{cancelLabel ?? <FormattedMessage {...messages.defaultCancelLabel} />}
</button>

<button
onClick={onConfirm}
className={styles.confirmButton}
>
{confirmLabel ?? <FormattedMessage {...messages.defaultConfirmLabel} />}
</button>
</Box>
</Box>
</ReactModal>
)
);
};

ConfirmationPrompt.propTypes = {
isOpen: PropTypes.bool.isRequired,
title: PropTypes.string.isRequired,
message: PropTypes.node.isRequired,
confirmLabel: PropTypes.node,
cancelLabel: PropTypes.node,
onConfirm: PropTypes.func.isRequired,
onCancel: PropTypes.func.isRequired,
relativeElementRef: PropTypes.shape({current: PropTypes.instanceOf(Element)}),
side: PropTypes.oneOf(Object.values(PopupSide)).isRequired,
align: PropTypes.oneOf(Object.values(PopupAlign)),
config: PropTypes.shape({
modalWidth: PropTypes.number,
spaceForArrow: PropTypes.number,
counterOffset: PropTypes.number,
arrowLongSide: PropTypes.number,
arrowShortSide: PropTypes.number
})
};

export default ConfirmationPrompt;
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this one bigger than the others? What method did you use for exporting them from Figma?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was some gap on the originally downloaded one. I wonder if it's worth resolving, since it has the same proportions and same length in the end.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading