Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: added WebexMeetingInfo to inmeeting component #843

Merged
merged 1 commit into from
Oct 10, 2024
Merged

fix: added WebexMeetingInfo to inmeeting component #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/WebexInMeeting/WebexInMeeting.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {TABLET, DESKTOP, DESKTOP_LARGE} from '../breakpoints';
import {Modal} from '../generic';
import WebexMeetingGuestAuthentication from '../WebexMeetingGuestAuthentication/WebexMeetingGuestAuthentication';
import WebexMeetingHostAuthentication from '../WebexMeetingHostAuthentication/WebexMeetingHostAuthentication';

import WebexMeetingInfo from '../WebexMeetingInfo/WebexMeetingInfo';
/**
* Webex In-Meeting component displays the remote stream plus
* the local stream at the bottom right corner.
Expand Down Expand Up @@ -85,6 +85,7 @@ export default function WebexInMeeting({
</Modal>
)}
<div style={{maxWidth}} className={sc('media-container')}>
<WebexMeetingInfo className={sc('info')} meetingID={meetingID} />
<WebexRemoteMedia className={sc('remote-media-in-meeting')} layout={layout} meetingID={meetingID} />
<WebexLocalMedia className={sc('local-media-in-meeting')} meetingID={meetingID} mediaType={localMediaType} />
{localShare?.stream && <Banner className={sc('share-banner')}>You&apos;re sharing your screen</Banner>}
Expand Down
219 changes: 159 additions & 60 deletions src/components/WebexInMeeting/__snapshots__/WebexInMeeting.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`Storyshots Meetings/Webex In-Meeting All Media 1`] = `
Array [
<div
className="wxc wxc-in-meeting wxc-in-meeting--remote-sharing"
className="wxc wxc-in-meeting"
style={
Object {
"height": "100%",
Expand All @@ -20,27 +20,38 @@ Array [
}
>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting wxc-remote-media--remote-video-n-share"
className="wxc wxc-meeting-info wxc-in-meeting__info"
>
<div
className="wxc wxc-spinner"
style={
Object {
"height": 38,
"width": 38,
}
}
/>
</div>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting"
>
<Draggable
bounds="parent"
<div
className="wxc wxc-badge wxc-remote-media__connecting-badge"
style={Object {}}
>
<video
autoPlay={true}
className="wxc-remote-media__video wxc-remote-media__remote-video"
muted={true}
playsInline={true}
<div
className="wxc wxc-spinner wxc-remote-media__connecting-spinner"
style={
Object {
"height": 16,
"width": 16,
}
}
/>
</Draggable>
<video
autoPlay={true}
className="wxc-remote-media__video wxc-remote-media__remote-share"
muted={true}
playsInline={true}
/>
<audio
autoPlay={true}
/>
<span>
Connecting
</span>
</div>
</div>
<div
className="wxc wxc-local-media wxc-in-meeting__local-media-in-meeting wxc-local-media--no-media"
Expand Down Expand Up @@ -116,12 +127,39 @@ Array [
}
>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting"
className="wxc wxc-meeting-info wxc-in-meeting__info"
>
<audio
autoPlay={true}
<div
className="wxc wxc-spinner"
style={
Object {
"height": 38,
"width": 38,
}
}
/>
</div>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting"
>
<div
className="wxc wxc-badge wxc-remote-media__connecting-badge"
style={Object {}}
>
<div
className="wxc wxc-spinner wxc-remote-media__connecting-spinner"
style={
Object {
"height": 16,
"width": 16,
}
}
/>
<span>
Connecting
</span>
</div>
</div>
<div
className="wxc wxc-local-media wxc-in-meeting__local-media-in-meeting wxc-local-media--no-media"
>
Expand Down Expand Up @@ -195,6 +233,19 @@ Array [
}
}
>
<div
className="wxc wxc-meeting-info wxc-in-meeting__info"
>
<div
className="wxc wxc-spinner"
style={
Object {
"height": 38,
"width": 38,
}
}
/>
</div>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting"
>
Expand Down Expand Up @@ -289,22 +340,39 @@ Array [
}
}
>
<div
className="wxc wxc-meeting-info wxc-in-meeting__info"
>
<div
className="wxc wxc-spinner"
style={
Object {
"height": 38,
"width": 38,
}
}
/>
</div>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting"
>
<Draggable
bounds="parent"
<div
className="wxc wxc-badge wxc-remote-media__connecting-badge"
style={Object {}}
>
<video
autoPlay={true}
className="wxc-remote-media__video wxc-remote-media__remote-video"
muted={true}
playsInline={true}
<div
className="wxc wxc-spinner wxc-remote-media__connecting-spinner"
style={
Object {
"height": 16,
"width": 16,
}
}
/>
</Draggable>
<audio
autoPlay={true}
/>
<span>
Connecting
</span>
</div>
</div>
<div
className="wxc wxc-local-media wxc-in-meeting__local-media-in-meeting wxc-local-media--no-media"
Expand Down Expand Up @@ -363,7 +431,7 @@ Array [
exports[`Storyshots Meetings/Webex In-Meeting Remote Share 1`] = `
Array [
<div
className="wxc wxc-in-meeting wxc-in-meeting--remote-sharing"
className="wxc wxc-in-meeting"
style={
Object {
"height": "100%",
Expand All @@ -380,27 +448,38 @@ Array [
}
>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting wxc-remote-media--remote-video-n-share"
className="wxc wxc-meeting-info wxc-in-meeting__info"
>
<Draggable
bounds="parent"
<div
className="wxc wxc-spinner"
style={
Object {
"height": 38,
"width": 38,
}
}
/>
</div>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting"
>
<div
className="wxc wxc-badge wxc-remote-media__connecting-badge"
style={Object {}}
>
<video
autoPlay={true}
className="wxc-remote-media__video wxc-remote-media__remote-video"
muted={true}
playsInline={true}
<div
className="wxc wxc-spinner wxc-remote-media__connecting-spinner"
style={
Object {
"height": 16,
"width": 16,
}
}
/>
</Draggable>
<video
autoPlay={true}
className="wxc-remote-media__video wxc-remote-media__remote-share"
muted={true}
playsInline={true}
/>
<audio
autoPlay={true}
/>
<span>
Connecting
</span>
</div>
</div>
<div
className="wxc wxc-local-media wxc-in-meeting__local-media-in-meeting wxc-local-media--no-media"
Expand Down Expand Up @@ -475,19 +554,39 @@ Array [
}
}
>
<div
className="wxc wxc-meeting-info wxc-in-meeting__info"
>
<div
className="wxc wxc-spinner"
style={
Object {
"height": 38,
"width": 38,
}
}
/>
</div>
<div
className="wxc wxc-remote-media wxc-in-meeting__remote-media-in-meeting"
>
<Draggable
bounds="parent"
<div
className="wxc wxc-badge wxc-remote-media__connecting-badge"
style={Object {}}
>
<video
autoPlay={true}
className="wxc-remote-media__video wxc-remote-media__remote-video"
muted={true}
playsInline={true}
<div
className="wxc wxc-spinner wxc-remote-media__connecting-spinner"
style={
Object {
"height": 16,
"width": 16,
}
}
/>
</Draggable>
<span>
Connecting
</span>
</div>
</div>
<div
className="wxc wxc-local-media wxc-in-meeting__local-media-in-meeting wxc-local-media--no-media"
Expand Down