aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/webcam
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/webcam')
-rw-r--r--src/client/views/webcam/DashWebRTCVideo.scss9
-rw-r--r--src/client/views/webcam/DashWebRTCVideo.tsx24
2 files changed, 12 insertions, 21 deletions
diff --git a/src/client/views/webcam/DashWebRTCVideo.scss b/src/client/views/webcam/DashWebRTCVideo.scss
index 249aee9d6..5744ebbcd 100644
--- a/src/client/views/webcam/DashWebRTCVideo.scss
+++ b/src/client/views/webcam/DashWebRTCVideo.scss
@@ -1,11 +1,11 @@
-@import "../global/globalCssVariables";
+@import '../global/globalCssVariables.module.scss';
.webcam-cont {
background: whitesmoke;
color: grey;
border-radius: 15px;
box-shadow: #9c9396 0.2vw 0.2vw 0.4vw;
- border: solid #BBBBBBBB 5px;
+ border: solid #bbbbbbbb 5px;
pointer-events: all;
display: flex;
flex-direction: column;
@@ -44,7 +44,7 @@
#roomName {
outline: none;
border-radius: inherit;
- border: 1px solid #BBBBBBBB;
+ border: 1px solid #bbbbbbbb;
margin: 10px;
padding: 10px;
}
@@ -79,5 +79,4 @@
margin: 5px;
border: 1px solid black;
}
-
-} \ No newline at end of file
+}
diff --git a/src/client/views/webcam/DashWebRTCVideo.tsx b/src/client/views/webcam/DashWebRTCVideo.tsx
index 524492226..4e984f3d6 100644
--- a/src/client/views/webcam/DashWebRTCVideo.tsx
+++ b/src/client/views/webcam/DashWebRTCVideo.tsx
@@ -3,28 +3,25 @@ import { faPhoneSlash, faSync } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { action, observable } from 'mobx';
import { observer } from 'mobx-react';
+import * as React from 'react';
import { Doc } from '../../../fields/Doc';
import { InkTool } from '../../../fields/InkField';
+import { SnappingManager } from '../../util/SnappingManager';
import '../../views/nodes/WebBox.scss';
-import { CollectionFreeFormDocumentViewProps } from '../nodes/CollectionFreeFormDocumentView';
-import { DocumentView } from '../nodes/DocumentView';
import { FieldView, FieldViewProps } from '../nodes/FieldView';
import './DashWebRTCVideo.scss';
import { hangup, initialize, refreshVideos } from './WebCamLogic';
-import React = require('react');
/**
* This models the component that will be rendered, that can be used as a doc that will reflect the video cams.
*/
@observer
-export class DashWebRTCVideo extends React.Component<CollectionFreeFormDocumentViewProps & FieldViewProps> {
+export class DashWebRTCVideo extends React.Component<FieldViewProps> {
private roomText: HTMLInputElement | undefined;
@observable remoteVideoAdded: boolean = false;
@action
- changeUILook = () => {
- this.remoteVideoAdded = true;
- };
+ changeUILook = () => (this.remoteVideoAdded = true);
/**
* Function that submits the title entered by user on enter press.
@@ -42,14 +39,9 @@ export class DashWebRTCVideo extends React.Component<CollectionFreeFormDocumentV
return FieldView.LayoutString(DashWebRTCVideo, fieldKey);
}
- @action
- onClickRefresh = () => {
- refreshVideos();
- };
+ onClickRefresh = () => refreshVideos();
- onClickHangUp = () => {
- hangup();
- };
+ onClickHangUp = () => hangup();
render() {
const content = (
@@ -71,8 +63,8 @@ export class DashWebRTCVideo extends React.Component<CollectionFreeFormDocumentV
</div>
);
- const frozen = !this.props.isSelected() || DocumentView.Interacting;
- const classname = 'webBox-cont' + (this.props.isSelected() && Doc.ActiveTool === InkTool.None && !DocumentView.Interacting ? '-interactive' : '');
+ const frozen = !this.props.isSelected() || SnappingManager.IsResizing;
+ const classname = 'webBox-cont' + (this.props.isSelected() && Doc.ActiveTool === InkTool.None && !SnappingManager.IsResizing ? '-interactive' : '');
return (
<>