Skip to content

Commit 60ad522

Browse files
authored
Merge pull request #376 from qa-guru/QAGDEV-721
QAGDEV-721 - Удаление файла и возвращение его через command+Z / cntrl+Z
2 parents 646f743 + ef8d3e5 commit 60ad522

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

src/features/edit-training/views/edit-lecture/edit-lecture.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,11 @@ const EditLecture: FC<IEditLecture> = ({
212212
})();
213213
};
214214
const handleDeleteLectureFile = (fileId: string) => {
215-
setDeletedLectureFileIds((prev) => [...prev, fileId]);
215+
setDeletedLectureFileIds((prev) => Array.from(new Set([...prev, fileId])));
216216
};
217217

218218
const handleDeleteHomeworkFile = (fileId: string) => {
219-
setDeletedHomeworkFileIds((prev) => [...prev, fileId]);
219+
setDeletedHomeworkFileIds((prev) => Array.from(new Set([...prev, fileId])));
220220
};
221221

222222
return (

src/shared/features/send-comment/view/send-comment.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ const SendComment: FC<ISendComment> = (props) => {
127127
prev.filter((pending) => pending.localUrl !== fileId)
128128
);
129129
} else {
130-
setDeletedFileIds((prev) => [...prev, fileId]);
130+
setDeletedFileIds((prev) => Array.from(new Set([...prev, fileId])));
131131
}
132132
};
133133

src/shared/features/send-homework/view/send-homework.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ const SendHomework: FC<ISendHomeWork> = (props) => {
134134
prev.filter((pending) => pending.localUrl !== fileId)
135135
);
136136
} else {
137-
setDeletedFileIds((prev) => [...prev, fileId]);
137+
setDeletedFileIds((prev) => Array.from(new Set([...prev, fileId])));
138138
}
139139
};
140140

src/shared/hooks/use-rich-text-file-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export function useRichTextFileManager({
8282
if (fileId.startsWith("blob:")) {
8383
setPendingFiles((prev) => prev.filter((f) => f.localUrl !== fileId));
8484
} else {
85-
setDeletedFileIds((prev) => [...prev, fileId]);
85+
setDeletedFileIds((prev) => Array.from(new Set([...prev, fileId])));
8686
}
8787
};
8888

src/shared/lib/mui-tiptap/extensions/file-node-view.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@ export default function FileNodeView({ node, deleteNode }: any) {
1414
const theme = useTheme();
1515

1616
return (
17-
<NodeViewWrapper as="div">
17+
<NodeViewWrapper
18+
as="span"
19+
style={{
20+
display: "inline-block",
21+
verticalAlign: "bottom",
22+
maxWidth: "100%",
23+
margin: 0,
24+
}}
25+
>
1826
<Paper
1927
elevation={1}
2028
sx={{
@@ -25,11 +33,13 @@ export default function FileNodeView({ node, deleteNode }: any) {
2533
borderRadius: 2,
2634
px: 2,
2735
py: 1,
28-
maxWidth: 340,
36+
maxWidth: "100%",
2937
boxShadow:
3038
theme.palette.mode === "dark"
3139
? "0 1px 3px rgba(0,0,0,0.6)"
3240
: "0 1px 2px rgba(0,0,0,0.1)",
41+
verticalAlign: "bottom",
42+
margin: 0,
3343
}}
3444
>
3545
<Tooltip title="Скачать">
@@ -54,6 +64,7 @@ export default function FileNodeView({ node, deleteNode }: any) {
5464
flex: 1,
5565
fontWeight: 500,
5666
fontSize: 14,
67+
minWidth: 0,
5768
}}
5869
title={fileName}
5970
>

0 commit comments

Comments
 (0)