Skip to content

Commit 7325b99

Browse files
khushal87khushal87
committed
chore: resolve conflicts from develop
2 parents 35bffd8 + 717bada commit 7325b99

File tree

6 files changed

+124
-5
lines changed

6 files changed

+124
-5
lines changed

‎docusaurus/docs/reactnative/common-content/contexts/message-input-context/pick_and_upload_image_from_native_picker.mdx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Opens the native image picker and uploads the selected image.
2+
3+
| Type |
4+
| --------------------- |
5+
| `() => Promise<void>` |

‎docusaurus/docs/reactnative/common-content/contexts/message-input-context/take_and_upload_image.mdx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Function to click an image using the device camera and upload it.
2+
3+
| Type |
4+
| --------------------- |
5+
| `() => Promise<void>` |

‎docusaurus/docs/reactnative/contexts/message-input-context.mdx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ import OpenAttachmentPicker from '../common-content/contexts/message-input-conte
6868
import OpenCommandsPicker from '../common-content/contexts/message-input-context/open_commands_picker.mdx';
6969
import OpenFilePicker from '../common-content/contexts/message-input-context/open_file_picker.mdx';
7070
import OpenMentionsPicker from '../common-content/contexts/message-input-context/open_mentions_picker.mdx';
71+
import PickAndUploadImageFromNativePicker from '../common-content/contexts/message-input-context/pick_and_upload_image_from_native_picker.mdx';
7172
import QuotedMessage from '../common-content/contexts/message-input-context/quoted_message.mdx';
7273
import RemoveFile from '../common-content/contexts/message-input-context/remove_file.mdx';
7374
import RemoveImage from '../common-content/contexts/message-input-context/remove_image.mdx';
@@ -84,6 +85,7 @@ import SetSendThreadMessageInChannel from '../common-content/contexts/message-in
8485
import SetShowMoreOptions from '../common-content/contexts/message-input-context/set_show_more_options.mdx';
8586
import SetText from '../common-content/contexts/message-input-context/set_text.mdx';
8687
import ShowMoreOptions from '../common-content/contexts/message-input-context/show_more_options.mdx';
88+
import TakeAndUploadImage from '../common-content/contexts/message-input-context/take_and_upload_image.mdx';
8789
import Text from '../common-content/contexts/message-input-context/text.mdx';
8890
import ToggleAttachmentPicker from '../common-content/contexts/message-input-context/toggle_attachment_picker.mdx';
8991
import TriggerSettings from '../common-content/contexts/message-input-context/trigger_settings.mdx';
@@ -308,6 +310,10 @@ const { sendMessage, toggleAttachmentPicker } = useMessageInputContext();
308310

309311
<OpenMentionsPicker />
310312

313+
### `pickAndUploadImageFromNativePicker`
314+
315+
<PickAndUploadImageFromNativePicker />
316+
311317
{/* ### pickFile */}
312318

313319
### `removeFile`
@@ -378,6 +384,10 @@ const { sendMessage, toggleAttachmentPicker } = useMessageInputContext();
378384

379385
<ShowMoreOptions />
380386

387+
### `takeAndUploadImage`
388+
389+
<TakeAndUploadImage />
390+
381391
### text
382392

383393
<Text />

‎examples/ExpoMessaging/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"android": "expo run:android",
88
"ios": "expo run:ios",
99
"web": "expo start --web",
10-
"eject": "expo eject"
10+
"eject": "expo eject",
11+
"postinstall": "patch-package"
1112
},
1213
"dependencies": {
1314
"@op-engineering/op-sqlite": "^6.0.4",
@@ -28,6 +29,8 @@
2829
"expo-sharing": "~12.0.1",
2930
"expo-splash-screen": "~0.27.5",
3031
"expo-status-bar": "~1.12.1",
32+
"patch-package": "^8.0.0",
33+
"postinstall-postinstall": "^2.1.0",
3134
"react": "18.2.0",
3235
"react-dom": "18.2.0",
3336
"react-native": "0.74.5",

‎examples/ExpoMessaging/patches/react-native-quick-sqlite+8.1.0.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/node_modules/react-native-quick-sqlite/android/build.gradle b/node_modules/react-native-quick-sqlite/android/build.gradle
2+
index afcda02..e2ca174 100644
3+
--- a/node_modules/react-native-quick-sqlite/android/build.gradle
4+
+++ b/node_modules/react-native-quick-sqlite/android/build.gradle
5+
@@ -63,7 +63,7 @@ android {
6+
}
7+
8+
defaultConfig {
9+
- minSdkVersion 21
10+
+ minSdkVersion safeExtGet('minSdkVersion', 21)
11+
targetSdkVersion safeExtGet('targetSdkVersion', 28)
12+
versionCode 1
13+
versionName "1.0"

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 87 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2774,6 +2774,11 @@
27742774
resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.11.tgz#adecc134521274711d071d5b0200907cc83b38ee"
27752775
integrity sha512-UDi3g6Jss/W5FnSzO9jCtQwEpfymt0M+sPPlmLhDH6h2TJ8j4ESE/LpmNPBij15J5NKkk4/cg/qoVMdWI3vnlQ==
27762776

2777+
"@yarnpkg/lockfile@^1.1.0":
2778+
version "1.1.0"
2779+
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
2780+
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
2781+
27772782
"@zxing/[email protected]":
27782783
version "0.9.0"
27792784
resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b"
@@ -3253,7 +3258,7 @@ cacache@^18.0.2:
32533258
tar "^6.1.11"
32543259
unique-filename "^3.0.0"
32553260

3256-
call-bind@^1.0.2, call-bind@^1.0.7:
3261+
call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7:
32573262
version "1.0.7"
32583263
resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
32593264
integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
@@ -3350,6 +3355,11 @@ ci-info@^3.2.0, ci-info@^3.3.0:
33503355
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
33513356
integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
33523357

3358+
ci-info@^3.7.0:
3359+
version "3.9.0"
3360+
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
3361+
integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
3362+
33533363
clean-stack@^2.0.0:
33543364
version "2.2.0"
33553365
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@@ -4329,7 +4339,7 @@ find-up@^5.0.0, find-up@~5.0.0:
43294339
locate-path "^6.0.0"
43304340
path-exists "^4.0.0"
43314341

4332-
find-yarn-workspace-root@~2.0.0:
4342+
find-yarn-workspace-root@^2.0.0, find-yarn-workspace-root@~2.0.0:
43334343
version "2.0.0"
43344344
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
43354345
integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
@@ -5004,6 +5014,11 @@ is-wsl@^2.1.1, is-wsl@^2.2.0:
50045014
dependencies:
50055015
is-docker "^2.0.0"
50065016

5017+
isarray@^2.0.5:
5018+
version "2.0.5"
5019+
resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
5020+
integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
5021+
50075022
isarray@~1.0.0:
50085023
version "1.0.0"
50095024
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -5218,6 +5233,16 @@ json-schema-traverse@^1.0.0:
52185233
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
52195234
integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
52205235

5236+
json-stable-stringify@^1.0.2:
5237+
version "1.1.1"
5238+
resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz#52d4361b47d49168bcc4e564189a42e5a7439454"
5239+
integrity sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==
5240+
dependencies:
5241+
call-bind "^1.0.5"
5242+
isarray "^2.0.5"
5243+
jsonify "^0.0.1"
5244+
object-keys "^1.1.1"
5245+
52215246
json5@^2.2.2, json5@^2.2.3:
52225247
version "2.2.3"
52235248
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
@@ -5239,6 +5264,11 @@ jsonfile@^6.0.1:
52395264
optionalDependencies:
52405265
graceful-fs "^4.1.6"
52415266

5267+
jsonify@^0.0.1:
5268+
version "0.0.1"
5269+
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
5270+
integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
5271+
52425272
jsonwebtoken@~9.0.0:
52435273
version "9.0.0"
52445274
resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
@@ -5271,6 +5301,13 @@ kind-of@^6.0.2:
52715301
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
52725302
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
52735303

5304+
klaw-sync@^6.0.0:
5305+
version "6.0.0"
5306+
resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
5307+
integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
5308+
dependencies:
5309+
graceful-fs "^4.1.11"
5310+
52745311
kleur@^3.0.3:
52755312
version "3.0.3"
52765313
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -6190,6 +6227,11 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
61906227
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
61916228
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
61926229

6230+
object-keys@^1.1.1:
6231+
version "1.1.1"
6232+
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
6233+
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
6234+
61936235
[email protected]:
61946236
version "2.4.1"
61956237
resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -6237,7 +6279,7 @@ open@^6.2.0:
62376279
dependencies:
62386280
is-wsl "^1.1.0"
62396281

6240-
open@^7.0.3:
6282+
open@^7.0.3, open@^7.4.2:
62416283
version "7.4.2"
62426284
resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
62436285
integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -6379,6 +6421,27 @@ password-prompt@^1.0.4:
63796421
ansi-escapes "^3.1.0"
63806422
cross-spawn "^6.0.5"
63816423

6424+
patch-package@^8.0.0:
6425+
version "8.0.0"
6426+
resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"
6427+
integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==
6428+
dependencies:
6429+
"@yarnpkg/lockfile" "^1.1.0"
6430+
chalk "^4.1.2"
6431+
ci-info "^3.7.0"
6432+
cross-spawn "^7.0.3"
6433+
find-yarn-workspace-root "^2.0.0"
6434+
fs-extra "^9.0.0"
6435+
json-stable-stringify "^1.0.2"
6436+
klaw-sync "^6.0.0"
6437+
minimist "^1.2.6"
6438+
open "^7.4.2"
6439+
rimraf "^2.6.3"
6440+
semver "^7.5.3"
6441+
slash "^2.0.0"
6442+
tmp "^0.0.33"
6443+
yaml "^2.2.2"
6444+
63826445
path-exists@^3.0.0:
63836446
version "3.0.0"
63846447
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6494,6 +6557,11 @@ postcss@~8.4.32:
64946557
picocolors "^1.0.0"
64956558
source-map-js "^1.2.0"
64966559

6560+
postinstall-postinstall@^2.1.0:
6561+
version "2.1.0"
6562+
resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3"
6563+
integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ==
6564+
64976565
[email protected]:
64986566
version "5.6.0"
64996567
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -7016,7 +7084,7 @@ reusify@^1.0.4:
70167084
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
70177085
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
70187086

7019-
rimraf@^2.6.2:
7087+
rimraf@^2.6.2, rimraf@^2.6.3:
70207088
version "2.7.1"
70217089
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
70227090
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7132,6 +7200,11 @@ semver@^7.5.2:
71327200
dependencies:
71337201
lru-cache "^6.0.0"
71347202

7203+
semver@^7.5.3:
7204+
version "7.6.3"
7205+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
7206+
integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
7207+
71357208
semver@^7.5.4, semver@^7.6.0:
71367209
version "7.6.2"
71377210
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
@@ -7282,6 +7355,11 @@ sisteransi@^1.0.5:
72827355
resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
72837356
integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
72847357

7358+
slash@^2.0.0:
7359+
version "2.0.0"
7360+
resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
7361+
integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
7362+
72857363
slash@^3.0.0:
72867364
version "3.0.0"
72877365
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -8231,6 +8309,11 @@ yaml@^2.2.1:
82318309
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
82328310
integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==
82338311

8312+
yaml@^2.2.2:
8313+
version "2.5.0"
8314+
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.0.tgz#c6165a721cf8000e91c36490a41d7be25176cf5d"
8315+
integrity sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==
8316+
82348317
yargs-parser@^18.1.2:
82358318
version "18.1.3"
82368319
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"

0 commit comments

Comments
 (0)