Skip to content

Use createRef #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CodingByJerez wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use createRef #302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions src/react-webcam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,13 @@ export default class Webcam extends React.Component<WebcamProps, WebcamState> {

private unmounted = false;

stream: MediaStream | null;
public stream: MediaStream | null = null;

video: HTMLVideoElement | null;
public readonly videoRef: React.RefObject<HTMLVideoElement>;

constructor(props: WebcamProps) {
super(props);
this.videoRef = React.createRef();
this.state = {
hasUserMedia: false
};
Expand Down Expand Up @@ -193,19 +194,19 @@ export default class Webcam extends React.Component<WebcamProps, WebcamState> {
getCanvas(screenshotDimensions?: ScreenshotDimensions) {
const { state, props } = this;

if (!this.video) {
if (!this.videoRef.current) {
return null;
}

if (!state.hasUserMedia || !this.video.videoHeight) return null;
if (!state.hasUserMedia || !this.videoRef.current.videoHeight) return null;

if (!this.ctx) {
let canvasWidth = this.video.videoWidth;
let canvasHeight = this.video.videoHeight;
let canvasWidth = this.videoRef.current.videoWidth;
let canvasHeight = this.videoRef.current.videoHeight;
if (!this.props.forceScreenshotSourceSize) {
const aspectRatio = canvasWidth / canvasHeight;

canvasWidth = props.minScreenshotWidth || this.video.clientWidth;
canvasWidth = props.minScreenshotWidth || this.videoRef.current.clientWidth;
canvasHeight = canvasWidth / aspectRatio;

if (
Expand Down Expand Up @@ -233,7 +234,7 @@ export default class Webcam extends React.Component<WebcamProps, WebcamState> {
}

ctx.imageSmoothingEnabled = props.imageSmoothing;
ctx.drawImage(this.video, 0, 0, screenshotDimensions?.width || canvas.width, screenshotDimensions?.height || canvas.height);
ctx.drawImage(this.videoRef.current, 0, 0, screenshotDimensions?.width || canvas.width, screenshotDimensions?.height || canvas.height);

// invert mirroring
if (props.mirrored) {
Expand Down Expand Up @@ -342,8 +343,8 @@ export default class Webcam extends React.Component<WebcamProps, WebcamState> {
this.stream = stream;

try {
if (this.video) {
this.video.srcObject = stream;
if (this.videoRef.current) {
this.videoRef.current.srcObject = stream;
}
this.setState({ hasUserMedia: true });
} catch (error) {
Expand Down Expand Up @@ -384,9 +385,7 @@ export default class Webcam extends React.Component<WebcamProps, WebcamState> {
src={state.src}
muted={audio}
playsInline
ref={ref => {
this.video = ref;
}}
ref={this.videoRef}
style={videoStyle}
{...rest}
/>
Expand Down