Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Fix local camera switcher blockage with reactions overlay",
"comment": "fix local tile switcher action",
"packageName": "@azure/communication-react",
"email": "94866715+dmceachernmsft@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Fix local camera switcher blockage with reactions overlay",
"comment": "fix local tile switcher action",
"packageName": "@azure/communication-react",
"email": "94866715+dmceachernmsft@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export const MeetingReactionOverlay = (props: MeetingReactionOverlayProps): JSX.

if (overlayMode === 'grid-tiles') {
return (
<div ref={videoTileRef} style={{ width: '100%', height: '100%' }}>
<div ref={videoTileRef} style={{ width: '100%', height: '100%', pointerEvents: 'none' }}>
<ParticipantVideoTileOverlay
emojiSize={emojiSizePx}
reaction={reaction}
Expand All @@ -122,7 +122,7 @@ export const MeetingReactionOverlay = (props: MeetingReactionOverlayProps): JSX.
);
} else if (props.overlayMode === 'screen-share' || props.overlayMode === 'content-share') {
return (
<div ref={videoTileRef} style={{ width: '100%', height: '100%' }}>
<div ref={videoTileRef} style={{ width: '100%', height: '100%', pointerEvents: 'none' }}>
<RemoteContentShareReactionOverlay
hostDivHeight={divHeight}
hostDivWidth={divWidth}
Expand Down
7 changes: 0 additions & 7 deletions packages/react-components/src/components/VideoTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ import { moreButtonStyles } from './styles/VideoTile.styles';
import { raiseHandContainerStyles } from './styles/VideoTile.styles';
/* @conditional-compile-remove(reaction) */
import { ReactionResources } from '../types/ReactionTypes';
/* @conditional-compile-remove(ppt-live) */
import { pptLiveOverlayStyles } from './styles/VideoGallery.styles';

/**
* Strings of {@link VideoTile} that can be overridden.
Expand Down Expand Up @@ -404,11 +402,6 @@ export const VideoTile = (props: VideoTileProps): JSX.Element => {
/* @conditional-compile-remove(reaction) */
reactionOverlay
}
{
/* @conditional-compile-remove(ppt-live) */
// TODO Can be removed once the overlay mitigation has been implemented at the SDK layer
<Stack className={mergeStyles(videoContainerStyles, pptLiveOverlayStyles)}></Stack>
}
{(canShowLabel || participantStateString) && (
<Stack horizontal className={tileInfoContainerStyle} tokens={tileInfoContainerTokens}>
<Stack horizontal className={tileInfoStyle}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,3 @@ export const localVideoCameraCycleButtonStyles = (theme: Theme, size?: 'small' |
export const localVideoTileContainerStyles: IStackStyles = {
root: { width: '100%', height: '100%' }
};

/**
* @private
*/
//TODO Can be removed once the overlay mitigation has been implemented at the SDK layer
export const pptLiveOverlayStyles: IStackStyles = {
root: {
position: 'absolute',
top: 0,
left: 0,
width: '100%',
height: '100%',
backgroundColor: 'transparent',
pointerEvents: 'none',
zIndex: 0
}
};