Skip to content

Commit

Permalink
Merge branch 'dev' into fix/ISS-30637-ua-upgrade-macos-version
Browse files Browse the repository at this point in the history
  • Loading branch information
ygit committed Dec 6, 2024
2 parents eff955c + 4fbccdd commit b03a92c
Show file tree
Hide file tree
Showing 10 changed files with 409 additions and 130 deletions.
2 changes: 1 addition & 1 deletion examples/prebuilt-react-integration/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

128 changes: 111 additions & 17 deletions packages/hms-video-store/src/IHMSActions.ts

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions packages/hms-video-store/src/interfaces/hls-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ export interface HLSMeetingURLVariant {
*/
meetingURL: string;
/**
* additional metadata for this URL for example - landscape/portrait, the field is not currently supported
* @alpha
* additional metadata for this URL for example - landscape/portrait
*/
metadata?: string;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* experience in the session.
* Note that this is not an absolute measure, a bandwidth of 1 MBPs may be good
* for a 1:1 call but poor for a large call.
* @alpha
*/
export interface HMSConnectionQuality {
peerID: string;
Expand Down
3 changes: 0 additions & 3 deletions packages/hms-video-store/src/interfaces/room.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ export interface HMSHLSRecording {

export interface HMSRTMP {
running: boolean;
/**
* @alpha
**/
startedAt?: Date;
state?: HMSStreamingState;
error?: HMSException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ export interface HMSInteractivityCenter {
fetchLeaderboard(pollID: string, offset: number, count: number): Promise<HMSQuizLeaderboardResponse>;
getPollResponses(poll: HMSPoll, self: boolean): Promise<void>;
getPolls(): Promise<HMSPoll[]>;
/** @alpha */
whiteboard: HMSWhiteboardInteractivityCenter;
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ export class HMSReactiveStore<T extends HMSGenericTypes = { sessionStore: Record
}

/**
* By default store.subscribe does not call the handler with the current state at time of subscription,
* By default, store.subscribe does not call the handler with the current state at time of subscription,
* this behaviour can be modified by calling this function. What it means is that instead of calling the
* handler only for changes which happen post subscription we'll also call it exactly once at the time
* of subscription with the current state. This behaviour is similar to that of BehaviourSubject in RxJS.
* This will be an irreversible change
*
* Note: you don't need this if you're using our react hooks, it takes care of this requirement.
* Note: you don't need this if you're using our React hooks, it takes care of this requirement.
*/
triggerOnSubscribe(): void {
if (this.initialTriggerOnSubscribe) {
Expand Down Expand Up @@ -125,9 +125,6 @@ export class HMSReactiveStore<T extends HMSGenericTypes = { sessionStore: Record
return { onNotification: this.notifications.onNotification };
}

/**
* @alpha
*/
getStats = (): IHMSStatsStoreReadOnly => {
if (!this.stats) {
this.stats = new HMSStats(this.store as unknown as IHMSStore, this.sdk);
Expand Down
1 change: 0 additions & 1 deletion packages/hms-video-store/src/schema/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export interface HMSStore<T extends HMSGenericTypes = { sessionStore: Record<str
polls: Record<string, HMSPoll>;
/** @internal */
hideLocalPeer: boolean;
/** @alpha */
whiteboards: Record<string, HMSWhiteboard>;
}

Expand Down
10 changes: 6 additions & 4 deletions packages/roomkit-react/src/Prebuilt/App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React, { MutableRefObject, useEffect, useRef } from 'react';
import { HMSStatsStoreWrapper, HMSStoreWrapper, IHMSNotifications } from '@100mslive/hms-video-store';
import { Layout, Logo, Screens, Theme, Typography } from '@100mslive/types-prebuilt';
import { match } from 'ts-pattern';
import {
HMSActions,
HMSReactiveStore,
HMSRoomProvider,
HMSStatsStoreWrapper,
HMSStoreWrapper,
IHMSNotifications,
selectIsConnectedToRoom,
useHMSActions,
useHMSStore,
Expand Down Expand Up @@ -207,15 +209,15 @@ export const HMSPrebuilt = React.forwardRef<HMSPrebuiltRefType, HMSPrebuiltProps

return (
<HMSThemeProvider
// issue is with stichtes caching the theme using the theme name / class
// issue is with stitches caching the theme using the theme name / class
// no updates to the themes are fired if the name is same.
// TODO: cache the theme and do deep check to trigger name change in the theme
themeType={`${theme.name}-${Date.now()}`}
theme={{
//@ts-ignore: Prebuilt theme to match stiches theme
//@ts-ignore: Prebuilt theme to match stitches theme
colors: theme.palette,
fonts: {
//@ts-ignore: font list to match token types of stiches
//@ts-ignore: font list to match token types of stitches
sans: fontFamily,
},
}}
Expand Down
Loading

0 comments on commit b03a92c

Please sign in to comment.