diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx index caf4c2294bd64649461d6280b7c135b20d2b38e5..adfa6fe3808fd172d15fc36c94206e5bfa9842e6 100755 --- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx @@ -13,7 +13,8 @@ export default withTracker((props) => { const handleToggleFullscreen = () => toggleFullScreen(); const BROWSER_RESULTS = browser(); const isSafari = BROWSER_RESULTS.name === 'safari'; - const noIOSFullscreen = isSafari && BROWSER_RESULTS.versionNumber < 12; + const isIphone = navigator.userAgent.match(/iPhone/i); + const noIOSFullscreen = (isSafari && BROWSER_RESULTS.versionNumber < 12) || isIphone; return { amIModerator: props.amIModerator, handleToggleFullscreen, diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx index 70b0e72fe5176c4edd74b398f774373683f75fdf..b4676487c64b916ef1cce02112967504bb25950b 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx @@ -36,7 +36,10 @@ const FullscreenButtonComponent = ({ className, fullscreenRef, handleToggleFullScreen, + isIphone, }) => { + if (isIphone) return null; + const formattedLabel = intl.formatMessage( intlMessages.fullscreenButton, ({ 0: elementName || '' }), diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/container.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/container.jsx index 59a28cc5f0be41aacf7bc215068acb1615af13e5..368ff191f5166099f480d20edce0a3506a09a4f9 100644 --- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/container.jsx @@ -6,7 +6,8 @@ const FullscreenButtonContainer = props => <FullscreenButtonComponent {...props} export default (props) => { const handleToggleFullScreen = ref => toggleFullScreen(ref); + const isIphone = navigator.userAgent.match(/iPhone/i); return ( - <FullscreenButtonContainer {...props} {...{ handleToggleFullScreen }} /> + <FullscreenButtonContainer {...props} {...{ handleToggleFullScreen, isIphone }} /> ); };