Add rid to modal UIKit interactions when room context is available

Co-authored-by: d-gubert <[email protected]>

Author: Copilot

apps/meteor/client/uikit/hooks/useModalContextValue.ts

@@ -22,11 +22,12 @@ type UseModalContextValueParams = {
 			blockId?: string;
 		};
 	}>;
+	rid?: string;
 };
 
 type UseModalContextValueReturn = ContextType<typeof UiKitContext>;
 
-export const useModalContextValue = ({ view, errors, values, updateValues }: UseModalContextValueParams): UseModalContextValueReturn => {
+export const useModalContextValue = ({ view, errors, values, updateValues, rid }: UseModalContextValueParams): UseModalContextValueReturn => {
 	const actionManager = useUiKitActionManager();
 
 	const emitInteraction = useMemo(() => actionManager.emitInteraction.bind(actionManager), [actionManager]);
@@ -51,6 +52,7 @@ export const useModalContextValue = ({ view, errors, values, updateValues }: Use
 					blockId,
 					value,
 				},
+				...(rid && { rid }),
 			});
 		},
 		updateState: ({ actionId, value, /* ,appId, */ blockId = 'default' }) => {

apps/meteor/client/views/modal/uikit/UiKitModal.tsx

@@ -3,13 +3,15 @@ import { UiKitContext } from '@rocket.chat/fuselage-ui-kit';
 import { MarkupInteractionContext } from '@rocket.chat/gazzodown';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import type { FormEvent } from 'react';
+import { useContext } from 'react';
 
 import ModalBlock from './ModalBlock';
 import { detectEmoji } from '../../../lib/utils/detectEmoji';
 import { preventSyntheticEvent } from '../../../lib/utils/preventSyntheticEvent';
 import { useModalContextValue } from '../../../uikit/hooks/useModalContextValue';
 import { useUiKitActionManager } from '../../../uikit/hooks/useUiKitActionManager';
 import { useUiKitView } from '../../../uikit/hooks/useUiKitView';
+import { RoomContext } from '../../room/contexts/RoomContext';
 
 type UiKitModalProps = {
 	key: UiKit.ModalView['id']; // force re-mount when viewId changes
@@ -19,7 +21,8 @@ type UiKitModalProps = {
 const UiKitModal = ({ initialView }: UiKitModalProps) => {
 	const actionManager = useUiKitActionManager();
 	const { view, errors, values, updateValues, state } = useUiKitView(initialView);
-	const contextValue = useModalContextValue({ view, errors, values, updateValues });
+	const rid = useContext(RoomContext)?.rid;
+	const contextValue = useModalContextValue({ view, errors, values, updateValues, rid });
 
 	const handleSubmit = useEffectEvent((e: FormEvent) => {
 		preventSyntheticEvent(e);
@@ -32,6 +35,7 @@ const UiKitModal = ({ initialView }: UiKitModalProps) => {
 				},
 			},
 			viewId: view.id,
+			...(rid && { rid }),
 		});
 	});
 
@@ -47,6 +51,7 @@ const UiKitModal = ({ initialView }: UiKitModalProps) => {
 				},
 				isCleared: false,
 			},
+			...(rid && { rid }),
 		});
 	});
 
@@ -61,6 +66,7 @@ const UiKitModal = ({ initialView }: UiKitModalProps) => {
 				},
 				isCleared: true,
 			},
+			...(rid && { rid }),
 		});
 	});