@webex/widgets 1.20.8 → 1.20.9

package/dist/webexWidgets.esm.js

@@ -11749,7 +11749,9 @@ function Ya(e) {
       m = l[1],
       p = (i || []).findIndex(function (e) {
     return e.key === r;
-  });
+  }),
+      d = zn();
+  zt(d, !0);
   return x.createElement("div", {
     className: u,
     style: a
@@ -11766,7 +11768,8 @@ function Ya(e) {
       }
     },
     "aria-label": "Use arrow keys to navigate between setting options",
-    role: "tablist"
+    role: "tablist",
+    ref: d
   }, i.map(function (e, t) {
     return x.createElement("li", {
       className: De(m("tab"), r === e.key && m("tab--active")),
@@ -12830,38 +12833,54 @@ class AudioControl extends MeetingControl {
     logger.debug('MEETING', meetingID, 'AudioControl::display()', ['called with', {
       meetingID
     }]);
-    const muted = {
-      ID: this.ID,
-      type: 'BUTTON',
-      icon: 'microphone-muted',
-      tooltip: 'Unmute audio',
-      state: i.ACTIVE,
-      text: 'Unmute'
-    };
-    const unmuted = {
+    const common = {
       ID: this.ID,
-      type: 'BUTTON',
-      icon: 'microphone',
-      tooltip: 'Mute audio',
-      state: i.INACTIVE,
-      text: 'Mute'
+      type: 'BUTTON'
     };
-    const disabled = {
-      ID: this.ID,
-      type: 'BUTTON',
-      icon: 'microphone-muted',
-      state: i.DISABLED,
-      text: 'No microphone'
+    const STATES = {
+      muted: {
+        icon: 'microphone-muted',
+        tooltip: 'Unmute audio',
+        state: i.ACTIVE,
+        text: 'Unmute'
+      },
+      unmuted: {
+        icon: 'microphone',
+        tooltip: 'Mute audio',
+        state: i.INACTIVE,
+        text: 'Mute'
+      },
+      muting: {
+        icon: 'microphone',
+        tooltip: 'Muting audio',
+        state: i.DISABLED,
+        text: 'Muting...'
+      },
+      unmuting: {
+        icon: 'microphone-muted',
+        tooltip: 'Unmuting audio',
+        state: i.DISABLED,
+        text: 'Unmuting...'
+      },
+      noMicrophone: {
+        icon: 'microphone-muted',
+        tooltip: 'No microphone available',
+        state: i.DISABLED,
+        text: 'No microphone'
+      }
     };
     return this.adapter.getMeeting(meetingID).pipe(map(_ref => {
       let {
         localAudio: {
-          stream
+          stream,
+          muting
         },
         disabledLocalAudio
       } = _ref;
-      return stream && unmuted || disabledLocalAudio && muted || disabled;
-    }), distinctUntilChanged(), tap(display => logger.debug('MEETING', meetingID, 'AudioControl::display()', ['emitting', display])));
+      return muting === true && STATES.muting || muting === false && STATES.unmuting || stream && STATES.unmuted || disabledLocalAudio && STATES.muted || STATES.noMicrophone;
+    }), distinctUntilChanged(), map(state => ({ ...common,
+      ...state
+    })), tap(display => logger.debug('MEETING', meetingID, 'AudioControl::display()', ['emitting', display])));
   }
 
 }
@@ -13402,38 +13421,54 @@ class VideoControl extends MeetingControl {
     logger.debug('MEETING', meetingID, 'VideoControl::display()', ['called with', {
       meetingID
     }]);
-    const muted = {
-      ID: this.ID,
-      type: 'BUTTON',
-      icon: 'camera-muted',
-      tooltip: 'Start video',
-      state: i.ACTIVE,
-      text: 'Start video'
-    };
-    const unmuted = {
+    const common = {
       ID: this.ID,
-      type: 'BUTTON',
-      icon: 'camera',
-      tooltip: 'Stop video',
-      state: i.INACTIVE,
-      text: 'Stop video'
+      type: 'BUTTON'
     };
-    const disabled = {
-      ID: this.ID,
-      type: 'BUTTON',
-      icon: 'camera-muted',
-      state: i.DISABLED,
-      text: 'No camera'
+    const STATES = {
+      muted: {
+        icon: 'camera-muted',
+        tooltip: 'Start video',
+        state: i.ACTIVE,
+        text: 'Start video'
+      },
+      unmuted: {
+        icon: 'camera',
+        tooltip: 'Stop video',
+        state: i.INACTIVE,
+        text: 'Stop video'
+      },
+      muting: {
+        icon: 'camera',
+        tooltip: 'Stopping video',
+        state: i.DISABLED,
+        text: 'Stopping...'
+      },
+      unmuting: {
+        icon: 'camera-muted',
+        tooltip: 'Starting video',
+        state: i.DISABLED,
+        text: 'Starting...'
+      },
+      noCamera: {
+        icon: 'camera-muted',
+        tooltip: 'No camera available',
+        state: i.DISABLED,
+        text: 'No camera'
+      }
     };
     return this.adapter.getMeeting(meetingID).pipe(map(_ref => {
       let {
         localVideo: {
-          stream
+          stream,
+          muting
         },
         disabledLocalVideo
       } = _ref;
-      return stream && unmuted || disabledLocalVideo && muted || disabled;
-    }), distinctUntilChanged(), tap(display => logger.debug('MEETING', meetingID, 'VideoControl::display()', ['emitting', display])));
+      return muting === true && STATES.muting || muting === false && STATES.unmuting || stream && STATES.unmuted || disabledLocalVideo && STATES.muted || STATES.noCamera;
+    }), distinctUntilChanged(), map(state => ({ ...common,
+      ...state
+    })), tap(display => logger.debug('MEETING', meetingID, 'VideoControl::display()', ['emitting', display])));
   }
 
 }
@@ -14098,6 +14133,35 @@ class MeetingsSDKAdapter extends d {
       logger.error('MEETING', ID, 'leaveMeeting()', 'Unable to leave', error);
     }
   }
+  /**
+   * Returns the status of the specified local media (audio or video) in the form of an object
+   * with the following mutually exclusive boolean properties:
+   * - `unmuted` - the media is unmuted
+   * - `muted` - the media is muted
+   * - `muting` - the media is currently being muted
+   * - `unmuting` - the media is currently being unmuted
+   * - `disabled` - the media is disabled (there is no available media device)
+   *
+   * @param {object} localMedia  The local media object from the meeting
+   * @param {MediaStream|null} disabledLocalMedia  The disabled media stream
+   * @returns {{muting: boolean}|{unmuting: boolean}|{unmuted: boolean}|{muted: boolean}|{disabled: boolean}} The local media state
+   */
+  // eslint-disable-next-line class-methods-use-this
+
+
+  getLocalMediaState(localMedia, disabledLocalMedia) {
+    return localMedia.muting === true && {
+      muting: true
+    } || localMedia.muting === false && {
+      unmuting: true
+    } || localMedia.stream && {
+      unmuted: true
+    } || disabledLocalMedia && {
+      muted: true
+    } || {
+      disabled: true
+    };
+  }
   /**
    * Attempts to mute the microphone of the given meeting ID.
    * If the microphone is successfully muted, an audio mute event is dispatched.
@@ -14111,15 +14175,42 @@ class MeetingsSDKAdapter extends d {
     logger.debug('MEETING', ID, 'handleLocalAudio()', ['called with', {
       ID
     }]);
+    let state; // local audio state
+    // sanity checks and "(un)muting in-progress" state
+
+    await this.updateMeeting(ID, meeting => {
+      let updates;
+      state = this.getLocalMediaState(meeting.localAudio, meeting.disabledLocalAudio);
+
+      if (state.disabled) {
+        throw new Error('Can\'t mute/unmute disabled audio');
+      } else if (state.muting) {
+        throw new Error('Already muting audio');
+      } else if (state.unmuting) {
+        throw new Error('Already unmuting audio');
+      } else if (state.unmuted) {
+        updates = {
+          localAudio: {
+            muting: true
+          }
+        };
+      } else if (state.muted) {
+        updates = {
+          localAudio: {
+            muting: false
+          }
+        };
+      }
+
+      return updates;
+    });
 
     try {
       await this.updateMeeting(ID, async (meeting, sdkMeeting) => {
         const isInSession = !!meeting.remoteAudio;
-        const audioDisabled = !!this.meetings[ID].disabledLocalAudio;
-        const audioEnabled = !!meeting.localAudio.stream;
         let updates;
 
-        if (audioEnabled) {
+        if (state.unmuted) {
           // Mute the audio only if there is an active meeting
           if (isInSession) {
             logger.debug('MEETING', ID, 'handleLocalAudio()', 'calling sdkMeeting.muteAudio()');
@@ -14131,10 +14222,11 @@ class MeetingsSDKAdapter extends d {
           updates = {
             disabledLocalAudio: meeting.localAudio.stream,
             localAudio: {
-              stream: null
+              stream: null,
+              muting: undefined
             }
           };
-        } else if (audioDisabled) {
+        } else if (state.muted) {
           // Unmute the audio only if there is an active meeting
           if (isInSession) {
             logger.debug('MEETING', ID, 'handleLocalAudio()', 'calling sdkMeeting.unmuteAudio()');
@@ -14146,7 +14238,8 @@ class MeetingsSDKAdapter extends d {
           updates = {
             disabledLocalAudio: null,
             localAudio: {
-              stream: meeting.disabledLocalAudio
+              stream: meeting.disabledLocalAudio,
+              muting: undefined
             }
           };
         }
@@ -14158,6 +14251,11 @@ class MeetingsSDKAdapter extends d {
       });
     } catch (error) {
       logger.error('MEETING', ID, 'handleLocalAudio()', 'Unable to update local audio settings', error);
+      this.updateMeeting(ID, () => ({
+        localAudio: {
+          muting: undefined
+        }
+      }));
     }
   }
   /**
@@ -14173,15 +14271,42 @@ class MeetingsSDKAdapter extends d {
     logger.debug('MEETING', ID, 'handleLocalVideo()', ['called with', {
       ID
     }]);
+    let state; // local video state
+    // sanity checks and "(un)muting in-progress" state
+
+    await this.updateMeeting(ID, meeting => {
+      let updates;
+      state = this.getLocalMediaState(meeting.localVideo, meeting.disabledLocalVideo);
+
+      if (state.disabled) {
+        throw new Error('Can\'t mute/unmute disabled video');
+      } else if (state.muting) {
+        throw new Error('Already muting video');
+      } else if (state.unmuting) {
+        throw new Error('Already unmuting video');
+      } else if (state.unmuted) {
+        updates = {
+          localVideo: {
+            muting: true
+          }
+        };
+      } else if (state.muted) {
+        updates = {
+          localVideo: {
+            muting: false
+          }
+        };
+      }
+
+      return updates;
+    });
 
     try {
       await this.updateMeeting(ID, async (meeting, sdkMeeting) => {
         const isInSession = !!meeting.remoteVideo;
-        const videoEnabled = !!meeting.localVideo.stream;
-        const videoDisabled = !!meeting.disabledLocalVideo;
         let updates;
 
-        if (videoEnabled) {
+        if (state.unmuted) {
           // Mute the video only if there is an active meeting
           if (isInSession) {
             logger.debug('MEETING', ID, 'handleLocalVideo()', 'calling sdkMeeting.muteVideo()');
@@ -14191,12 +14316,13 @@ class MeetingsSDKAdapter extends d {
 
 
           updates = {
+            disabledLocalVideo: meeting.localVideo.stream,
             localVideo: {
-              stream: null
-            },
-            disabledLocalVideo: meeting.localVideo.stream
+              stream: null,
+              muting: undefined
+            }
           };
-        } else if (videoDisabled) {
+        } else if (state.muted) {
           // Unmute the video only if there is an active meeting
           if (isInSession) {
             logger.debug('MEETING', ID, 'handleLocalVideo()', 'calling sdkMeeting.unmuteVideo()');
@@ -14206,10 +14332,11 @@ class MeetingsSDKAdapter extends d {
 
 
           updates = {
+            disabledLocalVideo: null,
             localVideo: {
-              stream: meeting.disabledLocalVideo
-            },
-            disabledLocalVideo: null
+              stream: meeting.disabledLocalVideo,
+              muting: undefined
+            }
           };
         }
 
@@ -14220,6 +14347,11 @@ class MeetingsSDKAdapter extends d {
       });
     } catch (error) {
       logger.error('MEETING', ID, 'handleLocalVideo()', 'Unable to update local video settings', error);
+      this.updateMeeting(ID, () => ({
+        localVideo: {
+          muting: undefined
+        }
+      }));
     }
   }
   /**
@@ -14611,15 +14743,14 @@ class MeetingsSDKAdapter extends d {
     if (!(ID in this.getMeetingObservables)) {
       const sdkMeeting = this.fetchMeeting(ID);
       const getMeeting$ = Observable.create(observer => {
-        if (this.meetings[ID]) {
+        if (sdkMeeting && this.meetings[ID]) {
           logger.debug('MEETING', ID, 'getMeeting()', ['initial meeting object', this.meetings[ID]]);
           observer.next(this.meetings[ID]);
+          observer.complete();
         } else {
           logger.error('MEETING', ID, 'getMeeting()', `Could not find meeting with ID "${ID}"`);
           observer.error(new Error(`Could not find meeting with ID "${ID}"`));
         }
-
-        observer.complete();
       });
       const meetingUpdateEvent$ = fromEvent(sdkMeeting, EVENT_MEETING_UPDATED).pipe(tap(() => logger.debug('MEETING', ID, 'getMeeting()', ['received', EVENT_MEETING_UPDATED, 'event'])), tap(meeting => {
         this.meetings[ID] = meeting;
@@ -15116,7 +15247,7 @@ var defineProperty = defineProperty$1;
 })(constants);
 
 var name = "@webex/sdk-component-adapter";
-var version = "1.92.0";
+var version = "1.93.0";
 const LOG_ARGS$1 = ['SDK-MEMBERSHIPS', `${name}-${version}`]; // max parameter value must be greater than 0 and less than or equal to 1000
 
 const MAX_MEMBERSHIPS = 1000; // TODO: Figure out how to import JS Doc definitions and remove duplication.
@@ -16151,7 +16282,7 @@ var WebexMeeting = ii(ni(WebexMeetingWidget), function (props) {
     },
     config: {
       appName: appName,
-      appVersion: "1.20.7"
+      appVersion: "1.20.8"
     }
   });
   return new WebexSDKAdapter(webex);