Skip to content

Commit

Permalink
Merge branch 'main' into PBE-5855-feat/react-native-video-design-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
kristian-mkd committed Nov 4, 2024
2 parents 4d20f44 + 6d4215e commit b31cc6f
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 17 deletions.
7 changes: 7 additions & 0 deletions packages/react-native-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [1.2.11](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-1.2.10...@stream-io/video-react-native-sdk-1.2.11) (2024-11-04)


### Bug Fixes

* share screen for alone participant on spotlight layout ([#1553](https://github.com/GetStream/stream-video-js/issues/1553)) ([660056a](https://github.com/GetStream/stream-video-js/commit/660056af56d7f2b9d09b5a834a8eb4b9cba48fba))

## [1.2.10](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-1.2.9...@stream-io/video-react-native-sdk-1.2.10) (2024-11-01)

### Dependency Updates
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stream-io/video-react-native-sdk",
"version": "1.2.10",
"version": "1.2.11",
"packageManager": "[email protected]",
"main": "dist/commonjs/index.js",
"module": "dist/module/index.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ export const CallParticipantsSpotlight = ({
marginHorizontal: landscape ? 0 : variants.spacingSizes.xs,
};

const showShareScreenOverlay =
participantInSpotlight?.isLocalParticipant &&
isScreenShareOnSpotlight &&
ScreenShareOverlay;

return (
<View
testID={ComponentTestIds.CALL_PARTICIPANTS_SPOTLIGHT}
Expand All @@ -103,7 +108,7 @@ export const CallParticipantsSpotlight = ({
>
{participantInSpotlight &&
ParticipantView &&
(participantInSpotlight.isLocalParticipant && ScreenShareOverlay ? (
(showShareScreenOverlay ? (
<ScreenShareOverlay />
) : (
<ParticipantView
Expand Down
16 changes: 8 additions & 8 deletions sample-apps/react-native/dogfood/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ PODS:
- hermes-engine (0.73.4):
- hermes-engine/Pre-built (= 0.73.4)
- hermes-engine/Pre-built (0.73.4)
- JitsiWebRTC (124.0.1)
- libevent (2.1.12)
- MMKV (1.3.9):
- MMKVCore (~> 1.3.9)
Expand Down Expand Up @@ -1146,15 +1145,16 @@ PODS:
- RCT-Folly (= 2022.05.16.00)
- React-Core
- stream-react-native-webrtc
- stream-react-native-webrtc (124.0.0-rc.1):
- JitsiWebRTC (~> 124.0.0)
- stream-react-native-webrtc (125.0.0-alpha.1):
- React-Core
- stream-video-react-native (1.2.7):
- WebRTC-SDK (~> 125.6422.05)
- stream-video-react-native (1.2.10):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- stream-react-native-webrtc
- TOCropViewController (2.7.4)
- WebRTC-SDK (125.6422.05)
- Yoga (1.14.0)

DEPENDENCIES:
Expand Down Expand Up @@ -1241,14 +1241,14 @@ SPEC REPOS:
- GoogleSignIn
- GTMAppAuth
- GTMSessionFetcher
- JitsiWebRTC
- libevent
- MMKV
- MMKVCore
- PromisesObjC
- PromisesSwift
- SocketRocket
- TOCropViewController
- WebRTC-SDK

EXTERNAL SOURCES:
boost:
Expand Down Expand Up @@ -1409,7 +1409,6 @@ SPEC CHECKSUMS:
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2
JitsiWebRTC: d0ae5fd6a81e771bfd82c2ee6c6bb542ebd65ee8
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
MMKV: 817ba1eea17421547e01e087285606eb270a8dcb
MMKVCore: af055b00e27d88cd92fad301c5fecd1ff9b26dd9
Expand Down Expand Up @@ -1479,9 +1478,10 @@ SPEC CHECKSUMS:
RNVoipPushNotification: 543e18f83089134a35e7f1d2eba4c8b1f7776b08
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
stream-io-video-filters-react-native: 8c345e6adf5164646696d45f9962c4199b2fe3b9
stream-react-native-webrtc: 1380525629fae21f4894535189573fb4ddb7984a
stream-video-react-native: 7948f9d3bfd695f46d90f7d05b982b31b0c304a8
stream-react-native-webrtc: e3a201b101ee5dc194daf8915aeacc54f0ba53c5
stream-video-react-native: fc9c932706eba2416db5416335f69bd33d64d7ab
TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
WebRTC-SDK: 1990a1a595bd0b59c17485ce13ff17f575732c12
Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312

PODFILE CHECKSUM: f96321cd21f8fa84788658bc6649718343f705b3
Expand Down
4 changes: 2 additions & 2 deletions sample-apps/react-native/dogfood/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stream-io/video-react-native-dogfood",
"version": "4.4.10",
"version": "4.4.11",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down Expand Up @@ -30,7 +30,7 @@
"@react-navigation/native": "^6.1.10",
"@react-navigation/native-stack": "^6.9.18",
"@stream-io/flat-list-mvcp": "^0.10.3",
"@stream-io/react-native-webrtc": "124.0.0-rc.1",
"@stream-io/react-native-webrtc": "125.0.0-alpha.1",
"@stream-io/video-filters-react-native": "workspace:^",
"@stream-io/video-react-native-sdk": "workspace:^",
"react": "18.2.0",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7760,16 +7760,16 @@ __metadata:
languageName: node
linkType: hard

"@stream-io/react-native-webrtc@npm:124.0.0-rc.1":
version: 124.0.0-rc.1
resolution: "@stream-io/react-native-webrtc@npm:124.0.0-rc.1"
"@stream-io/react-native-webrtc@npm:125.0.0-alpha.1":
version: 125.0.0-alpha.1
resolution: "@stream-io/react-native-webrtc@npm:125.0.0-alpha.1"
dependencies:
base64-js: 1.5.1
debug: 4.3.4
event-target-shim: 6.0.2
peerDependencies:
react-native: ">=0.60.0"
checksum: d39e7652518d9f3dd904b947667ff1e9d0d35d0603e8e4b262f2d20e326328335a19e8e252881e17af9a1c0c4446f356c4aa6dc4744be2ecc5911e0ae2be3f25
checksum: 582eb9b32548484af02821d2d46d96885066c296324d0ac29b019a674a77e5a941c1ec6cdc8b19f7ae4da80e75ee7c9d8a9efb0dfaaab9533abc524dc4db383d
languageName: node
linkType: hard

Expand Down Expand Up @@ -7989,7 +7989,7 @@ __metadata:
"@rnx-kit/metro-config": ^1.3.3
"@rnx-kit/metro-resolver-symlinks": ^0.1.22
"@stream-io/flat-list-mvcp": ^0.10.3
"@stream-io/react-native-webrtc": 124.0.0-rc.1
"@stream-io/react-native-webrtc": 125.0.0-alpha.1
"@stream-io/video-filters-react-native": "workspace:^"
"@stream-io/video-react-native-sdk": "workspace:^"
"@types/eslint": ^8.56.10
Expand Down

0 comments on commit b31cc6f

Please sign in to comment.