Skip to content
This repository was archived by the owner on Aug 8, 2024. It is now read-only.

Commit 13c13d0

Browse files
committed
Merge branch 'main' into sync-webapp
2 parents ddce812 + 63822fe commit 13c13d0

File tree

8 files changed

+256
-209
lines changed

8 files changed

+256
-209
lines changed

example.env

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
REACT_APP_TILE_SHAPE=1-1
22
REACT_APP_THEME=dark
33
REACT_APP_COLOR='#2F80FF'
4-
REACT_APP_LOGO=
4+
REACT_APP_LOGO=
55
REACT_APP_FONT=Roboto
66
REACT_APP_TOKEN_GENERATION_ENDPOINT=<Your token generation endpoint from dashboard goes here>
77
REACT_APP_ENV=prod
@@ -13,4 +13,5 @@ REACT_APP_ENABLE_STATS_FOR_NERDS='false'
1313
REACT_APP_PUSHER_APP_KEY=''
1414
REACT_APP_PUSHER_AUTHENDPOINT=''
1515
REACT_APP_HEADLESS_JOIN='false'
16-
REACT_APP_ZIPY_KEY=
16+
REACT_APP_ZIPY_KEY=
17+
REACT_APP_TITLE='100ms App'

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"prettier": "^2.5.1",
8484
"source-map-loader": "^3.0.1",
8585
"terser-webpack-plugin": "^5.3.1",
86-
"webpack": "^5.69.1",
86+
"webpack": "^5.76.0",
8787
"webpack-cli": "^4.9.2",
8888
"webpack-dev-server": "^4.7.4",
8989
"webpack-manifest-plugin": "^4.1.1"

src/App.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ if (window.location.host.includes("localhost")) {
4545
appName = window.location.host.split(".")[0];
4646
}
4747

48-
document.title = `${appName}'s ${document.title}`;
48+
document.title =
49+
process.env.REACT_APP_TITLE || `${appName}'s ${document.title}`;
4950

5051
// TODO: remove now that there are options to change to portrait
5152
const getAspectRatio = ({ width, height }) => {

src/components/PIP/PIPComponent.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ const PIPComponent = ({ peers, showLocalPeer }) => {
2828
const isFeatureEnabled = useIsFeatureEnabled(FEATURE_LIST.PICTURE_IN_PICTURE);
2929

3030
const onPipToggle = useCallback(() => {
31-
if (!isPipOn) {
31+
if (isPipOn) {
32+
PictureInPicture.stop().catch(err =>
33+
console.error("error in stopping pip", err)
34+
);
35+
} else {
3236
PictureInPicture.start(hmsActions, setIsPipOn).catch(err =>
3337
console.error("error in starting pip", err)
3438
);
3539
MediaSession.setup(hmsActions, store);
36-
} else {
37-
PictureInPicture.stop().catch(err =>
38-
console.error("error in stopping pip", err)
39-
);
4040
}
4141
}, [hmsActions, isPipOn, store]);
4242

src/components/VideoTile.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ const Tile = ({
7676
}
7777
return "large";
7878
}, [width, height]);
79-
8079
return (
8180
<StyledVideoTile.Root
8281
css={{

src/plugins/NoiseSuppression.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Please refer the following docs for more detals.
3+
* https://www.100ms.live/docs/javascript/v2/how--to-guides/extend-capabilities/plugins/noise-suppression
4+
*/
15
import { useCallback, useEffect, useRef, useState } from "react";
26
import {
37
selectIsLocalAudioPluginPresent,
@@ -96,15 +100,15 @@ export const NoiseSuppression = () => {
96100

97101
if (isNSSupported && FeatureFlags.showNS() && isFeatureEnabled) {
98102
return (
99-
<Tooltip title={`Turn ${!pluginActive ? "on" : "off"} noise suppression`}>
103+
<Tooltip title={`Turn ${pluginActive ? "off" : "on"} noise suppression`}>
100104
<IconButton
101105
active={!pluginActive}
102106
disabled={disable}
103107
onClick={async () => {
104-
if (!pluginActive) {
105-
await addPlugin();
106-
} else {
108+
if (pluginActive) {
107109
await removePlugin();
110+
} else {
111+
await addPlugin();
108112
}
109113
}}
110114
data-testid="noise_suppression_btn"

src/plugins/VirtualBackground/VirtualBackground.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Please refer the following docs for more detals.
3+
* https://www.100ms.live/docs/javascript/v2/how--to-guides/extend-capabilities/plugins/virtual-background
4+
*/
15
import { useEffect, useRef, useState } from "react";
26
import { HMSVirtualBackgroundTypes } from "@100mslive/hms-virtual-background";
37
import {

0 commit comments

Comments
 (0)