Skip to content

Commit

Permalink
Rewrite favourite modal as a Typescript functional component, use rev…
Browse files Browse the repository at this point in the history
…amped design (glitch-soc#2831)
  • Loading branch information
ClearlyClaire authored Aug 31, 2024
1 parent a859b0c commit b06907e
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 94 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
import { useCallback } from 'react';

import { defineMessages, FormattedMessage, useIntl } from 'react-intl';

import classNames from 'classnames';

import StarIcon from '@/material-icons/400-24px/star.svg?react';
import { Button } from 'flavours/glitch/components/button';
import { Icon } from 'flavours/glitch/components/icon';
import { EmbeddedStatus } from 'flavours/glitch/features/notifications_v2/components/embedded_status';
import type { Status } from 'flavours/glitch/models/status';

const messages = defineMessages({
favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
});

export const FavouriteModal: React.FC<{
status: Status;
onClose: () => void;
onFavourite: (status: Status) => void;
}> = ({ status, onFavourite, onClose }) => {
const intl = useIntl();

const statusId = status.get('id') as string;

const handleFavourite = useCallback(() => {
onFavourite(status);
onClose();
}, [onClose, onFavourite, status]);

const handleCancel = useCallback(() => {
onClose();
}, [onClose]);

return (
<div className='modal-root__modal safety-action-modal'>
<div className='safety-action-modal__top'>
<div className='safety-action-modal__header'>
<div className='safety-action-modal__header__icon'>
<Icon icon={StarIcon} id='star' />
</div>

<div>
<h1>
<FormattedMessage
id='favourite_modal.favourite'
defaultMessage='Favourite post?'
/>
</h1>
<div>
<FormattedMessage
id='boost_modal.combo'
defaultMessage='You can press {combo} to skip this next time'
values={{
combo: (
<span className='hotkey-combination'>
<kbd>Shift</kbd>+<Icon id='star' icon={StarIcon} />
</span>
),
}}
/>
</div>
</div>
</div>

<div className='safety-action-modal__status'>
<EmbeddedStatus statusId={statusId} />
</div>
</div>

<div className={classNames('safety-action-modal__bottom')}>
<div className='safety-action-modal__actions'>
<div className='spacer' />

<button onClick={handleCancel} className='link-button'>
<FormattedMessage
id='confirmation_modal.cancel'
defaultMessage='Cancel'
/>
</button>

<Button
onClick={handleFavourite}
text={intl.formatMessage(messages.favourite)}
/>
</div>
</div>
</div>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {
} from './confirmation_modals';
import DeprecatedSettingsModal from './deprecated_settings_modal';
import DoodleModal from './doodle_modal';
import FavouriteModal from './favourite_modal';
import { FavouriteModal } from './favourite_modal';
import FocalPointModal from './focal_point_modal';
import ImageModal from './image_modal';
import MediaModal from './media_modal';
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/flavours/glitch/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"confirmations.missing_media_description.message": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
"direct.group_by_conversations": "Group by conversation",
"endorsed_accounts_editor.endorsed_accounts": "Featured accounts",
"favourite_modal.combo": "You can press {combo} to skip this next time",
"favourite_modal.favourite": "Favourite post?",
"federation.federated.long": "Allow this post to reach other servers",
"federation.federated.short": "Federated",
"federation.local_only.long": "Prevent this post from reaching other servers",
Expand Down

0 comments on commit b06907e

Please sign in to comment.