Skip to content

Commit

Permalink
feat: handle hand raise config
Browse files Browse the repository at this point in the history
  • Loading branch information
raviteja83 authored Mar 27, 2024
1 parent 2660667 commit 3735a89
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 34 deletions.
2 changes: 1 addition & 1 deletion packages/roomkit-react/package.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { ReactNode, useCallback, useEffect, useRef, useState } from 'reac
import { useMedia } from 'react-use';
import data from '@emoji-mart/data';
import Picker from '@emoji-mart/react';
import { HMSException, selectLocalPeer, useAVToggle, useHMSActions, useHMSStore } from '@100mslive/react-sdk';
import { HMSException, selectLocalPeer, useHMSActions, useHMSStore } from '@100mslive/react-sdk';
import { EmojiIcon, PauseCircleIcon, SendIcon, VerticalMenuIcon } from '@100mslive/react-icons';
import { Box, config as cssConfig, Flex, IconButton as BaseIconButton, Popover, styled, Text } from '../../..';
import { IconButton } from '../../../IconButton';
Expand Down Expand Up @@ -89,8 +89,6 @@ export const ChatFooter = ({ onSend, children }: { onSend: (count: number) => vo
const defaultSelection = useDefaultChatSelection();
const selection = selectedPeer.name || selectedRole || defaultSelection;
const isLocalPeerBlacklisted = useIsPeerBlacklisted({ local: true });
const { toggleAudio, toggleVideo } = useAVToggle();
const noAVPermissions = !(toggleAudio || toggleVideo);
const isMwebHLSStream = useMobileHLSStream();
const isLandscapeHLSStream = useLandscapeHLSStream();

Expand Down Expand Up @@ -275,7 +273,7 @@ export const ChatFooter = ({ onSend, children }: { onSend: (count: number) => vo
}}
gap="2"
>
{noAVPermissions ? <RaiseHand css={{ bg: '$surface_default' }} /> : null}
<RaiseHand css={{ bg: '$surface_default' }} />
<MoreSettings elements={elements} screenType={screenType} />
</Flex>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
selectAppData,
selectIsConnectedToRoom,
selectRoomState,
useAVToggle,
useHMSActions,
useHMSStore,
} from '@100mslive/react-sdk';
Expand Down Expand Up @@ -54,8 +53,6 @@ export const ConferenceScreen = () => {
const dropdownListRef = useRef<string[]>();
const [isHLSStarted] = useSetAppDataByKey(APP_DATA.hlsStarted);

const { toggleAudio, toggleVideo } = useAVToggle();
const noAVPermissions = !(toggleAudio || toggleVideo);
// using it in hls stream to show action button when chat is disabled
const showChat = !!screenProps.elements?.chat;
const autoRoomJoined = useRef(isPreviewScreenEnabled);
Expand Down Expand Up @@ -202,7 +199,7 @@ export const ConferenceScreen = () => {
justify="end"
gap="2"
>
{noAVPermissions ? <RaiseHand /> : null}
<RaiseHand />
<MoreSettings elements={screenProps.elements} screenType={screenProps.screenType} />
<Box
css={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { useEffect } from 'react';
import { useMedia } from 'react-use';
import { ConferencingScreen } from '@100mslive/types-prebuilt';
import { Chat_ChatState } from '@100mslive/types-prebuilt/elements/chat';
import { useAVToggle } from '@100mslive/react-sdk';
import { config as cssConfig, Footer as AppFooter } from '../../..';
// @ts-ignore: No implicit Any
import { AudioVideoToggle } from '../AudioVideoToggle';
Expand Down Expand Up @@ -41,8 +40,6 @@ export const Footer = ({
const isOverlayChat = !!elements?.chat?.is_overlay;
const openByDefault = elements?.chat?.initial_state === Chat_ChatState.CHAT_STATE_OPEN;

const { toggleAudio, toggleVideo } = useAVToggle();
const noAVPermissions = !(toggleAudio || toggleVideo);
const isChatOpen = useIsSidepaneTypeOpen(SIDE_PANE_OPTIONS.CHAT);
const toggleChat = useSidepaneToggle(SIDE_PANE_OPTIONS.CHAT);
const { showPolls } = useShowPolls();
Expand Down Expand Up @@ -90,7 +87,7 @@ export const Footer = ({
>
{isMobile ? (
<>
{noAVPermissions ? <RaiseHand /> : null}
<RaiseHand />
{elements?.chat && <ChatToggle />}
<MoreSettings elements={elements} screenType={screenType} />
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import { FullScreenItem } from '../FullScreenItem';
import { MuteAllModal } from '../MuteAllModal';
// @ts-ignore: No implicit any
import { useDropdownList } from '../../hooks/useDropdownList';
// @ts-ignore: No implicit any
import { useMyMetadata } from '../../hooks/useMetadata';
// @ts-ignore: No implicit any
import { APP_DATA, isMacOS } from '../../../common/constants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
selectIsConnectedToRoom,
selectPeerCount,
selectPermissions,
useAVToggle,
useHMSActions,
useHMSStore,
useRecordingStreaming,
Expand Down Expand Up @@ -51,7 +50,6 @@ import { usePollViewToggle, useSidepaneToggle } from '../../AppData/useSidepane'
import { useShowPolls } from '../../AppData/useUISettings';
// @ts-ignore: No implicit any
import { useDropdownList } from '../../hooks/useDropdownList';
// @ts-ignore: No implicit any
import { useMyMetadata } from '../../hooks/useMetadata';
import { useUnreadPollQuizPresent } from '../../hooks/useUnreadPollQuizPresent';
import { useLandscapeHLSStream, useMobileHLSStream } from '../../../common/hooks';
Expand Down Expand Up @@ -95,8 +93,6 @@ export const MwebOptions = ({
const peerCount = useHMSStore(selectPeerCount);
const emojiCardRef = useRef(null);
const { isBRBOn, toggleBRB, isHandRaised, toggleHandRaise } = useMyMetadata();
const { toggleAudio, toggleVideo } = useAVToggle();
const noAVPermissions = !(toggleAudio || toggleVideo);
const { unreadPollQuiz, setUnreadPollQuiz } = useUnreadPollQuizPresent();
const { title, description } = useRoomLayoutHeader();
const toggleDetailsSheet = useSheetToggle(SHEET_OPTIONS.ROOM_DETAILS);
Expand Down Expand Up @@ -175,7 +171,7 @@ export const MwebOptions = ({
</ActionTile.Root>
)}

{!noAVPermissions ? (
{elements.hand_raise ? (
<ActionTile.Root
active={isHandRaised}
onClick={() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useEffect } from 'react';
import { selectLocalPeerRoleName, useHMSVanillaStore } from '@100mslive/react-sdk';
// @ts-ignore: No implicit Any
import { useMyMetadata } from './hooks/useMetadata';

export const PreviousRoleInMetadata = () => {
Expand Down
8 changes: 7 additions & 1 deletion packages/roomkit-react/src/Prebuilt/components/RaiseHand.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ import { CSS } from '../../Theme';
import { Tooltip } from '../../Tooltip';
// @ts-ignore: No implicit Any
import IconButton from '../IconButton';
// @ts-ignore: No implicit Any
import { useRoomLayoutConferencingScreen } from '../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
import { useMyMetadata } from './hooks/useMetadata';

export const RaiseHand = ({ css }: { css?: CSS }) => {
const { isHandRaised, toggleHandRaise } = useMyMetadata();
const { elements } = useRoomLayoutConferencingScreen();

if (!elements.hand_raise) {
return null;
}

return (
<Tooltip title={isHandRaised ? 'Lower hand' : 'Raise hand'}>
<IconButton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { Flex, Text } from '../../..';
import { PreviewControls, PreviewTile } from '../Preview/PreviewJoin';
import { RequestPrompt } from './RequestPrompt';
import { useRoomLayoutPreviewScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
// @ts-ignore: No implicit Any
import { useMyMetadata } from '../hooks/useMetadata';
// @ts-ignore: No implicit Any
import { ROLE_CHANGE_DECLINED } from '../../common/constants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const useMyMetadata = () => {
const metaData = useHMSStore(selectPeerMetadata(localPeerId));
const isHandRaised = useHMSStore(selectHasPeerHandRaised(localPeerId));

const update = async updatedFields => {
const update = async (updatedFields: Record<string, any>) => {
try {
// get current state from store and merge updated fields
const currentMetadata = vanillaStore.getState(selectPeerMetadata(localPeerId));
Expand All @@ -24,6 +24,7 @@ export const useMyMetadata = () => {
} catch (error) {
console.error('failed to update metadata ', updatedFields);
}
return false;
};

const toggleHandRaise = useCallback(async () => {
Expand All @@ -43,19 +44,12 @@ export const useMyMetadata = () => {
}
}, [metaData?.isBRBOn]); //eslint-disable-line

const setPrevRole = async role => {
await update({
prevRole: role,
});
};

return {
isHandRaised,
isBRBOn: !!metaData?.isBRBOn,
metaData,
updateMetaData: update,
toggleHandRaise,
toggleBRB,
setPrevRole,
};
};
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
resolved "https://registry.yarnpkg.com/@100mslive/hms-noise-cancellation/-/hms-noise-cancellation-0.0.1.tgz#037c8bdfb6b2d7bf12f9d257422150fe6ca43acb"
integrity sha512-DGnzcXRDJREWypIjGX70er+f2k/XLLRF41lrXPs1+PtB1imdEkECPPS0Fg4BA0BCWKDNAGTZBHZPrBDgUmr9Lw==

"@100mslive/[email protected].7":
version "0.12.7"
resolved "https://registry.yarnpkg.com/@100mslive/types-prebuilt/-/types-prebuilt-0.12.7.tgz#66e26701964a8c7a0ab7df4787ac64ad8f8870f4"
integrity sha512-GsDJCZA74+wuBorERQbVA0isRUQduBZzkyzRfMhFA29ZDaVTManrnwamf9TrZvrFJRFTVhZ6lv05oUaauqJRjA==
"@100mslive/[email protected].8":
version "0.12.8"
resolved "https://registry.yarnpkg.com/@100mslive/types-prebuilt/-/types-prebuilt-0.12.8.tgz#2fe9007eb14e66ad3ba687313c4254e2ed085629"
integrity sha512-W1ISh3Mk8/wkomeFiBte7HZLk1gJocnN5U0N8rzZ9WFdDlAW7q/hKgnh+X1/9QxVcv3USfuZyKotbZ7AXmvCiQ==

"@aashutoshrathi/word-wrap@^1.2.3":
version "1.2.6"
Expand Down

0 comments on commit 3735a89

Please sign in to comment.