@instructure/canvas-rce 5.9.0 → 5.10.1

package/.mocharc.js

@@ -15,6 +15,13 @@
  * 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/>.
  */
+
+global.MutationObserver = class {
+  disconnect() {}
+
+  observe() {}
+}
+
 module.exports = {
   require: [
     '@instructure/canvas-theme',

package/CHANGELOG.md

@@ -5,6 +5,23 @@ 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.10.1 - 2023-12-01
+
+### Changed
+- Allow more fields from Canvas media object creation
+- Ensure postMessage works with RCE LTI launches
+
+## 5.10.0 - 2023-09-26
+
+### Fixed
+- An issue where media controls don't respond in Safari
+- An issue where embedded Studio videos cause unresponsiveness
+- A potential race condition in postMessage forwarding
+
+### Changed
+- Ignore a11y check on elements with a background image or gradient
+- Remove math processing percentage indicator
+
 ## 5.9.0 - 2023-08-30
 
 ### Fixed

package/es/enhance-user-content/enhance_user_content.js

@@ -216,8 +216,16 @@ export function enhanceUserContent() {
           iframeElem.setAttribute('src', addParentFrameContextToUrl(src, containingCanvasLtiToolId));
         }
       });
-    }
+    } // tell LTI tools that they are launching from within the active RCE
+
+
+    unenhanced_elem.querySelectorAll('iframe[src]').forEach(iframeElem => {
+      const src = iframeElem.getAttribute('src');
 
+      if (src.startsWith(canvasOrigin)) {
+        iframeElem.setAttribute('src', src.replace('display=in_rce', 'display=borderless'));
+      }
+    });
     unenhanced_elem.querySelectorAll('a:not(.not_external, .external)').forEach(childLink => {
       if (!isExternalLink(childLink, canvasOrigin)) return;
       if (childLink.tagName === 'IMG' || childLink.querySelectorAll('img').length > 0) return;

package/es/enhance-user-content/mathml.js

@@ -45,7 +45,8 @@ const localConfig = {
       }
     }
   },
-  showMathMenu: true
+  showMathMenu: true,
+  messageStyle: 'none'
 };
 
 class Mathml {
@@ -106,7 +107,7 @@ class Mathml {
           window.MathJax.Hub.Register.MessageHook('Math Processing Error', function (message) {
             var _elem$parentElement;
 
-            const elem = message[1]; // ".math_equation_latex" is the elem we added for MathJax to typeset the image equation
+            const elem = Array.isArray(message[1]) ? message[1][0] : message[1]; // ".math_equation_latex" is the elem we added for MathJax to typeset the image equation
 
             if ((_elem$parentElement = elem.parentElement) !== null && _elem$parentElement !== void 0 && _elem$parentElement.classList.contains('math_equation_latex')) {
               var _elem$parentElement$p;
@@ -123,7 +124,7 @@ class Mathml {
             }
           });
           window.MathJax.Hub.Register.MessageHook('End Math', function (message) {
-            const elem = message[1];
+            const elem = Array.isArray(message[1]) ? message[1][0] : message[1];
             mathImageHelper.removeStrayEquationImages(elem);
             mathImageHelper.nearlyInfiniteStyleFix(elem);
             elem.querySelectorAll('.math_equation_latex').forEach(m => m.classList.add('fade-in-equation'));
@@ -138,7 +139,8 @@ class Mathml {
           // Since we want to ignore <math> in .hidden-readable spans, let's remove the MathJunk™
           // right after MathJax adds it.
           window.MathJax.Hub.Register.MessageHook('End Math', function (message) {
-            $(message[1]).find('.hidden-readable [class^="MathJax"], .hidden-readable [id^="MathJax"]').remove();
+            const elm = Array.isArray(message[1]) ? message[1][0] : message[1];
+            $(elm).find('.hidden-readable [class^="MathJax"], .hidden-readable [id^="MathJax"]').remove();
           });
         } // leaving this here so I don't have to keep looking up how to see all messages
         // window.MathJax.Hub.Startup.signal.Interest(function (message) {
@@ -315,7 +317,8 @@ const mathImageHelper = {
   },
 
   catchEquationImages(refnode) {
-    // find equation images and replace with inline LaTeX
+    refnode = Array.isArray(refnode) ? refnode[0] : refnode; // find equation images and replace with inline LaTeX
+
     const eqimgs = refnode.querySelectorAll('img.equation_image');
 
     if (eqimgs.length > 0) {

package/es/rce/RCEWrapper.js

@@ -2714,48 +2714,9 @@ class RCEWrapper extends React.Component {
 
       this.checkAccessibility();
       this.fixToolbarKeyboardNavigation();
-      this.forwardPostMessages();
       (_this$props$onInitted = (_this$props = this.props).onInitted) === null || _this$props$onInitted === void 0 ? void 0 : _this$props$onInitted.call(_this$props, editor);
     };
 
-    this.forwardPostMessages = () => {
-      const windowReferences = {};
-      const rceWindow = this.editor.getWin(); // explicitly assign name for reference by parent window
-
-      rceWindow.name = `${RCEWrapper.editorFrameName}_${this.id}`;
-      rceWindow.addEventListener('message', this.forwardPostMessagesHandler(rceWindow, windowReferences));
-    };
-
-    this.forwardPostMessagesHandler = (rceWindow, windowReferences) => e => {
-      let message;
-
-      try {
-        message = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
-      } catch (err) {
-        // unparseable message may not be meant for our handlers
-        return false;
-      }
-
-      if (e.origin === rceWindow.origin) {
-        // message is from Canvas window, forward to tool
-        const targetOrigin = message.toolOrigin;
-
-        if (!targetOrigin) {
-          return false;
-        }
-
-        const targetWindow = windowReferences[targetOrigin];
-        delete message.toolOrigin;
-        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(message, targetOrigin);
-      } else {
-        // message is from tool, forward to Canvas window
-        windowReferences[e.origin] = e.source;
-        message.toolOrigin = e.origin;
-        message.frameName = rceWindow.name;
-        rceWindow.parent.postMessage(message, rceWindow.origin);
-      }
-    };
-
     this.fixToolbarKeyboardNavigation = () => {
       var _this$_elementRef$cur2;
 
@@ -4238,7 +4199,6 @@ RCEWrapper.defaultProps = {
   canvasOrigin: ''
 };
 RCEWrapper.skinCssInjected = false;
-RCEWrapper.editorFrameName = 'active_rce_frame';
 
 function mergeMenuItems(standard, custom) {
   var _custom$trim;

package/es/rce/plugins/instructure_equation/EquationEditorModal/parseLatex.js

@@ -68,8 +68,6 @@ export const parseLatex = editor => {
       };
     } catch (ex) {
       // probably failed to create the new URL
-      // eslint-disable-next-line no-console
-      console.error(ex);
       return {};
     }
   } else if (wholeText) {

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

@@ -18,7 +18,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import React from 'react';
-import { Flex } from '@instructure/ui-flex';
 import { Heading } from '@instructure/ui-heading';
 import { CloseButton } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
@@ -33,12 +32,12 @@ export function ExternalToolDialogModal(props) {
     onOpen: props.onOpen,
     onClose: props.onClose,
     mountNode: props.mountNode
-  }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Flex.Item, {
-    grow: true
-  }, /*#__PURE__*/React.createElement(Heading, null, props.name)), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
+  }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(Heading, null, props.name), /*#__PURE__*/React.createElement(CloseButton, {
+    placement: "end",
+    offset: "medium",
     onClick: props.onCloseButton,
     screenReaderLabel: formatMessage('Close')
-  })))), /*#__PURE__*/React.createElement(Modal.Body, {
+  })), /*#__PURE__*/React.createElement(Modal.Body, {
     padding: "0"
   }, /*#__PURE__*/React.createElement(View, {
     as: "div",

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

@@ -35,7 +35,7 @@ export default class ResourceLinkContentItem extends BaseLinkContentItem {
 
   buildUrl() {
     return addQueryParamsToUrl(this.context.ltiEndpoint, {
-      display: 'borderless',
+      display: 'in_rce',
       resource_link_lookup_uuid: this.lookup_uuid,
       [PARENT_FRAME_CONTEXT_PARAM]: this.context.containingCanvasLtiToolId
     });

package/es/rce/plugins/shared/CanvasContentTray.js

@@ -22,6 +22,7 @@ import { CloseButton, Button } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
 import { Spinner } from '@instructure/ui-spinner';
 import { Flex } from '@instructure/ui-flex';
+import { View } from '@instructure/ui-view';
 import ErrorBoundary from './ErrorBoundary';
 import Bridge from '../../../bridge/Bridge';
 import formatMessage from '../../../format-message';
@@ -463,19 +464,18 @@ export default function CanvasContentTray(props) {
   }, /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "medium",
     shadow: "above"
-  }, /*#__PURE__*/React.createElement(Flex, {
+  }, /*#__PURE__*/React.createElement(View, {
+    as: "div",
     margin: "none none medium none"
-  }, /*#__PURE__*/React.createElement(Flex.Item, {
-    shouldgrow: true,
-    shouldshrink: true
   }, /*#__PURE__*/React.createElement(Heading, {
     level: "h2"
-  }, getHeader())), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
+  }, getHeader()), /*#__PURE__*/React.createElement(CloseButton, {
     placement: "end",
+    offset: "medium",
     onClick: handleDismissTray,
     "data-testid": "CloseButton_ContentTray",
     screenReaderLabel: formatMessage('Close')
-  }))), isEditTray && /*#__PURE__*/React.createElement(LinkDisplay, {
+  })), isEditTray && /*#__PURE__*/React.createElement(LinkDisplay, {
     linkText: linkText,
     placeholderText: (link === null || link === void 0 ? void 0 : link.title) || placeholderText,
     linkFileName: (link === null || link === void 0 ? void 0 : link.title) || '',
@@ -492,8 +492,8 @@ export default function CanvasContentTray(props) {
     isContentLoading: isLoading(storeProps),
     use_rce_icon_maker: props.use_rce_icon_maker
   }))), /*#__PURE__*/React.createElement(Flex.Item, {
-    grow: true,
-    shrink: true,
+    shouldGrow: true,
+    shouldShrink: true,
     margin: "xx-small xxx-small 0",
     elementRef: el => scrollingAreaRef.current = el
   }, /*#__PURE__*/React.createElement(Flex, {

package/es/rce/plugins/shared/ContentSelection.js

@@ -32,7 +32,7 @@ export const DISPLAY_AS_EMBED = 'embed';
 export const DISPLAY_AS_EMBED_DISABLED = 'embed-disabled';
 export const DISPLAY_AS_DOWNLOAD_LINK = 'download-link';
 export function asImageEmbed($element) {
-  const nodeName = $element.nodeName.toLowerCase();
+  const nodeName = $element === null || $element === void 0 ? void 0 : $element.nodeName.toLowerCase();
 
   if (nodeName !== 'img') {
     return null;
@@ -44,9 +44,11 @@ export function asImageEmbed($element) {
   };
 }
 export function asLink($element, editor) {
+  var _$link;
+
   let $link = $element;
 
-  if ($link.tagName !== 'A') {
+  if (((_$link = $link) === null || _$link === void 0 ? void 0 : _$link.tagName) !== 'A') {
     // the user may have selected some text that is w/in a link
     // but didn't include the <a>. Let's see if that's true
     $link = editor.dom.getParent($link, 'a[href]');
@@ -213,7 +215,7 @@ function isMediaElement($element, mediaType) {
 
   // the video is hosted in an iframe, but tinymce
   // wraps it in a span with swizzled attribute names
-  if (!($element !== null && $element !== void 0 && $element.getAttribute)) {
+  if (!($element !== null && $element !== void 0 && $element.getAttribute) || !$element) {
     return false;
   }
 
@@ -242,6 +244,8 @@ export function isAudioElement($element) {
 export function findMediaPlayerIframe(elem) {
   var _elem$firstElementChi;
 
+  if (!elem) return null;
+
   if (elem.tagName === 'IFRAME') {
     // we have the iframe
     return elem;

package/es/rce/plugins/shared/ImageCropper/Preview.js

@@ -25,7 +25,6 @@ import { useMouseWheel } from './useMouseWheel';
 import { useKeyMouseTouchEvents } from './useKeyMouseEvents';
 import checkerboardStyle from '../CheckerboardStyling';
 import { View } from '@instructure/ui-view';
-import { getBrowser } from '../../../getBrowser';
 /**
  * Remove the node contents and append the svg element.
  */
@@ -86,17 +85,19 @@ export const Preview = _ref2 => {
     translateY: tempTranslateY,
     rotation,
     scaleRatio: tempScaleRatio
-  }); // Clip is not supported in Safari until v16.
+  });
+
+  function isSafariVersion15OrLesser() {
+    const match = /Version\/(\d+).+Safari/.exec(navigator.userAgent);
+    return match ? parseInt(match[1], 10) < 16 : false;
+  } // Clip is not supported in Safari until v16.
   // It's needed here to prevent a strange screenreader
   // behavior that makes the cropper look bad. 'hidden'
   // suffices when clip is not available, although it's not perfect
   // TODO: remove when Safari versions >= 16 are more commonplace
 
-  const {
-    name,
-    version
-  } = getBrowser();
-  const overflow = name === 'Safari' && parseFloat(version) < 16 ? 'hidden' : 'clip';
+
+  const overflow = isSafariVersion15OrLesser() ? 'hidden' : 'clip';
   return /*#__PURE__*/React.createElement("div", {
     style: {
       justifyContent: 'center',

package/es/rce/plugins/shared/LinkDisplay.js

@@ -81,8 +81,8 @@ export const LinkDisplay = _ref => {
     size: "x-small"
   }))), /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "0 x-small 0 0",
-    grow: true,
-    shrink: true,
+    shouldGrow: true,
+    shouldShrink: true,
     textAlign: "start"
   }, /*#__PURE__*/React.createElement(View, {
     as: "div"

package/es/rce/plugins/shared/fileTypeUtils.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 { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/es/rce/plugins/tinymce-a11y-checker/rules/large-text-contrast.js

@@ -30,6 +30,15 @@ export default {
       return true;
     }
 
+    for (let e = elem; e; e = e.parentElement) {
+      const bgimage = window.getComputedStyle(e).getPropertyValue('background-image');
+
+      if (bgimage !== 'none' && bgimage !== '') {
+        // ignore background images and gradients
+        return true;
+      }
+    }
+
     return contrast(elem);
   },
   data: smallTextContrast.data,

package/es/rce/plugins/tinymce-a11y-checker/rules/small-text-contrast.js

@@ -32,6 +32,15 @@ export default {
       return true;
     }
 
+    for (let e = elem; e; e = e.parentElement) {
+      const bgimage = window.getComputedStyle(e).getPropertyValue('background-image');
+
+      if (bgimage !== 'none' && bgimage !== '') {
+        // ignore background images and gradients
+        return true;
+      }
+    }
+
     return contrast(elem);
   },
   data: elem => {

package/es/rce/transformContent.js

@@ -60,6 +60,14 @@ export function transformRceContentForEditing(inputHtml, options) {
     for (const attributeName of attributeNamesToRemove) {
       element.removeAttribute(attributeName);
     }
+  }); // fixup LTI iframe launches to use the `in_rce` display type
+
+  container.querySelectorAll('iframe[src]').forEach(element => {
+    const src = element.getAttribute('src');
+
+    if (src !== null && src !== void 0 && src.includes('display=borderless')) {
+      element.setAttribute('src', src.replace('display=borderless', 'display=in_rce'));
+    }
   });
   return container.innerHTML;
 }

package/es/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/es/translations/locales/de.js

@@ -373,7 +373,7 @@ const locale = {
     "message": "{ count, plural,\n    one {# Objekt geladen}\n  other {# Objekte geladen}\n}"
   },
   "course_documents_104d76e0": {
-    "message": "Kursunterlagen"
+    "message": "Kursdokumente"
   },
   "course_files_62deb8f8": {
     "message": "Kursdateien"
@@ -2278,16 +2278,16 @@ const locale = {
     "message": "Wird von Screenreadern verwendet, um das Video zu beschreiben."
   },
   "user_documents_c206e61f": {
-    "message": "Benutzer*in Dokumente"
+    "message": "Meine Dokumente"
   },
   "user_files_78e21703": {
     "message": "Benutzerdateien"
   },
   "user_images_b6490852": {
-    "message": "Benutzerbilder"
+    "message": "Meine Bilder"
   },
   "user_media_14fbf656": {
-    "message": "Nutzer-Medien"
+    "message": "Meine Medien"
   },
   "vector_notation_cf6086ab": {
     "message": "Vektor (Notation)"

package/jest/jest-setup.js

@@ -41,7 +41,6 @@ const ignoredErrors = [
   /The prop `videoOptions.naturalHeight` is marked as required in `VideoOptionsTray`/,
   /The prop `sortBy.order` is marked as required in `MediaPanel`/,
   /Invalid prop `images.searchString` of type `string` supplied to `Images`/,
-  /Invalid URL: undefined/,
   /failed updating video captions/,
   /You seem to have overlapping act\(\) calls/,
   /A theme registry has already been initialized/,

package/lib/enhance-user-content/enhance_user_content.js

@@ -216,8 +216,16 @@ export function enhanceUserContent() {
           iframeElem.setAttribute('src', addParentFrameContextToUrl(src, containingCanvasLtiToolId));
         }
       });
-    }
+    } // tell LTI tools that they are launching from within the active RCE
+
+
+    unenhanced_elem.querySelectorAll('iframe[src]').forEach(iframeElem => {
+      const src = iframeElem.getAttribute('src');
 
+      if (src.startsWith(canvasOrigin)) {
+        iframeElem.setAttribute('src', src.replace('display=in_rce', 'display=borderless'));
+      }
+    });
     unenhanced_elem.querySelectorAll('a:not(.not_external, .external)').forEach(childLink => {
       if (!isExternalLink(childLink, canvasOrigin)) return;
       if (childLink.tagName === 'IMG' || childLink.querySelectorAll('img').length > 0) return;

package/lib/enhance-user-content/mathml.js

@@ -45,7 +45,8 @@ const localConfig = {
       }
     }
   },
-  showMathMenu: true
+  showMathMenu: true,
+  messageStyle: 'none'
 };
 
 class Mathml {
@@ -106,7 +107,7 @@ class Mathml {
           window.MathJax.Hub.Register.MessageHook('Math Processing Error', function (message) {
             var _elem$parentElement;
 
-            const elem = message[1]; // ".math_equation_latex" is the elem we added for MathJax to typeset the image equation
+            const elem = Array.isArray(message[1]) ? message[1][0] : message[1]; // ".math_equation_latex" is the elem we added for MathJax to typeset the image equation
 
             if ((_elem$parentElement = elem.parentElement) !== null && _elem$parentElement !== void 0 && _elem$parentElement.classList.contains('math_equation_latex')) {
               var _elem$parentElement$p;
@@ -123,7 +124,7 @@ class Mathml {
             }
           });
           window.MathJax.Hub.Register.MessageHook('End Math', function (message) {
-            const elem = message[1];
+            const elem = Array.isArray(message[1]) ? message[1][0] : message[1];
             mathImageHelper.removeStrayEquationImages(elem);
             mathImageHelper.nearlyInfiniteStyleFix(elem);
             elem.querySelectorAll('.math_equation_latex').forEach(m => m.classList.add('fade-in-equation'));
@@ -138,7 +139,8 @@ class Mathml {
           // Since we want to ignore <math> in .hidden-readable spans, let's remove the MathJunk™
           // right after MathJax adds it.
           window.MathJax.Hub.Register.MessageHook('End Math', function (message) {
-            $(message[1]).find('.hidden-readable [class^="MathJax"], .hidden-readable [id^="MathJax"]').remove();
+            const elm = Array.isArray(message[1]) ? message[1][0] : message[1];
+            $(elm).find('.hidden-readable [class^="MathJax"], .hidden-readable [id^="MathJax"]').remove();
           });
         } // leaving this here so I don't have to keep looking up how to see all messages
         // window.MathJax.Hub.Startup.signal.Interest(function (message) {
@@ -315,7 +317,8 @@ const mathImageHelper = {
   },
 
   catchEquationImages(refnode) {
-    // find equation images and replace with inline LaTeX
+    refnode = Array.isArray(refnode) ? refnode[0] : refnode; // find equation images and replace with inline LaTeX
+
     const eqimgs = refnode.querySelectorAll('img.equation_image');
 
     if (eqimgs.length > 0) {

package/lib/rce/RCEWrapper.js

@@ -2714,48 +2714,9 @@ class RCEWrapper extends React.Component {
 
       this.checkAccessibility();
       this.fixToolbarKeyboardNavigation();
-      this.forwardPostMessages();
       (_this$props$onInitted = (_this$props = this.props).onInitted) === null || _this$props$onInitted === void 0 ? void 0 : _this$props$onInitted.call(_this$props, editor);
     };
 
-    this.forwardPostMessages = () => {
-      const windowReferences = {};
-      const rceWindow = this.editor.getWin(); // explicitly assign name for reference by parent window
-
-      rceWindow.name = `${RCEWrapper.editorFrameName}_${this.id}`;
-      rceWindow.addEventListener('message', this.forwardPostMessagesHandler(rceWindow, windowReferences));
-    };
-
-    this.forwardPostMessagesHandler = (rceWindow, windowReferences) => e => {
-      let message;
-
-      try {
-        message = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
-      } catch (err) {
-        // unparseable message may not be meant for our handlers
-        return false;
-      }
-
-      if (e.origin === rceWindow.origin) {
-        // message is from Canvas window, forward to tool
-        const targetOrigin = message.toolOrigin;
-
-        if (!targetOrigin) {
-          return false;
-        }
-
-        const targetWindow = windowReferences[targetOrigin];
-        delete message.toolOrigin;
-        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(message, targetOrigin);
-      } else {
-        // message is from tool, forward to Canvas window
-        windowReferences[e.origin] = e.source;
-        message.toolOrigin = e.origin;
-        message.frameName = rceWindow.name;
-        rceWindow.parent.postMessage(message, rceWindow.origin);
-      }
-    };
-
     this.fixToolbarKeyboardNavigation = () => {
       var _this$_elementRef$cur2;
 
@@ -4238,7 +4199,6 @@ RCEWrapper.defaultProps = {
   canvasOrigin: ''
 };
 RCEWrapper.skinCssInjected = false;
-RCEWrapper.editorFrameName = 'active_rce_frame';
 
 function mergeMenuItems(standard, custom) {
   var _custom$trim;

package/lib/rce/plugins/instructure_equation/EquationEditorModal/parseLatex.js

@@ -68,8 +68,6 @@ export const parseLatex = editor => {
       };
     } catch (ex) {
       // probably failed to create the new URL
-      // eslint-disable-next-line no-console
-      console.error(ex);
       return {};
     }
   } else if (wholeText) {

package/lib/rce/plugins/instructure_rce_external_tools/components/ExternalToolDialog/ExternalToolDialogModal.js

@@ -18,7 +18,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import React from 'react';
-import { Flex } from '@instructure/ui-flex';
 import { Heading } from '@instructure/ui-heading';
 import { CloseButton } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
@@ -33,12 +32,12 @@ export function ExternalToolDialogModal(props) {
     onOpen: props.onOpen,
     onClose: props.onClose,
     mountNode: props.mountNode
-  }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Flex.Item, {
-    grow: true
-  }, /*#__PURE__*/React.createElement(Heading, null, props.name)), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
+  }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(Heading, null, props.name), /*#__PURE__*/React.createElement(CloseButton, {
+    placement: "end",
+    offset: "medium",
     onClick: props.onCloseButton,
     screenReaderLabel: formatMessage('Close')
-  })))), /*#__PURE__*/React.createElement(Modal.Body, {
+  })), /*#__PURE__*/React.createElement(Modal.Body, {
     padding: "0"
   }, /*#__PURE__*/React.createElement(View, {
     as: "div",

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

@@ -35,7 +35,7 @@ export default class ResourceLinkContentItem extends BaseLinkContentItem {
 
   buildUrl() {
     return addQueryParamsToUrl(this.context.ltiEndpoint, {
-      display: 'borderless',
+      display: 'in_rce',
       resource_link_lookup_uuid: this.lookup_uuid,
       [PARENT_FRAME_CONTEXT_PARAM]: this.context.containingCanvasLtiToolId
     });