+ {suffixType === 'image' ? (
+ 
+ ) : suffixType === 'video' || suffixType === 'gifv' ? (
+
+ ) : suffixType === 'audio' ? (
+
+ ) : null}
+
+ {descTextarea}
+ @${encodeHTML(acct)} - -
@@ -463,21 +365,21 @@ function Compose({
disabled={uiState === 'loading'}
onClick={() => {
// If there are non-ID media attachments (not yet uploaded), show confirmation dialog because they are not going to be passed to the new window
- const containNonIDMediaAttachments =
- mediaAttachments.length > 0 &&
- mediaAttachments.some((media) => !media.id);
- if (containNonIDMediaAttachments) {
- const yes = confirm(
- 'You have media attachments that are not yet uploaded. Opening a new window will discard them and you will need to re-attach them. Are you sure you want to continue?',
- );
- if (!yes) {
- return;
- }
- }
+ // const containNonIDMediaAttachments =
+ // mediaAttachments.length > 0 &&
+ // mediaAttachments.some((media) => !media.id);
+ // if (containNonIDMediaAttachments) {
+ // const yes = confirm(
+ // 'You have media attachments that are not yet uploaded. Opening a new window will discard them and you will need to re-attach them. Are you sure you want to continue?',
+ // );
+ // if (!yes) {
+ // return;
+ // }
+ // }
- const mediaAttachmentsWithIDs = mediaAttachments.filter(
- (media) => media.id,
- );
+ // const mediaAttachmentsWithIDs = mediaAttachments.filter(
+ // (media) => media.id,
+ // );
const newWin = openCompose({
editStatus,
@@ -489,7 +391,7 @@ function Compose({
language,
sensitive,
poll,
- mediaAttachments: mediaAttachmentsWithIDs,
+ mediaAttachments,
},
});
@@ -524,17 +426,17 @@ function Compose({
disabled={uiState === 'loading'}
onClick={() => {
// If there are non-ID media attachments (not yet uploaded), show confirmation dialog because they are not going to be passed to the new window
- const containNonIDMediaAttachments =
- mediaAttachments.length > 0 &&
- mediaAttachments.some((media) => !media.id);
- if (containNonIDMediaAttachments) {
- const yes = confirm(
- 'You have media attachments that are not yet uploaded. Opening a new window will discard them and you will need to re-attach them. Are you sure you want to continue?',
- );
- if (!yes) {
- return;
- }
- }
+ // const containNonIDMediaAttachments =
+ // mediaAttachments.length > 0 &&
+ // mediaAttachments.some((media) => !media.id);
+ // if (containNonIDMediaAttachments) {
+ // const yes = confirm(
+ // 'You have media attachments that are not yet uploaded. Opening a new window will discard them and you will need to re-attach them. Are you sure you want to continue?',
+ // );
+ // if (!yes) {
+ // return;
+ // }
+ // }
if (!window.opener) {
alert('Looks like you closed the parent window.');
@@ -548,13 +450,13 @@ function Compose({
if (!yes) return;
}
- const mediaAttachmentsWithIDs = mediaAttachments.filter(
- (media) => media.id,
- );
+ // const mediaAttachmentsWithIDs = mediaAttachments.filter(
+ // (media) => media.id,
+ // );
onClose({
fn: () => {
- window.opener.__STATES__.showCompose = {
+ const passData = {
editStatus,
replyToStatus,
draftStatus: {
@@ -564,9 +466,11 @@ function Compose({
language,
sensitive,
poll,
- mediaAttachments: mediaAttachmentsWithIDs,
+ mediaAttachments,
},
};
+ window.opener.__COMPOSE__ = passData;
+ window.opener.__STATES__.showCompose = true;
},
});
}}
@@ -766,7 +670,7 @@ function Compose({
name="sensitive"
type="checkbox"
checked={sensitive}
- disabled={uiState === 'loading' || !!editStatus}
+ disabled={uiState === 'loading'}
onChange={(e) => {
const sensitive = e.target.checked;
setSensitive(sensitive);
@@ -803,41 +707,22 @@ function Compose({
{' '}
-
-
+ );
+
+ return (
+ <>
+
+ {showModal && (
+
+
- {
+ setShowModal(true);
+ }}
>
-
+ {descTextarea}
+
+
+
+
+
+
+
+
+ + { + { + image: 'Edit image description', + video: 'Edit video description', + audio: 'Edit audio description', + }[suffixType] + } +
+
-
- ) : (
- !!inReplyToAccount &&
- !mentions.find((mention) => {
- return mention.id === inReplyToAccountId;
- }) && (
-