@instructure/canvas-rce 5.11.1 → 5.12.1

package/CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 5.12.1 - 2024-01-26
+
+### Fixed
+
+- An issue where we were adding file verifiers unnecessarily to non-user files
+  which were allowing students access to course files they should not have
+  access to
+- An issue where type query parameter was duplicated.
+- Fix focus ring in RCE content
+- Stop adding wrap params to course links
+
+### Changed
+
+- Bump redux-thunk to 3.1.0
+- Show full name in hover in All Files tray
+- Remove "scroll-into-view"
+- jQuery changes
+- Upgrade moment to 0.5.43
+- Upgrade babel-loader to 9.1.3
+- Remove use of InferType
+- Show media captions in New Quizzes
+- Bump Instui to 8.49
+
+
 ## 5.11.1 - 2023-10-12
 
 ### Fixed

package/es/canvasFileBrowser/FileBrowser.js

@@ -340,9 +340,14 @@ class FileBrowser extends React.Component {
       itemIcon = getIconFromType(file.type);
     }
 
+    const containerRef = node => {
+      if (node && !node.title && props.name) node.title = props.name;
+    };
+
     return { ...props,
       thumbnail,
-      itemIcon
+      itemIcon,
+      containerRef
     };
   }
 

package/es/common/fileUrl.js

@@ -104,9 +104,11 @@ export function fixupFileUrl(contextType, contextId, fileInfo, canvasOrigin) {
     parsed = changeDownloadToWrapParams(parsed);
     parsed = addContext(parsed, contextType, contextId); // if this is a user file, add the verifier
 
-    if (fileInfo.uuid && (contextType.includes('user') || !!canvasOrigin && canvasOrigin !== window.location.origin)) {
+    if (fileInfo.uuid && contextType.includes('user')) {
       delete parsed.search;
       parsed.query.verifier = fileInfo.uuid;
+    } else {
+      delete parsed.query.verifier;
     }
 
     fileInfo[key] = format(parsed);
@@ -136,8 +138,6 @@ export function prepEmbedSrc(url) {
   return format(parsed);
 } // when the user opens a link to a resource, we want its view
 // logged, so remove /preview
-// Add wrap=1 to indicate clicking on the link should open a preview
-// and not download the file (this doesn't work if the original link is a download link)
 
 export function prepLinkedSrc(url) {
   const parsed = parseCanvasUrl(url);
@@ -148,6 +148,5 @@ export function prepLinkedSrc(url) {
 
   delete parsed.search;
   parsed.pathname = parsed.pathname.replace(/\/preview(\?|$)/, '$1');
-  parsed.query.wrap = '1';
   return format(parsed);
 }

package/es/defaultTinymceConfig.js

@@ -71,7 +71,7 @@ const defaultTinymceConfig = {
   // then edited.
   //
   // this list needs to be kept in sync with the list in gems/canvas_sanitize/lib/canvas_sanitize/canvas_sanitize.rb
-  valid_elements: '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|role],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class],strong/b,em/i,strike/s,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt|title|hspace|vspace|width|height|align|role],-sub,-sup,-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value|_value],embed[type|width|height|src|*],map[name],area[shape|coords|href|alt|target],bdo,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,kbd,q[cite],samp,small,tt,var,big,figure,figcaption,source[media|sizes|src|srcset|type],track,mark,article,aside,details,footer,header,nav,section,summary,time',
+  valid_elements: '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|role],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class],strong/b,em/i,strike/s,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt|title|hspace|vspace|width|height|align|role],-sub,-sup,-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value|_value],embed[type|width|height|src|*],map[name],area[shape|coords|href|alt|target],bdo,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,kbd,q[cite],samp,small,tt,var,big,figure,figcaption,source[media|width|height|sizes|src|srcset|type],track,mark,article,aside,details,footer,header,nav,section,summary,time',
   extended_valid_elements: '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|contextmenu|draggable|dropzone|hidden|longdesc|spellcheck|translate|align|role|aria-labelledby|aria-atomic|aria-busy|aria-controls|aria-describedby|aria-disabled|aria-dropeffect|aria-flowto|aria-grabbed|aria-haspopup|aria-hidden|aria-invalid|aria-label|aria-labelledby|aria-live|aria-owns|aria-relevant|aria-autocomplete|aria-checked|aria-disabled|aria-expanded|aria-haspopup|aria-hidden|aria-invalid|aria-label|aria-level|aria-multiline|aria-multiselectable|aria-orientation|aria-pressed|aria-readonly|aria-required|aria-selected|aria-sort|aria-valuemax|aria-valuemin|aria-valuenow|aria-valuetext],iframe[id|data-media-type|title|src|width|height|name|align|style|class|sandbox|allowfullscreen|webkitallowfullscreen|mozallowfullscreen|allow],i[iclass],a[hidden|href|target|rel|media|hreflang|type|charset|name|rev|shape|coords|download|alt],#p,li[value],-ol[reversed|start|type|compact],pre[width],table[border|summary|width|frame|rules|cellspacing|cellpadding|bgcolor],tbody[char|charoff|valign],td[colspan|rowspan|headers|abbr|axis|scope|align|char|charoff|valign|nowrap|bgcolor|width|height],tfoot[char|charoff|valign],th[colspan|rowspan|headers|scope|abbr|axis|align|char|charoff|valign|nowrap|bgcolor|width|height],thead[char|charoff|valign],tr[char|charoff|valign|bgcolor],-ul[compact],video[name|src|allowfullscreen|muted|poster|width|height|controls|playsinline],audio[name|src|muted|controls],annotation[href|xref|definitionURL|encoding|cd|name|src],annotation-xml[href|xref|definitionURL|encoding|cd|name|src],maction[href|xref|mathcolor|mathbackground|actiontype|selection],maligngroup[href|xref|mathcolor|mathbackground|groupalign],malignmark[href|xref|mathcolor|mathbackground|edge],math[xmlns|href|xref|display|maxwidth|overflow|altimg|altimg-width|altimg-height|altimg-valign|alttext|cdgroup|mathcolor|mathbackground|scriptlevel|displaystyle|scriptsizemultiplier|scriptminsize|infixlinebreakstyle|decimalpoint|mathvariant|mathsize|width|height|valign|form|fence|separator|lspace|rspace|stretchy|symmetric|maxsize|minsize|largeop|movablelimits|accent|linebreak|lineleading|linebreakstyle|linebreakmultchar|indentalign|indentshift|indenttarget|indentalignfirst|indentshiftfirst|indentalignlast|indentshiftlast|depth|lquote|rquote|linethickness|munalign|denomalign|bevelled|voffset|open|close|separators|notation|subscriptshift|superscriptshift|accentunder|align|rowalign|columnalign|groupalign|alignmentscope|columnwidth|rowspacing|columnspacing|rowlines|columnlines|frame|framespacing|equalrows|equalcolumns|side|minlabelspacing|rowspan|columnspan|edge|stackalign|charalign|charspacing|longdivstyle|position|shift|location|crossout|length|leftoverhang|rightoverhang|mslinethickness|selection],menclose[href|xref|mathcolor|mathbackground|notation],merror[href|xref|mathcolor|mathbackground],mfenced[href|xref|mathcolor|mathbackground|open|close|separators],mfrac[href|xref|mathcolor|mathbackground|linethickness|munalign|denomalign|bevelled],mglyph[href|xref|mathcolor|mathbackground|src|alt|width|height|valign],mi[href|xref|mathcolor|mathbackground|mathvariant|mathsize],mlabeledtr[href|xref|mathcolor|mathbackground],mlongdiv[href|xref|mathcolor|mathbackground|longdivstyle|align|stackalign|charalign|charspacing],mmultiscripts[href|xref|mathcolor|mathbackground|subscriptshift|superscriptshift],mn[href|xref|mathcolor|mathbackground|mathvariant|mathsize],mo[href|xref|mathcolor|mathbackground|mathvariant|mathsize|form|fence|separator|lspace|rspace|stretchy|symmetric|maxsize|minsize|largeop|movablelimits|accent|linebreak|lineleading|linebreakstyle|linebreakmultchar|indentalign|indentshift|indenttarget|indentalignfirst|indentshiftfirst|indentalignlast|indentshiftlast],mover[href|xref|mathcolor|mathbackground|accent|align],mpadded[href|xref|mathcolor|mathbackground|height|depth|width|lspace|voffset],mphantom[href|xref|mathcolor|mathbackground],mprescripts[href|xref|mathcolor|mathbackground],mroot[href|xref|mathcolor|mathbackground],mrow[href|xref|mathcolor|mathbackground],ms[href|xref|mathcolor|mathbackground|mathvariant|mathsize|lquote|rquote],mscarries[href|xref|mathcolor|mathbackground|position|location|crossout|scriptsizemultiplier],mscarry[href|xref|mathcolor|mathbackground|location|crossout],msgroup[href|xref|mathcolor|mathbackground|position|shift],msline[href|xref|mathcolor|mathbackground|position|length|leftoverhang|rightoverhang|mslinethickness],mspace[href|xref|mathcolor|mathbackground|mathvariant|mathsize],msqrt[href|xref|mathcolor|mathbackground],msrow[href|xref|mathcolor|mathbackground|position],mstack[href|xref|mathcolor|mathbackground|align|stackalign|charalign|charspacing],mstyle[href|xref|mathcolor|mathbackground|scriptlevel|displaystyle|scriptsizemultiplier|scriptminsize|infixlinebreakstyle|decimalpoint|mathvariant|mathsize|width|height|valign|form|fence|separator|lspace|rspace|stretchy|symmetric|maxsize|minsize|largeop|movablelimits|accent|linebreak|lineleading|linebreakstyle|linebreakmultchar|indentalign|indentshift|indenttarget|indentalignfirst|indentshiftfirst|indentalignlast|indentshiftlast|depth|lquote|rquote|linethickness|munalign|denomalign|bevelled|voffset|open|close|separators|notation|subscriptshift|superscriptshift|accentunder|align|rowalign|columnalign|groupalign|alignmentscope|columnwidth|rowspacing|columnspacing|rowlines|columnlines|frame|framespacing|equalrows|equalcolumns|side|minlabelspacing|rowspan|columnspan|edge|stackalign|charalign|charspacing|longdivstyle|position|shift|location|crossout|length|leftoverhang|rightoverhang|mslinethickness|selection],msub[href|xref|mathcolor|mathbackground|subscriptshift],msubsup[href|xref|mathcolor|mathbackground|subscriptshift|superscriptshift],msup[href|xref|mathcolor|mathbackground|superscriptshift],mtable[href|xref|mathcolor|mathbackground|align|rowalign|columnalign|groupalign|alignmentscope|columnwidth|width|rowspacing|columnspacing|rowlines|columnlines|frame|framespacing|equalrows|equalcolumns|displaystyle|side|minlabelspacing],mtd[href|xref|mathcolor|mathbackground|rowspan|columnspan|rowalign|columnalign|groupalign],mtext[href|xref|mathcolor|mathbackground|mathvariant|mathsize|width|height|depth|linebreak],mtr[href|xref|mathcolor|mathbackground|rowalign|columnalign|groupalign],munder[href|xref|mathcolor|mathbackground|accentunder|align],munderover[href|xref|mathcolor|mathbackground|accent|accentunder|align],none[href|xref|mathcolor|mathbackground],semantics[href|xref|definitionURL|encoding],picture,ruby,rp,rt,wbr' + // the svg necessary for the uploading placeholder's spinner
   'svg[*],g[*],circle[*]',
   non_empty_elements: 'td th iframe video audio object script a i area base basefont br col frame hr img input isindex link meta param embed source wbr track ruby',

package/es/elementDenylist.js

@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+const elementDenylist = ('html,base,head,link,meta,style,title,body,main,data,rb,rtc,portal,svg,canvas,noscript,script,button,datalist,fieldset,form,input,label,legend,meter,optgroup' + ',option,output,progress,select,textarea,dialog,menu,slot,template,applet,basefont,bgsound,blink,center,content,dir,frame,frameset,hgroup,image,keygen,marquee,menuitem,nobr,noembed' + ',noframes,plaintext,rb,rtc,shadow,spacer,xmp').split(',');
+export default elementDenylist;

package/es/getThemeVars.js

@@ -24,7 +24,7 @@ let memoizedVariables;
 function getThemeVars() {
   if (memoizedVariables) return memoizedVariables;
   const {
-    defaultThemeKey,
+    currentThemeKey,
     overrides,
     themes
   } = getRegistry(); // Just assume the "canvas" theme if the default key is null. This will
@@ -33,11 +33,12 @@ function getThemeVars() {
   // Also we have to cloneDeep this because the merge below is about to
   // mutate the whole thing.
 
-  const variables = cloneDeep(themes[defaultThemeKey !== null && defaultThemeKey !== void 0 ? defaultThemeKey : 'canvas']);
+  const themeKey = currentThemeKey || 'canvas';
+  const variables = cloneDeep(themes[themeKey]);
   merge(variables, overrides);
   memoizedVariables = {
     variables,
-    key: defaultThemeKey
+    key: themeKey
   };
   return memoizedVariables;
 }

package/es/getTranslations.js

@@ -28,6 +28,10 @@ export default function getTranslations(locale) {
       let p;
 
       switch (locale) {
+        case 'ab':
+          p = import('./translations/locales/ab');
+          break;
+
         case 'ar':
           p = import('./translations/locales/ar');
           break;
@@ -36,6 +40,14 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/ca');
           break;
 
+        case 'cs':
+          p = import('./translations/locales/cs');
+          break;
+
+        case 'cs-CZ':
+          p = import('./translations/locales/cs_CZ');
+          break;
+
         case 'cy':
           p = import('./translations/locales/cy');
           break;
@@ -48,6 +60,10 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/da-x-k12');
           break;
 
+        case 'da-DK':
+          p = import('./translations/locales/da_DK');
+          break;
+
         case 'de':
           p = import('./translations/locales/de');
           break;
@@ -84,6 +100,18 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/en_GB');
           break;
 
+        case 'en-NZ':
+          p = import('./translations/locales/en_NZ');
+          break;
+
+        case 'en-SE':
+          p = import('./translations/locales/en_SE');
+          break;
+
+        case 'en-US':
+          p = import('./translations/locales/en_US');
+          break;
+
         case 'es':
           p = import('./translations/locales/es');
           break;
@@ -124,10 +152,22 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/hu');
           break;
 
+        case 'hu-HU':
+          p = import('./translations/locales/hu_HU');
+          break;
+
         case 'hy':
           p = import('./translations/locales/hy');
           break;
 
+        case 'id':
+          p = import('./translations/locales/id');
+          break;
+
+        case 'id-ID':
+          p = import('./translations/locales/id_ID');
+          break;
+
         case 'is':
           p = import('./translations/locales/is');
           break;
@@ -144,10 +184,26 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/ko');
           break;
 
+        case 'ko-KR':
+          p = import('./translations/locales/ko_KR');
+          break;
+
+        case 'lt':
+          p = import('./translations/locales/lt');
+          break;
+
+        case 'lt-LT':
+          p = import('./translations/locales/lt_LT');
+          break;
+
         case 'mi':
           p = import('./translations/locales/mi');
           break;
 
+        case 'mn-MN':
+          p = import('./translations/locales/mn_MN');
+          break;
+
         case 'ms':
           p = import('./translations/locales/ms');
           break;
@@ -164,6 +220,10 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/nl');
           break;
 
+        case 'nl-NL':
+          p = import('./translations/locales/nl_NL');
+          break;
+
         case 'nn':
           p = import('./translations/locales/nn');
           break;
@@ -180,6 +240,10 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/pt_BR');
           break;
 
+        case 'ro':
+          p = import('./translations/locales/ro');
+          break;
+
         case 'ru':
           p = import('./translations/locales/ru');
           break;
@@ -216,6 +280,10 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/th_TH');
           break;
 
+        case 'tl-PH':
+          p = import('./translations/locales/tl_PH');
+          break;
+
         case 'tr':
           p = import('./translations/locales/tr');
           break;
@@ -248,6 +316,14 @@ export default function getTranslations(locale) {
           p = import('./translations/locales/zh_HK');
           break;
 
+        case 'zh-TW':
+          p = import('./translations/locales/zh_TW');
+          break;
+
+        case 'zh-TW.Big5':
+          p = import('./translations/locales/zh_TW.Big5');
+          break;
+
         default:
           p = Promise.resolve(null);
       }
@@ -260,5 +336,5 @@ export default function getTranslations(locale) {
   return transReadyPromise;
 }
 export function getLocaleList() {
-  return ['ar', 'ca', 'cy', 'da', 'da-x-k12', 'de', 'el', 'en', 'en-AU-x-unimelb', 'en-GB-x-ukhe', 'en-AU', 'en-CA', 'en-CY', 'en-GB', 'es', 'es-ES', 'es-GT', 'fa-IR', 'fi', 'fr', 'fr-CA', 'he', 'ht', 'hu', 'hy', 'is', 'it', 'ja', 'ko', 'mi', 'ms', 'nb', 'nb-x-k12', 'nl', 'nn', 'pl', 'pt', 'pt-BR', 'ru', 'se', 'sl', 'sv', 'sv-x-k12', 'sv-SE', 'tg', 'th', 'th-TH', 'tr', 'uk-UA', 'vi', 'vi-VN', 'zh', 'zh-Hans', 'zh-Hant', 'zh-HK'];
+  return ['ab', 'ar', 'ca', 'cs', 'cs-CZ', 'cy', 'da', 'da-x-k12', 'da-DK', 'de', 'el', 'en', 'en-AU-x-unimelb', 'en-GB-x-ukhe', 'en-AU', 'en-CA', 'en-CY', 'en-GB', 'en-NZ', 'en-SE', 'en-US', 'es', 'es-ES', 'es-GT', 'fa-IR', 'fi', 'fr', 'fr-CA', 'he', 'ht', 'hu', 'hu-HU', 'hy', 'id', 'id-ID', 'is', 'it', 'ja', 'ko', 'ko-KR', 'lt', 'lt-LT', 'mi', 'mn-MN', 'ms', 'nb', 'nb-x-k12', 'nl', 'nl-NL', 'nn', 'pl', 'pt', 'pt-BR', 'ro', 'ru', 'se', 'sl', 'sv', 'sv-x-k12', 'sv-SE', 'tg', 'th', 'th-TH', 'tl-PH', 'tr', 'uk-UA', 'vi', 'vi-VN', 'zh', 'zh-Hans', 'zh-Hant', 'zh-HK', 'zh-TW', 'zh-TW.Big5'];
 }

package/es/rce/RCEWrapper.js

@@ -2552,9 +2552,6 @@ class RCEWrapper extends React.Component {
         }
       }
 
-      this.setState({
-        popupMountNode: instuiPopupMountNode()
-      });
       this.focusCurrentView();
     };
 
@@ -3099,8 +3096,7 @@ class RCEWrapper extends React.Component {
         prevHeight: _ht
       },
       a11yErrorsCount: 0,
-      shouldShowEditor: typeof IntersectionObserver === 'undefined' || maxInitRenderedRCEs <= 0 || currentRCECount < maxInitRenderedRCEs,
-      popupMountNode: instuiPopupMountNode()
+      shouldShowEditor: typeof IntersectionObserver === 'undefined' || maxInitRenderedRCEs <= 0 || currentRCECount < maxInitRenderedRCEs
     };
     this._statusBarId = `${this.state.id}_statusbar`;
     this.pendingEventHandlers = []; // Get top 2 favorited LTI Tools
@@ -4144,7 +4140,7 @@ class RCEWrapper extends React.Component {
         }),
         disabledPlugins: this.pluginsToExclude
       }), ((_this$props$trayProps10 = this.props.trayProps) === null || _this$props$trayProps10 === void 0 ? void 0 : _this$props$trayProps10.containingContext) && /*#__PURE__*/React.createElement(CanvasContentTray, Object.assign({
-        mountNode: this.state.popupMountNode,
+        mountNode: instuiPopupMountNode,
         key: this.id,
         canvasOrigin: this.getCanvasUrl(),
         bridge: bridge,

package/es/rce/StatusBar.js

@@ -165,7 +165,10 @@ export default function StatusBar(props) {
 
   function renderPath() {
     return /*#__PURE__*/React.createElement(View, {
-      "data-testid": "whole-status-bar-path"
+      "data-testid": "whole-status-bar-path",
+      style: {
+        display: 'flex'
+      }
     }, renderPathString(props));
   }
 
@@ -208,7 +211,10 @@ export default function StatusBar(props) {
     const message = props.editorView === PRETTY_HTML_EDITOR_VIEW ? formatMessage('Sadly, the pretty HTML editor is not keyboard accessible. Access the raw HTML editor here.') : formatMessage('Access the pretty HTML editor');
     const label = props.editorView === PRETTY_HTML_EDITOR_VIEW ? formatMessage('Switch to raw HTML Editor') : formatMessage('Switch to pretty HTML Editor');
     return /*#__PURE__*/React.createElement(View, {
-      "data-testid": "html-editor-message"
+      "data-testid": "html-editor-message",
+      style: {
+        display: 'flex'
+      }
     }, /*#__PURE__*/React.createElement(Button, {
       "data-btn-id": "rce-editormessage-btn",
       margin: "0 small",

package/es/rce/contentInsertion.js

@@ -17,7 +17,6 @@
  */
 import classnames from 'classnames';
 import { renderAudio, renderImage, renderLink, renderLinkedImage, renderVideo } from './contentRendering';
-import scroll from '../common/scroll';
 import { cleanUrl, getAnchorElement, isImageFigure, isOnlyTextSelected } from './contentInsertionUtils';
 import { mediaPlayerURLFromFile } from './plugins/shared/fileTypeUtils';
 import { absoluteToRelativeUrl } from '../common/fileUrl';
@@ -54,7 +53,11 @@ export function insertContent(editor, content) {
     // insertion should reference the newly created node (or first of the newly
     // created nodes if there were multiple, unfortunately), because the cursor
     // itself stays just before the new content.
-    scroll.scrollIntoViewWDelay(editor.iframeElement, {}); // there's a bug in tinymce where insertContent calls execCommand('mceInsertContent'),
+    setTimeout(() => {
+      if (editor.iframeElement) {
+        editor.iframeElement.scrollIntoView();
+      }
+    }, 100); // there's a bug in tinymce where insertContent calls execCommand('mceInsertContent'),
     // but doesn't correctly forward the second "args" argument. Let's go right for
     // execCommand
     // editor.insertContent(content, {skip_focus: true})

package/es/rce/plugins/instructure_documents/components/DocumentsPanel.js

@@ -16,8 +16,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import React, { useRef } from 'react';
-import { arrayOf, bool, func, shape, string, objectOf, oneOf } from 'prop-types';
-import { fileShape } from '../../shared/fileShape';
+import { func, shape, string, oneOf } from 'prop-types';
+import { contentTrayDocumentShape } from '../../shared/fileShape';
 import formatMessage from '../../../../format-message';
 import { Text } from '@instructure/ui-text';
 import { View } from '@instructure/ui-view';
@@ -111,13 +111,7 @@ DocumentsPanel.propTypes = {
   fetchInitialDocs: func.isRequired,
   fetchNextDocs: func.isRequired,
   onLinkClick: func.isRequired,
-  documents: objectOf(shape({
-    files: arrayOf(shape(fileShape)).isRequired,
-    bookmark: string,
-    hasMore: bool,
-    isLoading: bool,
-    error: string
-  })).isRequired,
+  documents: contentTrayDocumentShape.isRequired,
   sortBy: shape({
     sort: oneOf(['date_added', 'alphabetical']).isRequired,
     order: oneOf(['asc', 'desc']).isRequired

package/es/rce/plugins/instructure_html_view/plugin.js

@@ -17,8 +17,8 @@
  */
 import formatMessage from '../../../format-message';
 import clickCallback from './clickCallback';
-import tinymce from 'tinymce';
-// Register plugin
+import tinymce from 'tinymce'; // Register plugin
+
 tinymce.PluginManager.add('instructure_html_view', function (ed) {
   // Register commands
   ed.addCommand('instructureHtmlView', () => clickCallback()); // Register menu items

package/es/rce/plugins/instructure_icon_maker/components/SavedIconMakerList.js

@@ -18,7 +18,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { View } from '@instructure/ui-view';
-import Images, { RCSImageCollectionType } from '../../instructure_image/Images';
+import Images from '../../instructure_image/Images';
+import { contentTrayDocumentShape } from '../../shared/fileShape';
 import { ICON_MAKER_ICONS } from '../svg/constants';
 
 const SavedIconMakerList = props => {
@@ -69,7 +70,7 @@ SavedIconMakerList.propTypes = {
     sort: PropTypes.oneOf(['date_added', 'alphabetical']).isRequired,
     order: PropTypes.oneOf(['asc', 'desc']).isRequired
   }),
-  images: RCSImageCollectionType.isRequired,
+  images: contentTrayDocumentShape.isRequired,
   contextType: PropTypes.string.isRequired,
   searchString: PropTypes.string,
   onImageEmbed: PropTypes.func,

package/es/rce/plugins/instructure_image/ImageList/Image.js

@@ -16,7 +16,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import React from 'react';
-import { func, instanceOf, number, shape, string, bool } from 'prop-types';
+import { func, instanceOf, number, oneOfType, shape, string, bool } from 'prop-types';
 import { Img } from '@instructure/ui-img';
 import { Link } from '@instructure/ui-link';
 import { Text } from '@instructure/ui-text';
@@ -92,7 +92,7 @@ Image.propTypes = {
     display_name: string.isRequired,
     filename: string,
     href: string.isRequired,
-    id: number,
+    id: oneOfType([number, string]),
     preview_url: string,
     thumbnail_url: string.isRequired
   }).isRequired,

package/es/rce/plugins/instructure_image/Images/index.js

@@ -16,21 +16,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import React, { useRef } from 'react';
-import { arrayOf, bool, func, objectOf, oneOf, shape, string } from 'prop-types';
-import { fileShape } from '../../shared/fileShape';
+import { bool, func, oneOf, shape, string } from 'prop-types';
+import { contentTrayDocumentShape } from '../../shared/fileShape';
 import { Flex } from '@instructure/ui-flex';
 import { View } from '@instructure/ui-view';
 import { Text } from '@instructure/ui-text';
 import { LoadMoreButton, LoadingIndicator, LoadingStatus, useIncrementalLoading } from '../../../../common/incremental-loading';
 import ImageList from '../ImageList';
 import formatMessage from '../../../../format-message';
-export const RCSImageCollectionType = objectOf(shape({
-  files: arrayOf(shape(fileShape)).isRequired,
-  bookmark: string,
-  hasMore: bool.isRequired,
-  isLoading: bool.isRequired,
-  error: string
-}));
 
 function hasFiles(images) {
   return images.files.length > 0;
@@ -114,7 +107,7 @@ Images.propTypes = {
   fetchInitialImages: func.isRequired,
   fetchNextImages: func.isRequired,
   contextType: string.isRequired,
-  images: RCSImageCollectionType.isRequired,
+  images: contentTrayDocumentShape.isRequired,
   sortBy: shape({
     sort: oneOf(['date_added', 'alphabetical']).isRequired,
     order: oneOf(['asc', 'desc']).isRequired

package/es/rce/plugins/instructure_rce_external_tools/components/ExternalToolDialog/ExternalToolDialog.js

@@ -86,6 +86,9 @@ export default class ExternalToolDialog extends React.Component {
         if ((data === null || data === void 0 ? void 0 : data.subject) === 'LtiDeepLinkingResponse') {
           processEditorContentItems(ev, this.props.env, this);
         } else if ((data === null || data === void 0 ? void 0 : data.subject) === 'externalContentReady') {
+          // 'externalContentReady' is EXTERNAL_CONTENT_READY in
+          // ui/shared/external-tools/externalContentEvents.ts
+          // where events are also described/used
           this.handleExternalContentReady(ev.data);
         }
       }

package/es/rce/plugins/instructure_rce_external_tools/lti13-content-items/models/ResourceLinkContentItem.js

@@ -34,8 +34,10 @@ export default class ResourceLinkContentItem extends BaseLinkContentItem {
   }
 
   buildUrl() {
+    // iframed launches need canvas wrapped around them for postMessages to work
+    const display = this.iframe != null ? 'in_rce' : 'borderless';
     return addQueryParamsToUrl(this.context.ltiEndpoint, {
-      display: 'in_rce',
+      display,
       resource_link_lookup_uuid: this.lookup_uuid,
       [PARENT_FRAME_CONTEXT_PARAM]: this.context.containingCanvasLtiToolId
     });

package/es/rce/plugins/instructure_record/AudioOptionsTray/TrayController.js

@@ -101,6 +101,27 @@ export default class TrayController {
     });
   }
 
+  requestSubtitlesFromIframe(cb) {
+    var _this$_audioContainer, _this$_audioContainer2;
+
+    if (!bridge.canvasOrigin) return;
+    this._subtitleListener = new AbortController();
+    window.addEventListener('message', event => {
+      var _event$data;
+
+      if ((event === null || event === void 0 ? void 0 : (_event$data = event.data) === null || _event$data === void 0 ? void 0 : _event$data.subject) === "media_tracks_response") {
+        var _event$data2;
+
+        cb(event === null || event === void 0 ? void 0 : (_event$data2 = event.data) === null || _event$data2 === void 0 ? void 0 : _event$data2.payload);
+      }
+    }, {
+      signal: this._subtitleListener.signal
+    });
+    (_this$_audioContainer = this._audioContainer) === null || _this$_audioContainer === void 0 ? void 0 : (_this$_audioContainer2 = _this$_audioContainer.contentWindow) === null || _this$_audioContainer2 === void 0 ? void 0 : _this$_audioContainer2.postMessage({
+      subject: 'media_tracks_request'
+    }, bridge.canvasOrigin);
+  }
+
   _renderTray(trayProps) {
     const audioOptions = asAudioElement(this._audioContainer) || {};
     const element = /*#__PURE__*/React.createElement(AudioOptionsTray, {
@@ -109,8 +130,11 @@ export default class TrayController {
         this._isOpen = true;
       },
       onExited: () => {
+        var _this$_subtitleListen;
+
         bridge.focusActiveEditor(false);
         this._isOpen = false;
+        (_this$_subtitleListen = this._subtitleListener) === null || _this$_subtitleListen === void 0 ? void 0 : _this$_subtitleListen.abort();
       },
       onSave: options => {
         this._applyAudioOptions(options);
@@ -119,7 +143,8 @@ export default class TrayController {
       },
       onDismiss: () => this._dismissTray(),
       open: this._shouldOpen,
-      trayProps: trayProps
+      trayProps: trayProps,
+      requestSubtitlesFromIframe: cb => this.requestSubtitlesFromIframe(cb)
     });
     ReactDOM.render(element, this.container);
   }

package/es/rce/plugins/instructure_record/AudioOptionsTray/index.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { arrayOf, bool, func, shape, string } from 'prop-types';
 import { Flex } from '@instructure/ui-flex';
 import { Tray } from '@instructure/ui-tray';
@@ -39,9 +39,13 @@ export default function AudioOptionsTray(_ref) {
     onDismiss,
     onSave,
     trayProps,
-    audioOptions
+    audioOptions,
+    requestSubtitlesFromIframe
   } = _ref;
   const [subtitles, setSubtitles] = useState(audioOptions.tracks || []);
+  useEffect(() => {
+    if (subtitles.length === 0) requestSubtitlesFromIframe(setSubtitles);
+  }, []);
 
   const handleSave = (e, contentProps) => {
     onSave({
@@ -128,6 +132,7 @@ AudioOptionsTray.propTypes = {
   onDismiss: func,
   onSave: func,
   open: bool.isRequired,
+  requestSubtitlesFromIframe: func,
   trayProps: shape({
     host: string.isRequired,
     jwt: string.isRequired
@@ -144,5 +149,6 @@ AudioOptionsTray.defaultProps = {
   onEntered: null,
   onExited: null,
   onDismiss: null,
-  onSave: null
+  onSave: null,
+  requestSubtitlesFromIframe: () => {}
 };

package/es/rce/plugins/instructure_record/MediaPanel/index.js

@@ -16,8 +16,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import React, { useRef } from 'react';
-import { arrayOf, bool, func, objectOf, oneOf, shape, string } from 'prop-types';
-import { mediaObjectShape } from '../../shared/fileShape';
+import { func, oneOf, shape, string } from 'prop-types';
+import { contentTrayDocumentShape } from '../../shared/fileShape';
 import formatMessage from '../../../../format-message';
 import { Text } from '@instructure/ui-text';
 import { View } from '@instructure/ui-view';
@@ -114,13 +114,7 @@ MediaPanel.propTypes = {
   fetchInitialMedia: func.isRequired,
   fetchNextMedia: func.isRequired,
   onMediaEmbed: func.isRequired,
-  media: objectOf(shape({
-    files: arrayOf(shape(mediaObjectShape)).isRequired,
-    bookmark: string,
-    hasMore: bool,
-    isLoading: bool,
-    error: string
-  })).isRequired,
+  media: contentTrayDocumentShape.isRequired,
   sortBy: shape({
     sort: oneOf(['date_added', 'alphabetical']).isRequired,
     order: oneOf(['asc', 'desc']).isRequired