railbird/react-native-vision-camera
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Simplify cameraId deriving

Browse Source
This commit is contained in:
Marc Rousavy 2021-05-06 16:48:02 +02:00
parent e9ba8aac7b
commit b9d51cd6b4
1 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Camera.tsx
View File

@ -32,13 +32,6 @@ type RefType = React.Component<NativeCameraViewProps> & Readonly<NativeMethods>;
const CameraModule = NativeModules.CameraView; const CameraModule = NativeModules.CameraView;
if (CameraModule == null) console.error("Camera: Native Module 'CameraView' was null! Did you run pod install?"); if (CameraModule == null) console.error("Camera: Native Module 'CameraView' was null! Did you run pod install?");
interface CameraState {
/**
* The actual native ID for the camera device.
*/
cameraId?: string;
}
//#region Camera Component //#region Camera Component
/** /**
* ### A powerful `<Camera>` component. * ### A powerful `<Camera>` component.
@ -69,7 +62,7 @@ interface CameraState {
* *
* @component * @component
*/ */
export class Camera extends React.PureComponent<CameraProps, CameraState> { export class Camera extends React.PureComponent<CameraProps> {
/** /**
* @internal * @internal
*/ */
@ -87,7 +80,6 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
*/ */
constructor(props: CameraProps) { constructor(props: CameraProps) {
super(props); super(props);
this.state = { cameraId: undefined };
this.onInitialized = this.onInitialized.bind(this); this.onInitialized = this.onInitialized.bind(this);
this.onError = this.onError.bind(this); this.onError = this.onError.bind(this);
this.ref = React.createRef<RefType>(); this.ref = React.createRef<RefType>();
@ -338,16 +330,6 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
} }
//#endregion //#endregion
/**
* @internal
*/
static getDerivedStateFromProps(props: CameraProps, state: CameraState): CameraState | null {
const newCameraId = props.device.id;
if (state.cameraId !== newCameraId) return { ...state, cameraId: newCameraId };
return null;
}
/** /**
* @internal * @internal
*/ */
@ -394,19 +376,9 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
* @internal * @internal
*/ */
public render(): React.ReactNode { public render(): React.ReactNode {
if (this.state.cameraId == null) throw new Error('CameraID is null! Did you pass a valid `device`?');
// We remove the big `device` object from the props because we only need to pass `cameraId` to native. // We remove the big `device` object from the props because we only need to pass `cameraId` to native.
const { device: _, frameProcessor: __, ...props } = this.props; const { device, frameProcessor: _, ...props } = this.props;
return <NativeCameraView {...props} cameraId={device.id} ref={this.ref} onInitialized={this.onInitialized} onError={this.onError} />;
return (
<NativeCameraView
{...props}
cameraId={this.state.cameraId}
ref={this.ref}
onInitialized={this.onInitialized}
onError={this.onError}
/>
);
} }
} }
//#endregion //#endregion