mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Added story preview and confirmation dialogs to send story

Browse source
This commit is contained in:
Alvaro 2022-10-12 10:14:35 -06:00 • committed by GitHub
parent e80d9d1f30
commit 820eaa50ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 315 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

53
ts/components/StoriesSettingsModal.tsx
View file

@ -35,6 +35,7 @@ import {
shouldNeverBeCalled,
asyncShouldNeverBeCalled,
} from '../util/shouldNeverBeCalled';
import { useConfirmDiscard } from '../hooks/useConfirmDiscard';
export type PropsType = {
candidateConversations: Array<ConversationType>;
@ -103,6 +104,8 @@ export const StoriesSettingsModal = ({
setMyStoriesToAllSignalConnections,
toggleSignalConnectionsModal,
}: PropsType): JSX.Element => {
const [confirmDiscardModal, confirmDiscardIf] = useConfirmDiscard(i18n);
const [listToEditId, setListToEditId] = useState<string | undefined>(
undefined
);
@ -144,17 +147,19 @@ export const StoriesSettingsModal = ({
onDistributionListCreated(name, uuids);
resetChooseViewersScreen();
}}
onBackButtonClick={() => {
if (page === Page.HideStoryFrom) {
resetChooseViewersScreen();
} else if (page === Page.NameStory) {
setPage(Page.ChooseViewers);
} else if (isChoosingViewers) {
resetChooseViewersScreen();
} else if (listToEdit) {
setListToEditId(undefined);
}
}}
onBackButtonClick={() =>
confirmDiscardIf(selectedContacts.length > 0, () => {
if (page === Page.HideStoryFrom) {
resetChooseViewersScreen();
} else if (page === Page.NameStory) {
setPage(Page.ChooseViewers);
} else if (isChoosingViewers) {
resetChooseViewersScreen();
} else if (listToEdit) {
setListToEditId(undefined);
}
})
}
onViewersUpdated={uuids => {
if (listToEditId && page === Page.AddViewer) {
onViewersUpdated(listToEditId, uuids);
@ -175,7 +180,7 @@ export const StoriesSettingsModal = ({
/>
);
} else if (listToEdit) {
modal = onClose => (
modal = handleClose => (
<DistributionListSettingsModal
key="settings-modal"
getPreferredBadge={getPreferredBadge}
@ -189,7 +194,7 @@ export const StoriesSettingsModal = ({
setSelectedContacts={setSelectedContacts}
toggleSignalConnectionsModal={toggleSignalConnectionsModal}
onBackButtonClick={() => setListToEditId(undefined)}
onClose={onClose}
onClose={handleClose}
/>
);
} else {
@ -281,13 +286,17 @@ export const StoriesSettingsModal = ({
return (
<>
<PagedModal
modalName="StoriesSettingsModal"
theme={Theme.Dark}
onClose={hideStoriesSettings}
>
{modal}
</PagedModal>
{!confirmDiscardModal && (
<PagedModal
modalName="StoriesSettingsModal"
theme={Theme.Dark}
onClose={() =>
confirmDiscardIf(selectedContacts.length > 0, hideStoriesSettings)
}
>
{modal}
</PagedModal>
)}
{confirmDeleteListId && (
<ConfirmationDialog
dialogName="StoriesSettings.deleteList"
@ -309,6 +318,7 @@ export const StoriesSettingsModal = ({
{i18n('StoriesSettings__delete-list--confirm')}
</ConfirmationDialog>
)}
{confirmDiscardModal}
</>
);
};
@ -396,7 +406,7 @@ export const DistributionListSettingsModal = ({
{isMyStories && (
<EditMyStoriesPrivacy
i18n={i18n}
learnMore="StoriesSettings__mine_disclaimer"
learnMore="StoriesSettings__mine__disclaimer"
myStories={listToEdit}
onClickExclude={() => {
setPage(Page.HideStoryFrom);
@ -862,6 +872,7 @@ export const EditDistributionListModal = ({
}}
value={searchTerm}
/>
{selectedContacts.length ? (
<ContactPills moduleClassName="StoriesSettingsModal__tags">
{selectedContacts.map(contact => (