feat(filmstrip/toolbox) mobile ui undo changes

react/features/filmstrip/components/native/Filmstrip.js

@@ -1,15 +1,13 @@
 // @flow
 
 import React, { PureComponent } from 'react';
-import { FlatList } from 'react-native';
+import { FlatList, SafeAreaView } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
 
 import { getLocalParticipant } from '../../../base/participants';
 import { Platform } from '../../../base/react';
 import { connect } from '../../../base/redux';
 import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
 import { shouldHideSelfView } from '../../../base/settings/functions.any';
-import { isToolboxVisible } from '../../../toolbox/functions';
 import { setVisibleRemoteParticipants } from '../../actions';
 import { isFilmstripVisible, shouldRemoteVideosBeVisible } from '../../functions';
 
@@ -39,11 +37,6 @@ type Props = {
      */
     _disableSelfView: boolean,
 
-    /**
-     * Whether or not the toolbox is displayed.
-     */
-    _isToolboxVisible: Boolean,
-
     _localParticipantId: string,
 
     /**
@@ -233,7 +226,6 @@ class Filmstrip extends PureComponent<Props> {
         const {
             _aspectRatio,
             _disableSelfView,
-            _isToolboxVisible,
             _localParticipantId,
             _participants,
             _visible
@@ -262,14 +254,7 @@ class Filmstrip extends PureComponent<Props> {
         }
 
         return (
-            <SafeAreaView
+            <SafeAreaView style = { filmstripStyle }>
-                edges = { [
-                    !_isToolboxVisible && 'bottom',
-                    'top',
-                    'left',
-                    'right'
-                ].filter(Boolean) }
-                style = { filmstripStyle }>
                 {
                     this._separateLocalThumbnail
                         && !isNarrowAspectRatio
@@ -320,7 +305,6 @@ function _mapStateToProps(state) {
         _clientHeight: responsiveUI.clientHeight,
         _clientWidth: responsiveUI.clientWidth,
         _disableSelfView: disableSelfView,
-        _isToolboxVisible: isToolboxVisible(state),
         _localParticipantId: getLocalParticipant(state)?.id,
         _participants: showRemoteVideos ? remoteParticipants : NO_REMOTE_VIDEOS,
         _visible: enabled && isFilmstripVisible(state)

react/features/toolbox/components/native/styles.js

@@ -98,12 +98,7 @@ const styles = {
         backgroundColor: BaseTheme.palette.uiBackground,
         flexDirection: 'column',
         flexGrow: 0,
-        height: '100%',
         width: '100%',
-
-        // TODO revisit this
-
-        maxHeight: 76,
         maxWidth: 580,
         marginLeft: 'auto',
         marginRight: 'auto'