From e11ceb9d20fa5e680a0247f6ca7c27825daea6c5 Mon Sep 17 00:00:00 2001 From: arul-trenser Date: Fri, 3 Jan 2025 21:27:17 +0530 Subject: [PATCH] fix(context menu): restrict the context menu accessibility for locked and hidden annotations (#4625) Co-authored-by: Ibrahim <93064150+IbrahimCSAE@users.noreply.github.com> --- .../ContextMenuController.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx b/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx index 2e7af439c..532330804 100644 --- a/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx +++ b/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx @@ -48,15 +48,13 @@ export default class ContextMenuController { const { event, subMenu, menuId, menus, selectorProps } = contextMenuProps; - const annotationManager = CsAnnotation.state.getAnnotationManager(); - const { locking } = CsAnnotation; + const { locking, visibility } = CsAnnotation; const targetAnnotationId = selectorProps?.nearbyToolData?.annotationUID as string; - const isLocked = locking.isAnnotationLocked( - annotationManager.getAnnotation(targetAnnotationId) - ); + const isLocked = locking.isAnnotationLocked(targetAnnotationId); + const isVisible = visibility.isAnnotationVisible(targetAnnotationId); - if (isLocked) { - console.warn('Annotation is locked.'); + if (isLocked || !isVisible) { + console.warn(`Annotation is ${isLocked ? 'locked' : 'not visible'}.`); return; }