1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00

Mobile: Fixes #7675: Fix camera attachment (#7775)

This commit is contained in:
vikneshwar 2023-02-19 18:38:53 +05:30 committed by GitHub
parent f9dc19e1c4
commit 0aaa396315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 65 additions and 13 deletions

View File

@ -0,0 +1,20 @@
diff --git a/src/RNCamera.js b/src/RNCamera.js
index b7a271ad64771c0f654dbd5fe3c0d9e0d2e2c4ef..1182a40ace081a32fbaefe2bc4a499b79c2e7dac 100644
--- a/src/RNCamera.js
+++ b/src/RNCamera.js
@@ -5,7 +5,6 @@ import {
findNodeHandle,
Platform,
NativeModules,
- ViewPropTypes,
requireNativeComponent,
View,
ActivityIndicator,
@@ -14,6 +13,7 @@ import {
PermissionsAndroid,
} from 'react-native';
+import ViewPropTypes from 'deprecated-react-native-prop-types';
import type { FaceFeature } from './FaceDetector';
const Rationale = PropTypes.shape({

View File

@ -90,5 +90,8 @@
"node-gyp": "9.3.1", "node-gyp": "9.3.1",
"nodemon": "2.0.20" "nodemon": "2.0.20"
}, },
"packageManager": "yarn@3.3.1" "packageManager": "yarn@3.3.1",
"resolutions": {
"react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch"
}
} }

View File

@ -32,6 +32,7 @@
"buffer": "6.0.3", "buffer": "6.0.3",
"constants-browserify": "1.0.0", "constants-browserify": "1.0.0",
"crypto-browserify": "3.12.0", "crypto-browserify": "3.12.0",
"deprecated-react-native-prop-types": "4.0.0",
"events": "3.3.0", "events": "3.3.0",
"jsc-android": "241213.1.0", "jsc-android": "241213.1.0",
"lodash": "4.17.21", "lodash": "4.17.21",

View File

@ -4981,6 +4981,7 @@ __metadata:
buffer: 6.0.3 buffer: 6.0.3
constants-browserify: 1.0.0 constants-browserify: 1.0.0
crypto-browserify: 3.12.0 crypto-browserify: 3.12.0
deprecated-react-native-prop-types: 4.0.0
events: 3.3.0 events: 3.3.0
execa: 4.1.0 execa: 4.1.0
fs-extra: 11.1.0 fs-extra: 11.1.0
@ -7049,6 +7050,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@react-native/normalize-colors@npm:*":
version: 0.72.0
resolution: "@react-native/normalize-colors@npm:0.72.0"
checksum: c8ec577663394a3390eb34c3cd531350521172bcfad7de309ab111e5f9e3d27c966d4a4387f00972302107be3d8cad584c5794ccfa30939aecc56162e4ddbe25
languageName: node
linkType: hard
"@react-native/polyfills@npm:2.0.0": "@react-native/polyfills@npm:2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "@react-native/polyfills@npm:2.0.0" resolution: "@react-native/polyfills@npm:2.0.0"
@ -13895,6 +13903,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"deprecated-react-native-prop-types@npm:4.0.0":
version: 4.0.0
resolution: "deprecated-react-native-prop-types@npm:4.0.0"
dependencies:
"@react-native/normalize-colors": "*"
invariant: "*"
prop-types: "*"
checksum: 3542c70d0379153c946bc2e23202405df4337be3dc2a96601b6696247097e13405091efa7640841f8c920d3239145d8c024e13758c65a884a207b88ec2c826aa
languageName: node
linkType: hard
"deprecation@npm:^2.0.0, deprecation@npm:^2.3.1": "deprecation@npm:^2.0.0, deprecation@npm:^2.3.1":
version: 2.3.1 version: 2.3.1
resolution: "deprecation@npm:2.3.1" resolution: "deprecation@npm:2.3.1"
@ -18859,7 +18878,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"invariant@npm:2.2.4, invariant@npm:^2.2.4": "invariant@npm:*, invariant@npm:2.2.4, invariant@npm:^2.2.4":
version: 2.2.4 version: 2.2.4
resolution: "invariant@npm:2.2.4" resolution: "invariant@npm:2.2.4"
dependencies: dependencies:
@ -26425,17 +26444,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"prop-types@npm:15.5.10": "prop-types@npm:*, prop-types@npm:15.8.1, prop-types@npm:^15.8.1":
version: 15.5.10
resolution: "prop-types@npm:15.5.10"
dependencies:
fbjs: ^0.8.9
loose-envify: ^1.3.1
checksum: 3e928ad5afa5124d52a341a706170628e7b0caa9340515782be6a767261e6eb0e473116188bb8efbe9d9b62cb3c9501c71bf4ab7d34f2507294ee34c90de6964
languageName: node
linkType: hard
"prop-types@npm:15.8.1, prop-types@npm:^15.8.1":
version: 15.8.1 version: 15.8.1
resolution: "prop-types@npm:15.8.1" resolution: "prop-types@npm:15.8.1"
dependencies: dependencies:
@ -26446,6 +26455,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"prop-types@npm:15.5.10":
version: 15.5.10
resolution: "prop-types@npm:15.5.10"
dependencies:
fbjs: ^0.8.9
loose-envify: ^1.3.1
checksum: 3e928ad5afa5124d52a341a706170628e7b0caa9340515782be6a767261e6eb0e473116188bb8efbe9d9b62cb3c9501c71bf4ab7d34f2507294ee34c90de6964
languageName: node
linkType: hard
"prop-types@npm:^15.5.10, prop-types@npm:^15.5.7, prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2": "prop-types@npm:^15.5.10, prop-types@npm:^15.5.7, prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
version: 15.7.2 version: 15.7.2
resolution: "prop-types@npm:15.7.2" resolution: "prop-types@npm:15.7.2"
@ -26913,6 +26932,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"react-native-camera@patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch::locator=root%40workspace%3A.":
version: 4.2.1
resolution: "react-native-camera@patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch::version=4.2.1&hash=e9c70e&locator=root%40workspace%3A."
dependencies:
prop-types: ^15.6.2
checksum: 09a95a91cf3669c86083980f9dc1b4270d1d7f53d29ae3f3f69a44c99abf5380d5bcc816006826a888bef8b17cce1d75aff09779c288bcabe22671ab8dae5f37
languageName: node
linkType: hard
"react-native-codegen@npm:^0.70.6": "react-native-codegen@npm:^0.70.6":
version: 0.70.6 version: 0.70.6
resolution: "react-native-codegen@npm:0.70.6" resolution: "react-native-codegen@npm:0.70.6"