@instructure/canvas-rce 5.8.0 → 5.10.0

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/da-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Tilføj billede"
   },
+  "add_one_9e34a6f8": {
+    "message": "Tilføj en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Yderligere overvejelser"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Der blev ikke fundet nogen tilgængelighedsproblemer."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Der er ikke oprettet beskeder endnu."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ingen beskeder fundet."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Der er ikke oprettet opgaver endnu."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Ingen opgaver fundet."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ingen ændringer at gemme."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Der er ikke oprettet diskussioner endnu."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Ingen diskussioner fundet."
+  },
   "no_e16d9132": {
     "message": "Nej"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ingen overskrifter"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Der er ikke oprettet forløb endnu."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Ingen forløb fundet."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Der er ikke oprettet sider endnu."
+  },
+  "no_pages_found_6799350": {
+    "message": "Ingen sider fundet."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Der findes ikke forhåndsvisning for denne fil."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Der er ikke oprettet nogen quizzer endnu."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Der er ikke fundet nogen quizzer."
+  },
   "no_results_940393cf": {
     "message": "Ingen resultater."
   },

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/lib/translations/locales/fi.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Lisää kuva"
   },
+  "add_one_9e34a6f8": {
+    "message": "Lisää yksi!"
+  },
   "additional_considerations_f3801683": {
     "message": "Muuta huomioon otettavaa"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Ei havaittu käytettävyysongelmia."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Ilmoituksia ei ole vielä luotu."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ilmoituksia ei löytynyt."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Tehtäviä ei ole vielä luotu."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Tehtäviä ei löytynyt."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ei tallennettavia muutoksia."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Keskusteluja ei ole vielä luotu."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Keskusteluja ei löytynyt."
+  },
   "no_e16d9132": {
     "message": "Ei"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ei otsikoita"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Moduuleja ei ole vielä luotu."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Moduuleja ei löytynyt."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Sivuja ei ole vielä luotu"
+  },
+  "no_pages_found_6799350": {
+    "message": "Sivuja ei löytynyt."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Tälle tiedostolle ei ole saatavissa esikatselua."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Testejä ei ole vielä luotu."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Testejä ei löytynyt."
+  },
   "no_results_940393cf": {
     "message": "Ei tuloksia."
   },

package/lib/translations/locales/nb-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Legg til bilde"
   },
+  "add_one_9e34a6f8": {
+    "message": "Legg til en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Ekstra hensyn"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Ingen tiljengelighetsproblemer ble oppdaget."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Ingen beskjeder opprettet ennå."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ingen beskjeder funnet."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Ingen oppgave opprettet ennå."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Ingen oppgaver funnet."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ingen endringer å lagre."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Ingen diskusjoner opprettet ennå."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Ingen diskusjoner funnet."
+  },
   "no_e16d9132": {
     "message": "Nei"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ingen titler"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Ingen moduler opprettet ennå."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Ingen moduler funnet."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Ingen sider opprettet ennå."
+  },
+  "no_pages_found_6799350": {
+    "message": "Ingen sider funnet."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Ingen forhåndsvisning er tilgjengelig for denne filen."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Ingen quizer opprettet ennå."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Ingen quizer funnet."
+  },
   "no_results_940393cf": {
     "message": "Ingen resultater."
   },

package/lib/translations/locales/sv-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Lägg till bild"
   },
+  "add_one_9e34a6f8": {
+    "message": "Lägg till en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Ytterliggare hänsynstaganden"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Inga tillgänglighetsproblem upptäcktes."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Inga meddelanden har skapats än."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Inga meddelande hittades."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Inga uppgifter har skapats än."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Inga uppgifter hittades."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Inga ändringar att spara."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Inga diskussioner har skapats än."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Inga diskussioner hittades."
+  },
   "no_e16d9132": {
     "message": "Nej"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Inga rubriker"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Inga moduler har skapats än."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Inga moduler hittades."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Inga sidor har skapats än."
+  },
+  "no_pages_found_6799350": {
+    "message": "Inga sidor hittades."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Förhandsvisning är inte tillgänglig för den här filen."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Inga quiz har skapats än."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Inga quiz hittades."
+  },
   "no_results_940393cf": {
     "message": "Inga resultat."
   },

package/lib/util/encrypted-storage.js

@@ -0,0 +1,84 @@
+/*
+ * 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/>.
+ */
+import CryptoES from 'crypto-es';
+export default class EncryptedStorage {
+  constructor(passphrase) {
+    this.passphrase = void 0;
+
+    this.errorHandlerWrapper = callback => {
+      try {
+        return callback();
+      } catch (error) {
+        console.error('error', error);
+        return null;
+      }
+    };
+
+    this.passphrase = CryptoES.enc.Utf8.parse(passphrase);
+  }
+
+  setItem(key, content) {
+    return this.errorHandlerWrapper(() => {
+      // If passphrase is present, encrypt string and JSON stringify
+      let encrypted;
+
+      if (this.passphrase) {
+        encrypted = CryptoES.RC4.encrypt(content, this.passphrase, {
+          mode: CryptoES.mode.CFB,
+          padding: CryptoES.pad.AnsiX923
+        }).toString();
+      }
+
+      const data = JSON.stringify({
+        autosaveTimestamp: new Date().getTime(),
+        content: encrypted
+      });
+      return window.localStorage.setItem(key, data);
+    });
+  }
+
+  getItem(key) {
+    return this.errorHandlerWrapper(() => {
+      const data = window.localStorage.getItem(key);
+
+      if (!data) {
+        return data;
+      } // If passphrase is present, parse JSON and decrypt string
+
+
+      if (this.passphrase) {
+        const parsedData = JSON.parse(data);
+        parsedData.content = CryptoES.RC4.decrypt(parsedData.content, this.passphrase, {
+          mode: CryptoES.mode.CFB,
+          padding: CryptoES.pad.AnsiX923
+        });
+        parsedData.content = parsedData.content.toString(CryptoES.enc.Utf8);
+        return parsedData;
+      }
+    });
+  }
+
+  key(index) {
+    return this.errorHandlerWrapper(() => window.localStorage.key(index));
+  }
+
+  removeItem(key) {
+    return this.errorHandlerWrapper(() => window.localStorage.removeItem(key));
+  }
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/canvas-rce",
-  "version": "5.8.0",
+  "version": "5.10.0",
   "description": "A component wrapping Canvas's usage of Tinymce",
   "main": "es/index.js",
   "scripts": {
@@ -77,9 +77,8 @@
     "@instructure/canvas-theme": "7",
     "@instructure/debounce": "^7",
     "@instructure/emotion": "^8.38.1",
-    "@instructure/js-utils": "*",
     "@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",
@@ -100,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",
@@ -133,6 +132,7 @@
     "aphrodite": "^2",
     "axios": "^0.21.1",
     "bloody-offset": "0.0.0",
+    "crypto-es": "^2.0.4",
     "classnames": "^2.2.5",
     "concurrently": "^4",
     "format-message": "^6",
@@ -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]
-  };
-}