Handle screen permissions error to hide component (#338)

* Handle screen permissions error to hide component * Renaming
mattermost · Feb 17, 2023 · 549c5fe · 549c5fe
1 parent 3884a9f
commit 549c5fe
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/webapp/src/components/screen_source_modal/component.tsx b/webapp/src/components/screen_source_modal/component.tsx
@@ -167,14 +167,14 @@ export default class ScreenSourceModal extends React.PureComponent<Props, State>
         document.addEventListener('keyup', this.keyboardClose, true);
         document.addEventListener('click', this.closeOnBlur, true);
 
-        window.addEventListener('message', this.handleDesktopCapturerMessage);
+        window.addEventListener('message', this.handleDesktopEvents);
     }
 
     componentWillUnmount() {
         document.removeEventListener('keyup', this.keyboardClose, true);
         document.removeEventListener('click', this.closeOnBlur, true);
 
-        window.removeEventListener('message', this.handleDesktopCapturerMessage);
+        window.removeEventListener('message', this.handleDesktopEvents);
     }
 
     componentDidUpdate(prevProps: Props) {
@@ -190,20 +190,20 @@ export default class ScreenSourceModal extends React.PureComponent<Props, State>
         }
     }
 
-    handleDesktopCapturerMessage = (event: MessageEvent) => {
-        if (event.origin !== window.origin) {
+    handleDesktopEvents = (ev: MessageEvent) => {
+        if (ev.origin !== window.origin) {
             return;
         }
 
-        if (event.data.type !== 'desktop-sources-result') {
-            return;
+        if (ev.data.type === 'desktop-sources-result') {
+            const sources = ev.data.message;
+            this.setState({
+                sources,
+                selected: sources[0]?.id || '',
+            });
+        } else if (ev.data.type === 'calls-error' && ev.data.message.err === 'screen-permissions') {
+            this.props.hideScreenSourceModal();
         }
-
-        const sources = event.data.message;
-        this.setState({
-            sources,
-            selected: sources[0]?.id || '',
-        });
     };
 
     render() {