@instructure/canvas-rce 5.9.0 → 5.10.0

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,17 @@ 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.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/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

@@ -2719,7 +2719,7 @@ class RCEWrapper extends React.Component {
     };
 
     this.forwardPostMessages = () => {
-      const windowReferences = {};
+      const windowReferences = [];
       const rceWindow = this.editor.getWin(); // explicitly assign name for reference by parent window
 
       rceWindow.name = `${RCEWrapper.editorFrameName}_${this.id}`;
@@ -2734,25 +2734,44 @@ class RCEWrapper extends React.Component {
       } catch (err) {
         // unparseable message may not be meant for our handlers
         return false;
-      }
+      } // NOTE: the code to encode/decode `sourceToolInfo` is duplicated in
+      // the ui/features/post_message_forwarding/index.ts, and
+      // cannot be DRY'd because RCE is in a package
 
-      if (e.origin === rceWindow.origin) {
-        // message is from Canvas window, forward to tool
-        const targetOrigin = message.toolOrigin;
 
-        if (!targetOrigin) {
+      if (e.origin === rceWindow.origin) {
+        const {
+          sourceToolInfo,
+          ...messageWithoutSourceToolInfo
+        } = message;
+        const targetOrigin = sourceToolInfo === null || sourceToolInfo === void 0 ? void 0 : sourceToolInfo.origin;
+        const targetWindow = windowReferences[sourceToolInfo === null || sourceToolInfo === void 0 ? void 0 : sourceToolInfo.windowId];
+
+        if (!targetOrigin || !targetWindow) {
           return false;
         }
 
-        const targetWindow = windowReferences[targetOrigin];
-        delete message.toolOrigin;
-        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(message, targetOrigin);
+        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(messageWithoutSourceToolInfo, 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);
+        // We can't forward the whole `e.source` window in the postMessage,
+        // so we keep a list (`windowReferences`) of all windows we've received
+        // messages from, and include the index into that list as `windowId`
+        let windowId = windowReferences.indexOf(e.source);
+
+        if (windowId === -1) {
+          windowReferences.push(e.source);
+          windowId = windowReferences.length - 1;
+        }
+
+        const newMessage = { ...message,
+          sourceToolInfo: {
+            origin: e.origin,
+            windowId
+          },
+          frameName: rceWindow.name
+        };
+        rceWindow.parent.postMessage(newMessage, rceWindow.origin);
       }
     };
 

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/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/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/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/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

@@ -2719,7 +2719,7 @@ class RCEWrapper extends React.Component {
     };
 
     this.forwardPostMessages = () => {
-      const windowReferences = {};
+      const windowReferences = [];
       const rceWindow = this.editor.getWin(); // explicitly assign name for reference by parent window
 
       rceWindow.name = `${RCEWrapper.editorFrameName}_${this.id}`;
@@ -2734,25 +2734,44 @@ class RCEWrapper extends React.Component {
       } catch (err) {
         // unparseable message may not be meant for our handlers
         return false;
-      }
+      } // NOTE: the code to encode/decode `sourceToolInfo` is duplicated in
+      // the ui/features/post_message_forwarding/index.ts, and
+      // cannot be DRY'd because RCE is in a package
 
-      if (e.origin === rceWindow.origin) {
-        // message is from Canvas window, forward to tool
-        const targetOrigin = message.toolOrigin;
 
-        if (!targetOrigin) {
+      if (e.origin === rceWindow.origin) {
+        const {
+          sourceToolInfo,
+          ...messageWithoutSourceToolInfo
+        } = message;
+        const targetOrigin = sourceToolInfo === null || sourceToolInfo === void 0 ? void 0 : sourceToolInfo.origin;
+        const targetWindow = windowReferences[sourceToolInfo === null || sourceToolInfo === void 0 ? void 0 : sourceToolInfo.windowId];
+
+        if (!targetOrigin || !targetWindow) {
           return false;
         }
 
-        const targetWindow = windowReferences[targetOrigin];
-        delete message.toolOrigin;
-        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(message, targetOrigin);
+        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(messageWithoutSourceToolInfo, 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);
+        // We can't forward the whole `e.source` window in the postMessage,
+        // so we keep a list (`windowReferences`) of all windows we've received
+        // messages from, and include the index into that list as `windowId`
+        let windowId = windowReferences.indexOf(e.source);
+
+        if (windowId === -1) {
+          windowReferences.push(e.source);
+          windowId = windowReferences.length - 1;
+        }
+
+        const newMessage = { ...message,
+          sourceToolInfo: {
+            origin: e.origin,
+            windowId
+          },
+          frameName: rceWindow.name
+        };
+        rceWindow.parent.postMessage(newMessage, rceWindow.origin);
       }
     };
 

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/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/canvas-rce",
-  "version": "5.9.0",
+  "version": "5.10.0",
   "description": "A component wrapping Canvas's usage of Tinymce",
   "main": "es/index.js",
   "scripts": {
@@ -78,7 +78,7 @@
     "@instructure/debounce": "^7",
     "@instructure/emotion": "^8.38.1",
     "@instructure/k5uploader": "*",
-    "@instructure/media-capture": "~8.4.1-rc.16",
+    "@instructure/media-capture": "^9.0.0",
     "@instructure/ui-a11y-content": "^7",
     "@instructure/ui-a11y-utils": "^7",
     "@instructure/ui-alerts": "^7",
@@ -99,7 +99,7 @@
     "@instructure/ui-img": "^7",
     "@instructure/ui-link": "^7",
     "@instructure/ui-list": "^7",
-    "@instructure/ui-media-player": "7",
+    "@instructure/ui-media-player": "^9.0.0",
     "@instructure/ui-menu": "^7",
     "@instructure/ui-modal": "^7",
     "@instructure/ui-motion": "^7",
@@ -215,7 +215,7 @@
     "testcafe-browser-provider-selenium": "^1.2.0",
     "testcafe-react-selectors": "^3.3.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.2",
+    "typescript": "^5.2.2",
     "url-loader": "^4.1.1",
     "webpack": "^5",
     "webpack-merge": "^5",

package/es/rce/getBrowser.js

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2022 - 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/>.
- */
-// From packages/parse-browser-info/index.js
-export function getBrowser() {
-  const ua = navigator.userAgent;
-  let tem;
-  let M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
-
-  if (/trident/i.test(M[1])) {
-    tem = /\brv[ :]+(\d+)/g.exec(ua) || [];
-    return {
-      name: 'IE',
-      version: tem[1] || ''
-    };
-  }
-
-  if (M[1] === 'Chrome') {
-    tem = ua.match(/\bOPR|Edge\/(\d+)/);
-
-    if (tem != null) {
-      return {
-        name: 'Opera',
-        version: tem[1]
-      };
-    }
-  }
-
-  M = M[2] ? [M[1], M[2]] : [navigator.appName, navigator.appVersion, '-?'];
-
-  if ((tem = ua.match(/version\/(\d+)/i)) != null) {
-    M.splice(1, 1, tem[1]);
-  }
-
-  return {
-    name: M[0],
-    version: M[1]
-  };
-}

package/lib/rce/getBrowser.js

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2022 - 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/>.
- */
-// From packages/parse-browser-info/index.js
-export function getBrowser() {
-  const ua = navigator.userAgent;
-  let tem;
-  let M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
-
-  if (/trident/i.test(M[1])) {
-    tem = /\brv[ :]+(\d+)/g.exec(ua) || [];
-    return {
-      name: 'IE',
-      version: tem[1] || ''
-    };
-  }
-
-  if (M[1] === 'Chrome') {
-    tem = ua.match(/\bOPR|Edge\/(\d+)/);
-
-    if (tem != null) {
-      return {
-        name: 'Opera',
-        version: tem[1]
-      };
-    }
-  }
-
-  M = M[2] ? [M[1], M[2]] : [navigator.appName, navigator.appVersion, '-?'];
-
-  if ((tem = ua.match(/version\/(\d+)/i)) != null) {
-    M.splice(1, 1, tem[1]);
-  }
-
-  return {
-    name: M[0],
-    version: M[1]
-  };
-}