Skip to content

fix: stop mutating props in Camera render, restoring lost defaults #820

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
ZayanKhan-12 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: stop mutating props in Camera render, restoring lost defaults #820

Show file tree
Hide file tree
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
33 changes: 19 additions & 14 deletions src/Camera.android.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@ import NativeCameraKitModule from './specs/NativeCameraKitModule';
const Camera = React.forwardRef<CameraApi, CameraProps>((props, ref) => {
const nativeRef = React.useRef(null);

// RN doesn't support optional view props yet (sigh)
// so we have to use -1 to indicate 'undefined'
// All int/float/double props from src/specs/CameraNativeComponent.ts need be mentioned here
props.zoom = props.zoom ?? -1;
props.maxZoom = props.maxZoom ?? -1;
props.scanThrottleDelay = props.scanThrottleDelay ?? -1;
props.faceDetectionThrottleMs = props.faceDetectionThrottleMs ?? -1;

props.allowedBarcodeTypes = props.allowedBarcodeTypes ?? supportedCodeFormats;

React.useImperativeHandle(ref, () => ({
capture: async (options = {}) => {
return await NativeCameraKitModule.capture(options, findNodeHandle(nativeRef.current) ?? undefined);
Expand All @@ -30,10 +20,25 @@ const Camera = React.forwardRef<CameraApi, CameraProps>((props, ref) => {
},
}));

const transformedProps: CameraProps = { ...props };
transformedProps.ratioOverlayColor = processColor(props.ratioOverlayColor) as any;
transformedProps.frameColor = processColor(props.frameColor) as any;
transformedProps.laserColor = processColor(props.laserColor) as any;
// RN doesn't support optional view props yet (sigh)
// so we have to use -1 to indicate 'undefined'
// All int/float/double props from src/specs/CameraNativeComponent.ts need be mentioned here
//
// These must land on a new object rather than on `props`: React freezes element.props in
// development, so assigning to `props` is silently dropped there while it works in release.
const transformedProps: CameraProps = {
...props,
zoom: props.zoom ?? -1,
maxZoom: props.maxZoom ?? -1,
scanThrottleDelay: props.scanThrottleDelay ?? -1,
faceDetectionThrottleMs: props.faceDetectionThrottleMs ?? -1,

allowedBarcodeTypes: props.allowedBarcodeTypes ?? supportedCodeFormats,

ratioOverlayColor: processColor(props.ratioOverlayColor) as any,
frameColor: processColor(props.frameColor) as any,
laserColor: processColor(props.laserColor) as any,
};

// @ts-expect-error props for codegen differ a bit from the user-facing ones
return <NativeCamera style={{ minWidth: 100, minHeight: 100 }} ref={nativeRef} {...transformedProps} />;
Expand Down
24 changes: 15 additions & 9 deletions src/Camera.ios.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,22 @@ const Camera = React.forwardRef<CameraApi, CameraProps>((props, ref) => {
// RN doesn't support optional view props yet (sigh)
// so we have to use -1 to indicate 'undefined'
// All int/float/double props from src/specs/CameraNativeComponent.ts need be mentioned here
props.zoom = props.zoom ?? -1;
props.maxZoom = props.maxZoom ?? -1;
props.scanThrottleDelay = props.scanThrottleDelay ?? -1;
props.faceDetectionThrottleMs = props.faceDetectionThrottleMs ?? -1;
props.iOsDeferredStart = props.iOsDeferredStart ?? true;
//
// These must land on a new object rather than on `props`: React freezes element.props in
// development, so assigning to `props` is silently dropped there while it works in release.
const nativeProps: CameraProps = {
...props,
zoom: props.zoom ?? -1,
maxZoom: props.maxZoom ?? -1,
scanThrottleDelay: props.scanThrottleDelay ?? -1,
faceDetectionThrottleMs: props.faceDetectionThrottleMs ?? -1,
iOsDeferredStart: props.iOsDeferredStart ?? true,

props.allowedBarcodeTypes = props.allowedBarcodeTypes ?? supportedCodeFormats;
allowedBarcodeTypes: props.allowedBarcodeTypes ?? supportedCodeFormats,

props.resetFocusTimeout = props.resetFocusTimeout ?? 0;
props.resetFocusWhenMotionDetected = props.resetFocusWhenMotionDetected ?? true;
resetFocusTimeout: props.resetFocusTimeout ?? 0,
resetFocusWhenMotionDetected: props.resetFocusWhenMotionDetected ?? true,
};

React.useImperativeHandle(ref, () => ({
capture: async () => {
Expand All @@ -35,7 +41,7 @@ const Camera = React.forwardRef<CameraApi, CameraProps>((props, ref) => {
}));

// @ts-expect-error props for codegen differ a bit from the user-facing ones
return <NativeCamera style={{ minWidth: 100, minHeight: 100 }} ref={nativeRef} {...props} />;
return <NativeCamera style={{ minWidth: 100, minHeight: 100 }} ref={nativeRef} {...nativeProps} />;
});

export default Camera;