Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 74 additions & 42 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion example/src/CameraExample.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { View, StyleSheet } from 'react-native';
import Camera from '../../src/Camera';
import { CameraType } from '../../src/CameraScreen';
import { CameraType } from '../../src/types';

export default class CameraExample extends Component {
render() {
Expand Down
2 changes: 1 addition & 1 deletion example/src/CameraScreenExample.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default class CameraScreenExample extends Component {
render() {
return (
<CameraScreen
actions={{ rightButtonText: 'Done', leftButtonText: 'Cancel' }}
actions={{ leftButtonText: 'Cancel' }}
onBottomButtonPressed={(event) => this.onBottomButtonPressed(event)}
flashImages={{
on: require('../images/flashOn.png'),
Expand Down
15 changes: 7 additions & 8 deletions src/Camera.android.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import _update from 'lodash/update';
import _cloneDeep from 'lodash/cloneDeep';
import { requireNativeComponent, findNodeHandle, NativeModules, processColor } from 'react-native';
import { CameraApi } from './types';
import { CameraProps } from './Camera';

const { RNCameraKitModule } = NativeModules;
const NativeCamera = requireNativeComponent('CKCameraManager');

const Camera = React.forwardRef((props: any, ref) => {
const Camera = React.forwardRef((props: CameraProps, ref) => {
const nativeRef = React.useRef();

React.useImperativeHandle<any, CameraApi>(ref, () => ({
Expand All @@ -16,7 +16,7 @@ const Camera = React.forwardRef((props: any, ref) => {
// we must use the general module and tell it what View it's supposed to be using
return await RNCameraKitModule.capture(options, findNodeHandle(nativeRef.current ?? null));
},
setTorchMode: (mode = "off") => {
setTorchMode: (mode = 'off') => {
RNCameraKitModule.setTorchMode(mode, findNodeHandle(nativeRef.current ?? null));
},
requestDeviceCameraAuthorization: () => {
Expand All @@ -27,11 +27,10 @@ const Camera = React.forwardRef((props: any, ref) => {
},
}));

const transformedProps = _cloneDeep(props);
_update(transformedProps, 'cameraOptions.ratioOverlayColor', (c) => processColor(c));
_update(transformedProps, 'frameColor', (c) => processColor(c));
_update(transformedProps, 'laserColor', (c) => processColor(c));
_update(transformedProps, 'surfaceColor', (c) => processColor(c));
const transformedProps: CameraProps = _cloneDeep(props);
transformedProps.ratioOverlayColor = processColor(props.ratioOverlayColor);
transformedProps.frameColor = processColor(props.frameColor);
transformedProps.laserColor = processColor(props.laserColor);

return (
<NativeCamera
Expand Down
41 changes: 40 additions & 1 deletion src/Camera.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,41 @@
import Camera from './Camera';
import { CameraApi, FlashMode, FocusMode, ZoomMode, TorchMode, CameraType } from './types';
import { Orientation } from './index';

export type OnReadCodeData = {
nativeEvent: {
codeStringValue: string;
};
};

export type OnOrientationChangeData = {
nativeEvent: {
orientation: Orientation;
};
};

export interface CameraProps {
ref?: LegacyRef<Component<CameraApi, {}, any>>;
style?: StyleProp<ViewStyle>;
// Behavior
flashMode?: FlashMode;
focusMode?: FocusMode;
zoomMode?: ZoomMode;
torchMode?: TorchMode;
cameraType?: CameraType;
onOrientationChange?: (event: OnOrientationChangeData) => void;
// Barcode only
scanBarcode?: boolean;
showFrame?: boolean;
laserColor?: number | string;
frameColor?: number | string;
onReadCode?: (event: OnReadCodeData) => void;
// Specific to iOS
ratioOverlay?: string;
ratioOverlayColor?: number | string;
resetFocusTimeout?: number;
resetFocusWhenMotionDetected?: boolean;
}

declare const Camera: React.FC<CameraProps>;

export default Camera;
18 changes: 6 additions & 12 deletions src/Camera.ios.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import _update from 'lodash/update';
import _cloneDeep from 'lodash/cloneDeep';
import React from 'react';
import { requireNativeComponent, NativeModules, processColor } from 'react-native';
import { CameraApi } from './types';
import { CameraProps } from './Camera';

const { CKCameraManager } = NativeModules;
const NativeCamera = requireNativeComponent('CKCamera');

const Camera = React.forwardRef((props: any, ref: any) => {
const Camera = React.forwardRef((props: CameraProps, ref: any) => {
const nativeRef = React.useRef();

React.useImperativeHandle<any, CameraApi>(ref, () => ({
capture: async () => {
return await CKCameraManager.capture({});
},
setTorchMode: (mode = "off") => {
setTorchMode: (mode = 'off') => {
CKCameraManager.setTorchMode(mode);
},
requestDeviceCameraAuthorization: async () => {
Expand All @@ -25,16 +25,10 @@ const Camera = React.forwardRef((props: any, ref: any) => {
},
}));

const transformedProps = _cloneDeep(props);
_update(transformedProps, 'cameraOptions.ratioOverlayColor', (c: any) => processColor(c));
const transformedProps: CameraProps = _cloneDeep(props);
transformedProps.ratioOverlayColor = processColor(props.ratioOverlayColor);

return (
<NativeCamera
style={{ minWidth: 100, minHeight: 100 }}
ref={nativeRef}
{...transformedProps}
/>
);
return <NativeCamera style={{ minWidth: 100, minHeight: 100 }} ref={nativeRef} {...transformedProps} />;
});

Camera.defaultProps = {
Expand Down
Loading