From cdfa38ad855fc9f9b0602fa99c6f1b7d546e30fe Mon Sep 17 00:00:00 2001 From: Scroody Date: Tue, 9 May 2023 15:51:35 -0300 Subject: [PATCH] Change of approach --- .../imports/ui/components/whiteboard/container.jsx | 3 ++- .../imports/ui/components/whiteboard/service.js | 3 +-- .../imports/ui/components/whiteboard/styles.js | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx index 6bf88bac45..2e07f0ade3 100644 --- a/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx @@ -50,7 +50,8 @@ const WhiteboardContainer = (props) => { const hasShapeAccess = (id) => { const owner = shapes[id]?.userId; const isBackgroundShape = id?.includes('slide-background'); - const hasAccess = !isBackgroundShape + const isPollsResult = shapes[id]?.name?.includes('poll-result'); + const hasAccess = !isBackgroundShape && !isPollsResult && ((owner && owner === currentUser?.userId) || !owner || isPresenter || isModerator); return hasAccess; }; diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/service.js index 4f70c0719b..65b5d2922d 100755 --- a/bigbluebutton-html5/imports/ui/components/whiteboard/service.js +++ b/bigbluebutton-html5/imports/ui/components/whiteboard/service.js @@ -315,9 +315,8 @@ const getShapes = (whiteboardId, curPageId, intl) => { const textSize = getTextSize(pollResult, style, padding = 20); modAnnotation.annotationInfo = { - isLocked: true, childIndex: 0, - id: `poll-result-${annotation.annotationInfo.id}`, + id: annotation.annotationInfo.id, name: `poll-result-${annotation.annotationInfo.id}`, type: 'rectangle', label: pollResult, diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js index 978c2f3466..d454a91c63 100644 --- a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js +++ b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js @@ -7,10 +7,6 @@ import { import Button from '/imports/ui/components/common/button/component'; const TldrawGlobalStyle = createGlobalStyle` - div[id^="poll-result-"] * { - pointer-events: none; - user-select: none; - } ${({ hideContextMenu }) => hideContextMenu && ` #TD-ContextMenu { display: none;