@webex/plugin-meetings 3.0.0-beta.263 → 3.0.0-beta.264
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/breakouts/breakout.js +1 -1
- package/dist/breakouts/index.js +1 -1
- package/dist/interpretation/index.js +1 -1
- package/dist/interpretation/siLanguage.js +1 -1
- package/dist/locus-info/mediaSharesUtils.js +15 -1
- package/dist/locus-info/mediaSharesUtils.js.map +1 -1
- package/dist/meeting/index.js +7 -2
- package/dist/meeting/index.js.map +1 -1
- package/package.json +19 -19
- package/src/locus-info/mediaSharesUtils.ts +16 -0
- package/src/meeting/index.ts +12 -1
- package/test/unit/spec/locus-info/mediaSharesUtils.ts +10 -0
- package/test/unit/spec/meeting/index.js +75 -42
package/dist/breakouts/index.js
CHANGED
|
@@ -1041,7 +1041,7 @@ var Breakouts = _webexCore.WebexPlugin.extend({
|
|
|
1041
1041
|
this.trigger(_constants.BREAKOUTS.EVENTS.ASK_RETURN_TO_MAIN);
|
|
1042
1042
|
}
|
|
1043
1043
|
},
|
|
1044
|
-
version: "3.0.0-beta.
|
|
1044
|
+
version: "3.0.0-beta.264"
|
|
1045
1045
|
});
|
|
1046
1046
|
var _default = Breakouts;
|
|
1047
1047
|
exports.default = _default;
|
|
@@ -21,7 +21,8 @@ MediaSharesUtils.parse = function (mediaShares) {
|
|
|
21
21
|
disposition: MediaSharesUtils.getContentDisposition(mediaShares),
|
|
22
22
|
annotation: MediaSharesUtils.getContentAnnotation(mediaShares),
|
|
23
23
|
url: MediaSharesUtils.getContentUrl(mediaShares),
|
|
24
|
-
shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares)
|
|
24
|
+
shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares),
|
|
25
|
+
deviceUrlSharing: MediaSharesUtils.getContentBeneficiaryDeviceUrl(mediaShares)
|
|
25
26
|
},
|
|
26
27
|
whiteboard: {
|
|
27
28
|
beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),
|
|
@@ -181,6 +182,19 @@ MediaSharesUtils.getShareInstanceId = function (mediaShares) {
|
|
|
181
182
|
return extractContent.floor.shareInstanceId;
|
|
182
183
|
};
|
|
183
184
|
|
|
185
|
+
/**
|
|
186
|
+
* get deviceUrl that is requesting the floor for media shares (content)
|
|
187
|
+
* @param {Object} mediaShares
|
|
188
|
+
* @returns {Object}
|
|
189
|
+
*/
|
|
190
|
+
MediaSharesUtils.getContentBeneficiaryDeviceUrl = function (mediaShares) {
|
|
191
|
+
var contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);
|
|
192
|
+
if (!contentFloor || !contentFloor.beneficiary || !contentFloor.beneficiary.deviceUrl) {
|
|
193
|
+
return null;
|
|
194
|
+
}
|
|
195
|
+
return contentFloor.beneficiary.deviceUrl;
|
|
196
|
+
};
|
|
197
|
+
|
|
184
198
|
/**
|
|
185
199
|
* get who is sharing from media shares (whiteboard)
|
|
186
200
|
* @param {Object} mediaShares
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["MediaSharesUtils","parse","mediaShares","content","beneficiaryId","getContentBeneficiaryId","disposition","getContentDisposition","annotation","getContentAnnotation","url","getContentUrl","shareInstanceId","getShareInstanceId","whiteboard","getWhiteboardBeneficiaryId","getWhiteboardDisposition","resourceUrl","getWhiteboardResourceUrl","getMediaShares","oldShare","newShare","previous","current","contentFloor","extractContentFloor","whiteboardFloor","extractWhiteboardFloor","extractContent","length","find","share","name","CONTENT","extractWhiteboard","WHITEBOARD","extractFloor","mediaStream","floor","beneficiary","id","undefined"],"sources":["mediaSharesUtils.ts"],"sourcesContent":["import {CONTENT, WHITEBOARD} from '../constants';\n\nconst MediaSharesUtils: any = {};\n\n/**\n * parses the relevant values for mediaShares: contentId, disposition\n * @param {Object} mediaShares\n * @returns {undefined}\n */\nMediaSharesUtils.parse = (mediaShares: object) => {\n if (mediaShares) {\n return {\n content: {\n beneficiaryId: MediaSharesUtils.getContentBeneficiaryId(mediaShares),\n disposition: MediaSharesUtils.getContentDisposition(mediaShares),\n annotation: MediaSharesUtils.getContentAnnotation(mediaShares),\n url: MediaSharesUtils.getContentUrl(mediaShares),\n shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares),\n },\n whiteboard: {\n beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),\n disposition: MediaSharesUtils.getWhiteboardDisposition(mediaShares),\n resourceUrl: MediaSharesUtils.getWhiteboardResourceUrl(mediaShares),\n },\n };\n }\n\n return null;\n};\n\n/**\n * get the previous and current mediaShares values parsed, as well as the boolean updates\n * @param {Object} oldShare\n * @param {Object} newShare\n * @returns {Object}\n * previous: {Object} old share, current: {Object} new share,\n */\nMediaSharesUtils.getMediaShares = (oldShare: object, newShare: object) => {\n const previous = oldShare && MediaSharesUtils.parse(oldShare);\n const current = newShare && MediaSharesUtils.parse(newShare);\n\n return {\n previous,\n current,\n };\n};\n\n/**\n * get the content floor disposition (released, granted)\n * @param {Object} mediaShares\n * @returns {Boolean} disposition\n */\nMediaSharesUtils.getContentDisposition = (mediaShares: object) => {\n const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);\n\n return contentFloor ? contentFloor.disposition : null;\n};\n\n/**\n * get the whiteboard floor disposition (released, granted)\n * @param {Object} mediaShares\n * @returns {Boolean} disposition\n */\nMediaSharesUtils.getWhiteboardDisposition = (mediaShares: object) => {\n const whiteboardFloor = MediaSharesUtils.extractWhiteboardFloor(mediaShares);\n\n return whiteboardFloor ? whiteboardFloor.disposition : null;\n};\n\n/**\n * extract the content property from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractContent = (mediaShares: any) => {\n if (!mediaShares || !mediaShares.length) {\n return null;\n }\n\n return mediaShares.find((share) => share.name === CONTENT) || null;\n};\n\n/**\n * extract the whiteboard property from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractWhiteboard = (mediaShares: any) => {\n if (!mediaShares || !mediaShares.length) {\n return null;\n }\n\n return mediaShares.find((share) => share.name === WHITEBOARD) || null;\n};\n\n/**\n * extract the media stream floor property from content object\n * @param {Object} mediaStream\n * @returns {Object}\n */\nMediaSharesUtils.extractFloor = (mediaStream: any) => {\n if (!mediaStream) {\n return null;\n }\n\n return mediaStream.floor;\n};\n\n/**\n * extract the content's floor from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractContentFloor = (mediaShares: object) => {\n const content = MediaSharesUtils.extractContent(mediaShares);\n\n return MediaSharesUtils.extractFloor(content);\n};\n\n/**\n * extract the whiteboard's floor from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractWhiteboardFloor = (mediaShares: object) => {\n const whiteboard = MediaSharesUtils.extractWhiteboard(mediaShares);\n\n return MediaSharesUtils.extractFloor(whiteboard);\n};\n\n/**\n * get who is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getContentBeneficiaryId = (mediaShares: object) => {\n const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);\n\n if (!contentFloor || !contentFloor.beneficiary) {\n return null;\n }\n\n return contentFloor.beneficiary.id;\n};\n\n/**\n * get live annotation is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getContentAnnotation = (mediaShares: object) => {\n const extractContent = MediaSharesUtils.extractContent(mediaShares);\n\n if (!extractContent || !extractContent.annotation) {\n return undefined;\n }\n\n return extractContent.annotation;\n};\n\n/**\n * get url is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getContentUrl = (mediaShares: object) => {\n const extractContent = MediaSharesUtils.extractContent(mediaShares);\n\n if (!extractContent || !extractContent.url) {\n return undefined;\n }\n\n return extractContent.url;\n};\n\n/**\n * get shareInstanceId is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getShareInstanceId = (mediaShares: object) => {\n const extractContent = MediaSharesUtils.extractContent(mediaShares);\n\n if (!extractContent || !extractContent.floor || !extractContent.floor.shareInstanceId) {\n return undefined;\n }\n\n return extractContent.floor.shareInstanceId;\n};\n\n/**\n * get who is sharing from media shares (whiteboard)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getWhiteboardBeneficiaryId = (mediaShares: object) => {\n const whiteboardFloor = MediaSharesUtils.extractWhiteboardFloor(mediaShares);\n\n if (!whiteboardFloor || !whiteboardFloor.beneficiary) {\n return null;\n }\n\n return whiteboardFloor.beneficiary.id;\n};\n\n/**\n * get the which whiteboard is being shared via resource url\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getWhiteboardResourceUrl = (mediaShares: object) => {\n const whiteboard = MediaSharesUtils.extractWhiteboard(mediaShares);\n\n if (!whiteboard || !whiteboard.resourceUrl) {\n return null;\n }\n\n return whiteboard.resourceUrl;\n};\n\nexport default MediaSharesUtils;\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["MediaSharesUtils","parse","mediaShares","content","beneficiaryId","getContentBeneficiaryId","disposition","getContentDisposition","annotation","getContentAnnotation","url","getContentUrl","shareInstanceId","getShareInstanceId","deviceUrlSharing","getContentBeneficiaryDeviceUrl","whiteboard","getWhiteboardBeneficiaryId","getWhiteboardDisposition","resourceUrl","getWhiteboardResourceUrl","getMediaShares","oldShare","newShare","previous","current","contentFloor","extractContentFloor","whiteboardFloor","extractWhiteboardFloor","extractContent","length","find","share","name","CONTENT","extractWhiteboard","WHITEBOARD","extractFloor","mediaStream","floor","beneficiary","id","undefined","deviceUrl"],"sources":["mediaSharesUtils.ts"],"sourcesContent":["import {CONTENT, WHITEBOARD} from '../constants';\n\nconst MediaSharesUtils: any = {};\n\n/**\n * parses the relevant values for mediaShares: contentId, disposition\n * @param {Object} mediaShares\n * @returns {undefined}\n */\nMediaSharesUtils.parse = (mediaShares: object) => {\n if (mediaShares) {\n return {\n content: {\n beneficiaryId: MediaSharesUtils.getContentBeneficiaryId(mediaShares),\n disposition: MediaSharesUtils.getContentDisposition(mediaShares),\n annotation: MediaSharesUtils.getContentAnnotation(mediaShares),\n url: MediaSharesUtils.getContentUrl(mediaShares),\n shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares),\n deviceUrlSharing: MediaSharesUtils.getContentBeneficiaryDeviceUrl(mediaShares),\n },\n whiteboard: {\n beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),\n disposition: MediaSharesUtils.getWhiteboardDisposition(mediaShares),\n resourceUrl: MediaSharesUtils.getWhiteboardResourceUrl(mediaShares),\n },\n };\n }\n\n return null;\n};\n\n/**\n * get the previous and current mediaShares values parsed, as well as the boolean updates\n * @param {Object} oldShare\n * @param {Object} newShare\n * @returns {Object}\n * previous: {Object} old share, current: {Object} new share,\n */\nMediaSharesUtils.getMediaShares = (oldShare: object, newShare: object) => {\n const previous = oldShare && MediaSharesUtils.parse(oldShare);\n const current = newShare && MediaSharesUtils.parse(newShare);\n\n return {\n previous,\n current,\n };\n};\n\n/**\n * get the content floor disposition (released, granted)\n * @param {Object} mediaShares\n * @returns {Boolean} disposition\n */\nMediaSharesUtils.getContentDisposition = (mediaShares: object) => {\n const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);\n\n return contentFloor ? contentFloor.disposition : null;\n};\n\n/**\n * get the whiteboard floor disposition (released, granted)\n * @param {Object} mediaShares\n * @returns {Boolean} disposition\n */\nMediaSharesUtils.getWhiteboardDisposition = (mediaShares: object) => {\n const whiteboardFloor = MediaSharesUtils.extractWhiteboardFloor(mediaShares);\n\n return whiteboardFloor ? whiteboardFloor.disposition : null;\n};\n\n/**\n * extract the content property from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractContent = (mediaShares: any) => {\n if (!mediaShares || !mediaShares.length) {\n return null;\n }\n\n return mediaShares.find((share) => share.name === CONTENT) || null;\n};\n\n/**\n * extract the whiteboard property from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractWhiteboard = (mediaShares: any) => {\n if (!mediaShares || !mediaShares.length) {\n return null;\n }\n\n return mediaShares.find((share) => share.name === WHITEBOARD) || null;\n};\n\n/**\n * extract the media stream floor property from content object\n * @param {Object} mediaStream\n * @returns {Object}\n */\nMediaSharesUtils.extractFloor = (mediaStream: any) => {\n if (!mediaStream) {\n return null;\n }\n\n return mediaStream.floor;\n};\n\n/**\n * extract the content's floor from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractContentFloor = (mediaShares: object) => {\n const content = MediaSharesUtils.extractContent(mediaShares);\n\n return MediaSharesUtils.extractFloor(content);\n};\n\n/**\n * extract the whiteboard's floor from media shares\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.extractWhiteboardFloor = (mediaShares: object) => {\n const whiteboard = MediaSharesUtils.extractWhiteboard(mediaShares);\n\n return MediaSharesUtils.extractFloor(whiteboard);\n};\n\n/**\n * get who is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getContentBeneficiaryId = (mediaShares: object) => {\n const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);\n\n if (!contentFloor || !contentFloor.beneficiary) {\n return null;\n }\n\n return contentFloor.beneficiary.id;\n};\n\n/**\n * get live annotation is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getContentAnnotation = (mediaShares: object) => {\n const extractContent = MediaSharesUtils.extractContent(mediaShares);\n\n if (!extractContent || !extractContent.annotation) {\n return undefined;\n }\n\n return extractContent.annotation;\n};\n\n/**\n * get url is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getContentUrl = (mediaShares: object) => {\n const extractContent = MediaSharesUtils.extractContent(mediaShares);\n\n if (!extractContent || !extractContent.url) {\n return undefined;\n }\n\n return extractContent.url;\n};\n\n/**\n * get shareInstanceId is sharing from media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getShareInstanceId = (mediaShares: object) => {\n const extractContent = MediaSharesUtils.extractContent(mediaShares);\n\n if (!extractContent || !extractContent.floor || !extractContent.floor.shareInstanceId) {\n return undefined;\n }\n\n return extractContent.floor.shareInstanceId;\n};\n\n/**\n * get deviceUrl that is requesting the floor for media shares (content)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getContentBeneficiaryDeviceUrl = (mediaShares: object) => {\n const contentFloor = MediaSharesUtils.extractContentFloor(mediaShares);\n\n if (!contentFloor || !contentFloor.beneficiary || !contentFloor.beneficiary.deviceUrl) {\n return null;\n }\n\n return contentFloor.beneficiary.deviceUrl;\n};\n\n/**\n * get who is sharing from media shares (whiteboard)\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getWhiteboardBeneficiaryId = (mediaShares: object) => {\n const whiteboardFloor = MediaSharesUtils.extractWhiteboardFloor(mediaShares);\n\n if (!whiteboardFloor || !whiteboardFloor.beneficiary) {\n return null;\n }\n\n return whiteboardFloor.beneficiary.id;\n};\n\n/**\n * get the which whiteboard is being shared via resource url\n * @param {Object} mediaShares\n * @returns {Object}\n */\nMediaSharesUtils.getWhiteboardResourceUrl = (mediaShares: object) => {\n const whiteboard = MediaSharesUtils.extractWhiteboard(mediaShares);\n\n if (!whiteboard || !whiteboard.resourceUrl) {\n return null;\n }\n\n return whiteboard.resourceUrl;\n};\n\nexport default MediaSharesUtils;\n"],"mappings":";;;;;;;AAAA;AAEA,IAAMA,gBAAqB,GAAG,CAAC,CAAC;;AAEhC;AACA;AACA;AACA;AACA;AACAA,gBAAgB,CAACC,KAAK,GAAG,UAACC,WAAmB,EAAK;EAChD,IAAIA,WAAW,EAAE;IACf,OAAO;MACLC,OAAO,EAAE;QACPC,aAAa,EAAEJ,gBAAgB,CAACK,uBAAuB,CAACH,WAAW,CAAC;QACpEI,WAAW,EAAEN,gBAAgB,CAACO,qBAAqB,CAACL,WAAW,CAAC;QAChEM,UAAU,EAAER,gBAAgB,CAACS,oBAAoB,CAACP,WAAW,CAAC;QAC9DQ,GAAG,EAAEV,gBAAgB,CAACW,aAAa,CAACT,WAAW,CAAC;QAChDU,eAAe,EAAEZ,gBAAgB,CAACa,kBAAkB,CAACX,WAAW,CAAC;QACjEY,gBAAgB,EAAEd,gBAAgB,CAACe,8BAA8B,CAACb,WAAW;MAC/E,CAAC;MACDc,UAAU,EAAE;QACVZ,aAAa,EAAEJ,gBAAgB,CAACiB,0BAA0B,CAACf,WAAW,CAAC;QACvEI,WAAW,EAAEN,gBAAgB,CAACkB,wBAAwB,CAAChB,WAAW,CAAC;QACnEiB,WAAW,EAAEnB,gBAAgB,CAACoB,wBAAwB,CAAClB,WAAW;MACpE;IACF,CAAC;EACH;EAEA,OAAO,IAAI;AACb,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACAF,gBAAgB,CAACqB,cAAc,GAAG,UAACC,QAAgB,EAAEC,QAAgB,EAAK;EACxE,IAAMC,QAAQ,GAAGF,QAAQ,IAAItB,gBAAgB,CAACC,KAAK,CAACqB,QAAQ,CAAC;EAC7D,IAAMG,OAAO,GAAGF,QAAQ,IAAIvB,gBAAgB,CAACC,KAAK,CAACsB,QAAQ,CAAC;EAE5D,OAAO;IACLC,QAAQ,EAARA,QAAQ;IACRC,OAAO,EAAPA;EACF,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAzB,gBAAgB,CAACO,qBAAqB,GAAG,UAACL,WAAmB,EAAK;EAChE,IAAMwB,YAAY,GAAG1B,gBAAgB,CAAC2B,mBAAmB,CAACzB,WAAW,CAAC;EAEtE,OAAOwB,YAAY,GAAGA,YAAY,CAACpB,WAAW,GAAG,IAAI;AACvD,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAN,gBAAgB,CAACkB,wBAAwB,GAAG,UAAChB,WAAmB,EAAK;EACnE,IAAM0B,eAAe,GAAG5B,gBAAgB,CAAC6B,sBAAsB,CAAC3B,WAAW,CAAC;EAE5E,OAAO0B,eAAe,GAAGA,eAAe,CAACtB,WAAW,GAAG,IAAI;AAC7D,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAN,gBAAgB,CAAC8B,cAAc,GAAG,UAAC5B,WAAgB,EAAK;EACtD,IAAI,CAACA,WAAW,IAAI,CAACA,WAAW,CAAC6B,MAAM,EAAE;IACvC,OAAO,IAAI;EACb;EAEA,OAAO7B,WAAW,CAAC8B,IAAI,CAAC,UAACC,KAAK;IAAA,OAAKA,KAAK,CAACC,IAAI,KAAKC,kBAAO;EAAA,EAAC,IAAI,IAAI;AACpE,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAnC,gBAAgB,CAACoC,iBAAiB,GAAG,UAAClC,WAAgB,EAAK;EACzD,IAAI,CAACA,WAAW,IAAI,CAACA,WAAW,CAAC6B,MAAM,EAAE;IACvC,OAAO,IAAI;EACb;EAEA,OAAO7B,WAAW,CAAC8B,IAAI,CAAC,UAACC,KAAK;IAAA,OAAKA,KAAK,CAACC,IAAI,KAAKG,qBAAU;EAAA,EAAC,IAAI,IAAI;AACvE,CAAC;;AAED;AACA;AACA;AACA;AACA;AACArC,gBAAgB,CAACsC,YAAY,GAAG,UAACC,WAAgB,EAAK;EACpD,IAAI,CAACA,WAAW,EAAE;IAChB,OAAO,IAAI;EACb;EAEA,OAAOA,WAAW,CAACC,KAAK;AAC1B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAxC,gBAAgB,CAAC2B,mBAAmB,GAAG,UAACzB,WAAmB,EAAK;EAC9D,IAAMC,OAAO,GAAGH,gBAAgB,CAAC8B,cAAc,CAAC5B,WAAW,CAAC;EAE5D,OAAOF,gBAAgB,CAACsC,YAAY,CAACnC,OAAO,CAAC;AAC/C,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAH,gBAAgB,CAAC6B,sBAAsB,GAAG,UAAC3B,WAAmB,EAAK;EACjE,IAAMc,UAAU,GAAGhB,gBAAgB,CAACoC,iBAAiB,CAAClC,WAAW,CAAC;EAElE,OAAOF,gBAAgB,CAACsC,YAAY,CAACtB,UAAU,CAAC;AAClD,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAhB,gBAAgB,CAACK,uBAAuB,GAAG,UAACH,WAAmB,EAAK;EAClE,IAAMwB,YAAY,GAAG1B,gBAAgB,CAAC2B,mBAAmB,CAACzB,WAAW,CAAC;EAEtE,IAAI,CAACwB,YAAY,IAAI,CAACA,YAAY,CAACe,WAAW,EAAE;IAC9C,OAAO,IAAI;EACb;EAEA,OAAOf,YAAY,CAACe,WAAW,CAACC,EAAE;AACpC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA1C,gBAAgB,CAACS,oBAAoB,GAAG,UAACP,WAAmB,EAAK;EAC/D,IAAM4B,cAAc,GAAG9B,gBAAgB,CAAC8B,cAAc,CAAC5B,WAAW,CAAC;EAEnE,IAAI,CAAC4B,cAAc,IAAI,CAACA,cAAc,CAACtB,UAAU,EAAE;IACjD,OAAOmC,SAAS;EAClB;EAEA,OAAOb,cAAc,CAACtB,UAAU;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAR,gBAAgB,CAACW,aAAa,GAAG,UAACT,WAAmB,EAAK;EACxD,IAAM4B,cAAc,GAAG9B,gBAAgB,CAAC8B,cAAc,CAAC5B,WAAW,CAAC;EAEnE,IAAI,CAAC4B,cAAc,IAAI,CAACA,cAAc,CAACpB,GAAG,EAAE;IAC1C,OAAOiC,SAAS;EAClB;EAEA,OAAOb,cAAc,CAACpB,GAAG;AAC3B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAV,gBAAgB,CAACa,kBAAkB,GAAG,UAACX,WAAmB,EAAK;EAC7D,IAAM4B,cAAc,GAAG9B,gBAAgB,CAAC8B,cAAc,CAAC5B,WAAW,CAAC;EAEnE,IAAI,CAAC4B,cAAc,IAAI,CAACA,cAAc,CAACU,KAAK,IAAI,CAACV,cAAc,CAACU,KAAK,CAAC5B,eAAe,EAAE;IACrF,OAAO+B,SAAS;EAClB;EAEA,OAAOb,cAAc,CAACU,KAAK,CAAC5B,eAAe;AAC7C,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAZ,gBAAgB,CAACe,8BAA8B,GAAG,UAACb,WAAmB,EAAK;EACzE,IAAMwB,YAAY,GAAG1B,gBAAgB,CAAC2B,mBAAmB,CAACzB,WAAW,CAAC;EAEtE,IAAI,CAACwB,YAAY,IAAI,CAACA,YAAY,CAACe,WAAW,IAAI,CAACf,YAAY,CAACe,WAAW,CAACG,SAAS,EAAE;IACrF,OAAO,IAAI;EACb;EAEA,OAAOlB,YAAY,CAACe,WAAW,CAACG,SAAS;AAC3C,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA5C,gBAAgB,CAACiB,0BAA0B,GAAG,UAACf,WAAmB,EAAK;EACrE,IAAM0B,eAAe,GAAG5B,gBAAgB,CAAC6B,sBAAsB,CAAC3B,WAAW,CAAC;EAE5E,IAAI,CAAC0B,eAAe,IAAI,CAACA,eAAe,CAACa,WAAW,EAAE;IACpD,OAAO,IAAI;EACb;EAEA,OAAOb,eAAe,CAACa,WAAW,CAACC,EAAE;AACvC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA1C,gBAAgB,CAACoB,wBAAwB,GAAG,UAAClB,WAAmB,EAAK;EACnE,IAAMc,UAAU,GAAGhB,gBAAgB,CAACoC,iBAAiB,CAAClC,WAAW,CAAC;EAElE,IAAI,CAACc,UAAU,IAAI,CAACA,UAAU,CAACG,WAAW,EAAE;IAC1C,OAAO,IAAI;EACb;EAEA,OAAOH,UAAU,CAACG,WAAW;AAC/B,CAAC;AAAC,eAEanB,gBAAgB;AAAA"}
|
package/dist/meeting/index.js
CHANGED
|
@@ -2628,7 +2628,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
|
|
|
2628
2628
|
previousContentShare = (_payload$previous = payload.previous) === null || _payload$previous === void 0 ? void 0 : _payload$previous.content;
|
|
2629
2629
|
previousWhiteboardShare = (_payload$previous2 = payload.previous) === null || _payload$previous2 === void 0 ? void 0 : _payload$previous2.whiteboard;
|
|
2630
2630
|
_this14.triggerAnnotationInfoEvent(contentShare, previousContentShare);
|
|
2631
|
-
if (!(contentShare.beneficiaryId === (previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.beneficiaryId) && contentShare.disposition === (previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.disposition) && whiteboardShare.beneficiaryId === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.beneficiaryId) && whiteboardShare.disposition === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.disposition) && whiteboardShare.resourceUrl === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.resourceUrl))) {
|
|
2631
|
+
if (!(contentShare.beneficiaryId === (previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.beneficiaryId) && contentShare.disposition === (previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.disposition) && contentShare.deviceUrlSharing === previousContentShare.deviceUrlSharing && whiteboardShare.beneficiaryId === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.beneficiaryId) && whiteboardShare.disposition === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.disposition) && whiteboardShare.resourceUrl === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.resourceUrl))) {
|
|
2632
2632
|
_context6.next = 6;
|
|
2633
2633
|
break;
|
|
2634
2634
|
}
|
|
@@ -2640,10 +2640,15 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
|
|
|
2640
2640
|
newShareStatus = _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE;
|
|
2641
2641
|
}
|
|
2642
2642
|
// LOCAL - check if we started sharing content
|
|
2643
|
-
else if (_this14.selfId === contentShare.beneficiaryId && contentShare.disposition === _constants.FLOOR_ACTION.GRANTED) {
|
|
2643
|
+
else if (_this14.selfId === contentShare.beneficiaryId && contentShare.disposition === _constants.FLOOR_ACTION.GRANTED && contentShare.deviceUrlSharing === _this14.deviceUrl) {
|
|
2644
2644
|
// CONTENT - sharing content local
|
|
2645
2645
|
newShareStatus = _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE;
|
|
2646
2646
|
}
|
|
2647
|
+
// SAME USER REMOTE - check if same user started sharing content from another client
|
|
2648
|
+
else if (_this14.selfId === contentShare.beneficiaryId && contentShare.disposition === _constants.FLOOR_ACTION.GRANTED && contentShare.deviceUrlSharing !== _this14.deviceUrl) {
|
|
2649
|
+
// CONTENT - same user sharing content remote
|
|
2650
|
+
newShareStatus = _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE;
|
|
2651
|
+
}
|
|
2647
2652
|
// If we did not hit the cases above, no one is sharng content, so we check if we are sharing whiteboard
|
|
2648
2653
|
// There is no concept of local/remote share for whiteboard
|
|
2649
2654
|
// It does not matter who requested to share the whiteboard, everyone gets the same view
|