Merge branch 'main' into publish-alpha

100mslive · Mar 6, 2024 · fb9ba57 · fb9ba57
2 parents 420267e + a5de395
commit fb9ba57
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 32 deletions.
diff --git a/examples/prebuilt-react-integration/package.json b/examples/prebuilt-react-integration/package.json
diff --git a/packages/hls-player/package.json b/packages/hls-player/package.json
diff --git a/packages/hls-stats/package.json b/packages/hls-stats/package.json
diff --git a/packages/hms-video-store/package.json b/packages/hms-video-store/package.json
diff --git a/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts b/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts
@@ -113,6 +113,10 @@ export abstract class RunningTrackAnalytics {
   }
 
   createSample() {
+    if (this.tempStats.length === 0) {
+      return;
+    }
+
     this.samples.push(this.collateSample());
     this.tempStats.length = 0;
   }

diff --git a/packages/hms-video-store/src/analytics/stats/PublishStatsAnalytics.ts b/packages/hms-video-store/src/analytics/stats/PublishStatsAnalytics.ts
@@ -84,6 +84,13 @@ export class PublishStatsAnalytics extends BaseStatsAnalytics {
       });
     });
 
+    // delete track analytics if track is not present in store and no samples are present
+    this.trackAnalytics.forEach(trackAnalytic => {
+      if (!this.store.hasTrack(trackAnalytic.track) && !(trackAnalytic.samples.length > 0)) {
+        this.trackAnalytics.delete(trackAnalytic.track_id);
+      }
+    });
+
     if (shouldCreateSample) {
       this.trackAnalytics.forEach(trackAnalytic => {
         trackAnalytic.createSample();

diff --git a/packages/hms-video-store/src/analytics/stats/SubscribeStatsAnalytics.ts b/packages/hms-video-store/src/analytics/stats/SubscribeStatsAnalytics.ts
@@ -76,6 +76,13 @@ export class SubscribeStatsAnalytics extends BaseStatsAnalytics {
       }
     });
 
+    // delete track analytics if track is not present in store and no samples are present
+    this.trackAnalytics.forEach(trackAnalytic => {
+      if (!this.store.hasTrack(trackAnalytic.track) && !(trackAnalytic.samples.length > 0)) {
+        this.trackAnalytics.delete(trackAnalytic.track_id);
+      }
+    });
+
     if (shouldCreateSample) {
       this.trackAnalytics.forEach(trackAnalytic => {
         trackAnalytic.createSample();

diff --git a/packages/hms-virtual-background/package.json b/packages/hms-virtual-background/package.json
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
diff --git a/packages/roomkit-react/package.json b/packages/roomkit-react/package.json
diff --git a/packages/roomkit-react/src/Prebuilt/components/Chat/PinnedMessage.tsx b/packages/roomkit-react/src/Prebuilt/components/Chat/PinnedMessage.tsx
@@ -71,13 +71,14 @@ export const PinnedMessage = () => {
       <Flex
         css={{
           p: '$4',
-          color: '$on_surface_medium',
-          bg: isMobile ? 'rgba(0, 0, 0, 0.64)' : '$surface_default',
+          color: '$on_surface_high',
+          bg: isMobile && elements?.chat?.is_overlay ? 'rgba(0, 0, 0, 0.64)' : '$surface_brighter',
           r: '$1',
           gap: '$4',
           mb: '$8',
           mt: '$8',
           flexGrow: 1,
+          border: '1px solid $border_bright',
         }}
         align="center"
         justify="between"
@@ -98,7 +99,7 @@ export const PinnedMessage = () => {
         >
           <Text
             variant="sm"
-            css={{ color: '$on_surface_medium' }}
+            css={{ color: '$on_surface_high' }}
             {...swipeHandlers}
             title={pinnedMessages[pinnedMessageIndex]?.text}
           >

diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/CreatePollQuiz/PollsQuizMenu.tsx b/packages/roomkit-react/src/Prebuilt/components/Polls/CreatePollQuiz/PollsQuizMenu.tsx
@@ -140,7 +140,7 @@ const AddMenu = () => {
           type="text"
           placeholder="Enter a name to continue"
           value={title}
-          onChange={event => setTitle(event.target.value)}
+          onChange={event => setTitle(event.target.value.trimStart())}
           css={{
             backgroundColor: '$surface_bright',
             border: '1px solid $border_default',

diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/QuestionForm.tsx b/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/QuestionForm.tsx
@@ -159,7 +159,7 @@ export const QuestionForm = ({
           maxHeight: '$32',
         }}
         value={text}
-        onChange={event => setText(event.target.value)}
+        onChange={event => setText(event.target.value.trimStart())}
       />
       <Text variant="xs" css={{ color: '$on_surface_medium', textAlign: 'end', mt: '$4' }}>
         {text?.length || 0}/1024

diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/common/OptionInputWithDelete.tsx b/packages/roomkit-react/src/Prebuilt/components/Polls/common/OptionInputWithDelete.tsx
@@ -27,7 +27,7 @@ export const OptionInputWithDelete = ({
         }}
         value={option?.text || ''}
         key={index}
-        onChange={event => handleOptionTextChange(index, event.target.value)}
+        onChange={event => handleOptionTextChange(index, event.target.value.trimStart())}
       />
       <IconButton onClick={() => removeOption(index)} css={{ bg: 'transparent', border: 'none' }}>
         <TrashIcon />

diff --git a/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/ProminenceLayout.tsx b/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/ProminenceLayout.tsx
@@ -36,6 +36,7 @@ const SecondarySection = ({
   hasSidebar,
 }: React.PropsWithChildren<{ tiles: TrackWithPeerAndDimensions[]; edgeToEdge?: boolean; hasSidebar?: boolean }>) => {
   const tileLayoutProps = useVideoTileContext();
+  console.log('secondary section', { tilesLength: tiles?.length });
   if (!tiles?.length) {
     return null;
   }

diff --git a/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/ScreenshareLayout.tsx b/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/ScreenshareLayout.tsx
@@ -55,6 +55,8 @@ export const ScreenshareLayout = ({ peers, onPageChange, onPageSize, edgeToEdge
     };
   }, [activeSharePeer?.id, isMobile, setActiveScreenSharePeer]);
 
+  console.log({ activeSharePeer, secondaryPeers });
+
   return (
     <ProminenceLayout.Root edgeToEdge={edgeToEdge} hasSidebar={hasSidebar}>
       <ProminenceLayout.ProminentSection>

diff --git a/packages/roomkit-react/src/Prebuilt/layouts/SidePane.tsx b/packages/roomkit-react/src/Prebuilt/layouts/SidePane.tsx
@@ -193,6 +193,7 @@ const SidePane = ({
     });
 
   if (!trackId && !SidepaneComponent) {
+    console.log('sidepane not rendered', { trackId, SidepaneComponent });
     return null;
   }
 

diff --git a/packages/roomkit-web/package.json b/packages/roomkit-web/package.json
diff --git a/yarn.lock b/yarn.lock
@@ -6682,11 +6682,11 @@ axe-core@^4.2.0, axe-core@^4.6.2:
   integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==
 
 axios@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
-  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
+  integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
   dependencies:
-    follow-redirects "^1.15.0"
+    follow-redirects "^1.15.4"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -9763,10 +9763,10 @@ flow-parser@0.*:
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.214.0.tgz#455efc841ec015c62f6dec022cf6c61480f231a2"
   integrity sha512-RW1Dh6BuT14DA7+gtNRKzgzvG3GTPdrceHCi4ddZ9VFGQ9HtO5L8wzxMGsor7XtInIrbWZZCSak0oxnBF7tApw==
 
-follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+follow-redirects@^1.15.4:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
 
 for-each@^0.3.3:
   version "0.3.3"
-Original file line number
+Diff line change
@@ Expand Up / @@ -193,6 +193,7 @@ const SidePane = ({ @@
         });
       if (!trackId && !SidepaneComponent) {
+        console.log('sidepane not rendered', { trackId, SidepaneComponent });
         return null;
       }
@@ Expand Down @@