diff --git a/react/features/base/ui/components/web/Dialog.tsx b/react/features/base/ui/components/web/Dialog.tsx index eaeaffed7..85879c349 100644 --- a/react/features/base/ui/components/web/Dialog.tsx +++ b/react/features/base/ui/components/web/Dialog.tsx @@ -27,6 +27,7 @@ const useStyles = makeStyles()(theme => { display: 'flex', justifyContent: 'center', alignItems: 'flex-start', + zIndex: 301, animation: `${keyframes` 0% { opacity: 0.4; diff --git a/react/features/base/ui/components/web/DialogContainer.tsx b/react/features/base/ui/components/web/DialogContainer.tsx index fc1b32c12..03ef12cda 100644 --- a/react/features/base/ui/components/web/DialogContainer.tsx +++ b/react/features/base/ui/components/web/DialogContainer.tsx @@ -3,6 +3,10 @@ import React, { Component, ComponentType } from 'react'; import { IReduxState } from '../../../../app/types'; import { IReactionEmojiProps } from '../../../../reactions/constants'; +// eslint-disable-next-line lines-around-comment +// @ts-ignore +import { JitsiPortal } from '../../../../toolbox/components/web'; +import { showOverflowDrawer } from '../../../../toolbox/functions.web'; import { connect } from '../../../redux/functions'; import DialogTransition from './DialogTransition'; @@ -24,6 +28,11 @@ interface IProps { */ _isNewDialog: boolean; + /** + * Whether the overflow drawer should be used. + */ + _overflowDrawer: boolean; + /** * Array of reactions to be displayed. */ @@ -69,7 +78,9 @@ class DialogContainer extends Component { render() { return this.props._isNewDialog ? ( - {this._renderDialogContent()} + {this.props._overflowDrawer + ? {this._renderDialogContent()} + : this._renderDialogContent() } ) : ( @@ -90,11 +101,13 @@ class DialogContainer extends Component { function mapStateToProps(state: IReduxState) { const stateFeaturesBaseDialog = state['features/base/dialog']; const { reducedUI } = state['features/base/responsive-ui']; + const overflowDrawer = showOverflowDrawer(state); return { _component: stateFeaturesBaseDialog.component, _componentProps: stateFeaturesBaseDialog.componentProps, _isNewDialog: stateFeaturesBaseDialog.isNewDialog, + _overflowDrawer: overflowDrawer, _reducedUI: reducedUI }; }