Page MenuHomePhorge
Files F33527170

D14222.1769073470.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D14222.1769073470.diff
View Options

diff --git a/native/media/camera-modal.react.js b/native/media/camera-modal.react.js
--- a/native/media/camera-modal.react.js
+++ b/native/media/camera-modal.react.js
@@ -248,12 +248,13 @@
// withOverlayContext
+overlayContext: ?OverlayContextType,
+isActive: boolean,
+ +flashMode: number,
+ +changeFlashMode: () => void,
};
type State = {
+zoom: number,
+useFrontCamera: boolean,
+hasCamerasOnBothSides: boolean,
- +flashMode: number,
+autoFocusPointOfInterest: ?{
x: number,
y: number,
@@ -316,7 +317,6 @@
zoom: 0,
useFrontCamera: props.deviceCameraInfo.defaultUseFrontCamera,
hasCamerasOnBothSides: props.deviceCameraInfo.hasCamerasOnBothSides,
- flashMode: RNCamera.Constants.FlashMode.off,
autoFocusPointOfInterest: undefined,
stagingMode: false,
pendingPhotoCapture: undefined,
@@ -677,9 +677,9 @@
}
let flashIcon;
- if (this.state.flashMode === RNCamera.Constants.FlashMode.on) {
+ if (this.props.flashMode === RNCamera.Constants.FlashMode.on) {
flashIcon = <Icon name="ios-flash" style={styles.flashIcon} />;
- } else if (this.state.flashMode === RNCamera.Constants.FlashMode.off) {
+ } else if (this.props.flashMode === RNCamera.Constants.FlashMode.off) {
flashIcon = <Icon name="ios-flash-off" style={styles.flashIcon} />;
} else {
flashIcon = (
@@ -707,7 +707,7 @@
<Reanimated.View style={styles.fill}>
<Reanimated.View style={this.focusIndicatorStyle} />
<TouchableOpacity
- onPress={this.changeFlashMode}
+ onPress={this.props.changeFlashMode}
onLayout={this.onFlashButtonLayout}
style={styles.flashButton}
ref={this.flashButtonRef}
@@ -748,7 +748,7 @@
captureAudio={false}
maxZoom={maxZoom}
zoom={this.state.zoom}
- flashMode={this.state.flashMode}
+ flashMode={this.props.flashMode}
autoFocusPointOfInterest={this.state.autoFocusPointOfInterest}
style={styles.fill}
androidCameraPermissionOptions={null}
@@ -939,16 +939,6 @@
this.setState({ zoom });
};
- changeFlashMode = () => {
- if (this.state.flashMode === RNCamera.Constants.FlashMode.on) {
- this.setState({ flashMode: RNCamera.Constants.FlashMode.off });
- } else if (this.state.flashMode === RNCamera.Constants.FlashMode.off) {
- this.setState({ flashMode: RNCamera.Constants.FlashMode.auto });
- } else {
- this.setState({ flashMode: RNCamera.Constants.FlashMode.on });
- }
- };
-
focusOnPoint = ([inputX, inputY]: [number, number]) => {
const { width: screenWidth, height: screenHeight } = this.props.dimensions;
const relativeX = inputX / screenWidth;
@@ -1189,6 +1179,21 @@
};
}, [isActive]);
+ const [flashMode, setFlashMode] = React.useState(
+ RNCamera.Constants.FlashMode.off,
+ );
+
+ const changeFlashMode = React.useCallback(() => {
+ setFlashMode(prevFlashMode => {
+ if (prevFlashMode === RNCamera.Constants.FlashMode.on) {
+ return RNCamera.Constants.FlashMode.off;
+ } else if (prevFlashMode === RNCamera.Constants.FlashMode.off) {
+ return RNCamera.Constants.FlashMode.auto;
+ }
+ return RNCamera.Constants.FlashMode.on;
+ });
+ }, []);
+
return (
<CameraModal
{...props}
@@ -1199,6 +1204,8 @@
dispatch={dispatch}
overlayContext={overlayContext}
isActive={isActive}
+ flashMode={flashMode}
+ changeFlashMode={changeFlashMode}
/>
);
});

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 9:17 AM (10 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5975955
Default Alt Text
D14222.1769073470.diff (3 KB)

Event Timeline