fix: visualization by message doesn't work on shared folder

refs: IRIS-4479
zextras · Jul 4, 2023 · d30901d · d30901d
1 parent db4eb1e
commit d30901d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/views/app/folder-panel/messages/message-list-component.tsx b/src/views/app/folder-panel/messages/message-list-component.tsx
@@ -26,7 +26,8 @@ const DragImageContainer = styled.div`
 const DragItems: FC<{
 	messages: IncompleteMessage[];
 	draggedIds: Record<string, boolean>;
-}> = ({ messages, draggedIds }) => {
+	folderId: string;
+}> = ({ messages, draggedIds, folderId }) => {
 	const items = reduce<typeof draggedIds, MessageListItemProps['item'][]>(
 		draggedIds,
 		(acc, v, k) => {
@@ -51,6 +52,7 @@ const DragItems: FC<{
 					selecting={false}
 					visible={false}
 					deselectAll={noop}
+					currentFolderId={folderId}
 				/>
 			))}
 		</>
@@ -194,7 +196,7 @@ export const MessageListComponent: FC<MessageListComponentProps> = memo(
 							</Container>
 						)}
 						<DragImageContainer ref={dragImageRef}>
-							<DragItems messages={messages} draggedIds={draggedIds ?? {}} />
+							<DragItems messages={messages} draggedIds={draggedIds ?? {}} folderId={folderId} />
 						</DragImageContainer>
 					</>
 				) : (

diff --git a/src/views/app/folder-panel/messages/message-list-item-component.tsx b/src/views/app/folder-panel/messages/message-list-item-component.tsx
@@ -22,6 +22,7 @@ export type ListItemComponentProps = {
 	deselectAll: () => void;
 	visible: boolean;
 	setDraggedIds?: (ids: Record<string, boolean>) => void;
+	currentFolderId?: string;
 };
 
 export const MessageListItemComponent: FC<ListItemComponentProps> = memo(
@@ -36,7 +37,8 @@ export const MessageListItemComponent: FC<ListItemComponentProps> = memo(
 		isSearchModule,
 		deselectAll,
 		visible,
-		setDraggedIds = noop
+		setDraggedIds = noop,
+		currentFolderId
 	}) {
 		return (
 			<DragItemWrapper
@@ -57,6 +59,7 @@ export const MessageListItemComponent: FC<ListItemComponentProps> = memo(
 					visible={visible}
 					isSearchModule={isSearchModule}
 					deselectAll={deselectAll}
+					currentFolderId={currentFolderId}
 				/>
 			</DragItemWrapper>
 		);

diff --git a/src/views/app/folder-panel/messages/message-list-item.tsx b/src/views/app/folder-panel/messages/message-list-item.tsx
@@ -49,6 +49,7 @@ export const MessageListItem: FC<MessageListItemProps> = memo(function MessageLi
 	currentFolderId
 }) {
 	const firstChildFolderId = currentFolderId ?? item.parent;
+
 	const dispatch = useAppDispatch();
 	const zimbraPrefMarkMsgRead = useUserSettings()?.prefs?.zimbraPrefMarkMsgRead !== '-1';
 

diff --git a/src/views/app/folder-panel/messages/message-list.tsx b/src/views/app/folder-panel/messages/message-list.tsx
@@ -113,6 +113,7 @@ export const MessageList: FC = () => {
 									deselectAll={deselectAll}
 									visible={visible}
 									setDraggedIds={setDraggedIds}
+									currentFolderId={folderId}
 								/>
 							) : (
 								<div style={{ height: '4rem' }} />
@@ -121,7 +122,7 @@ export const MessageList: FC = () => {
 					</CustomListItem>
 				);
 			}),
-		[deselectAll, draggedIds, isSelectModeOn, itemId, messages, selected, toggle]
+		[deselectAll, draggedIds, isSelectModeOn, itemId, messages, selected, toggle, folderId]
 	);
 
 	const totalMessages = useMemo(