@instructure/canvas-rce 5.6.2 → 5.6.4

package/lib/translated/nb-x-k12/modules/translations/locales/zh.js

@@ -462,6 +462,9 @@ const locale = {
   "down_and_right_diagonal_arrow_6ea0f460": {
     "message": "右下斜箭头"
   },
+  "download_filename_2baae924": {
+    "message": "下载 { filename }"
+  },
   "downward_arrow_cca52012": {
     "message": "向下箭头"
   },
@@ -594,6 +597,9 @@ const locale = {
   "f_function_fe422d65": {
     "message": "F（函数）"
   },
+  "failed_getting_file_contents_e9ea19f4": {
+    "message": "文件内容获取失败"
+  },
   "file_storage_quota_exceeded_b7846cd1": {
     "message": "超出文件存储大小限制"
   },
@@ -936,6 +942,9 @@ const locale = {
   "links_14b70841": {
     "message": "链接"
   },
+  "links_to_an_external_site_de74145d": {
+    "message": "链接到外部网站。"
+  },
   "load_more_35d33c7": {
     "message": "加载更多"
   },
@@ -1002,6 +1011,12 @@ const locale = {
   "middle_27dc1d5": {
     "message": "中间"
   },
+  "minimize_file_preview_da911944": {
+    "message": "最小化文件预览"
+  },
+  "minimize_video_20aa554b": {
+    "message": "最小化视频"
+  },
   "minus_fd961e2e": {
     "message": "减号"
   },
@@ -1215,6 +1230,12 @@ const locale = {
   "pixels_52ece7d1": {
     "message": "像素"
   },
+  "play_media_comment_35257210": {
+    "message": "播放媒体评论。"
+  },
+  "play_media_comment_by_name_from_createdat_c230123d": {
+    "message": "播放{ name }的来自{ createdAt }的媒体评论。"
+  },
   "plus_d43cd4ec": {
     "message": "加号"
   },
@@ -1551,6 +1572,12 @@ const locale = {
   "supported_file_types_srt_or_webvtt_7d827ed": {
     "message": "支持的文件类型：SRT或WebVTT"
   },
+  "switch_to_pretty_html_editor_a3cee15f": {
+    "message": "切换到优质 HTML 编辑器"
+  },
+  "switch_to_raw_html_editor_f970ae1a": {
+    "message": "切换到原始 HTML 编辑器"
+  },
   "switch_to_the_html_editor_146dfffd": {
     "message": "切换到 HTML 编辑器"
   },
@@ -1587,6 +1614,9 @@ const locale = {
   "text_size_887c2f6": {
     "message": "文字大小"
   },
+  "the_document_preview_is_currently_being_processed__7d9ea135": {
+    "message": "目前正在处理文档预览。请稍后再试。"
+  },
   "the_material_is_in_the_public_domain_279c39a3": {
     "message": "材料在公开域中"
   },
@@ -1626,9 +1656,15 @@ const locale = {
   "thick_upward_arrow_acd20328": {
     "message": "厚向上箭头"
   },
+  "this_document_cannot_be_displayed_within_canvas_7aba77be": {
+    "message": "无法在 Canvas 中显示此文档。"
+  },
   "this_equation_cannot_be_rendered_in_basic_view_9b6c07ae": {
     "message": "无法在基本视图中呈现此公式。"
   },
+  "this_image_is_currently_unavailable_25c68857": {
+    "message": "该图像目前不可用"
+  },
   "though_your_video_will_have_the_correct_title_in_t_90e427f3": {
     "message": "虽然您的视频在浏览器里会有正确标题，但我们无法在数据库里更新。"
   },

package/lib/translated/nb-x-k12/modules/translations/locales/zh_HK.js

@@ -462,6 +462,9 @@ const locale = {
   "down_and_right_diagonal_arrow_6ea0f460": {
     "message": "向下和向右對角箭頭"
   },
+  "download_filename_2baae924": {
+    "message": "下載 { filename }"
+  },
   "downward_arrow_cca52012": {
     "message": "向下箭頭"
   },
@@ -594,6 +597,9 @@ const locale = {
   "f_function_fe422d65": {
     "message": "F（函數）"
   },
+  "failed_getting_file_contents_e9ea19f4": {
+    "message": "無法取得檔案內容"
+  },
   "file_storage_quota_exceeded_b7846cd1": {
     "message": "已超過檔案儲存配額"
   },
@@ -936,6 +942,9 @@ const locale = {
   "links_14b70841": {
     "message": "連結"
   },
+  "links_to_an_external_site_de74145d": {
+    "message": "連結到外部網站。"
+  },
   "load_more_35d33c7": {
     "message": "載入更多"
   },
@@ -1002,6 +1011,12 @@ const locale = {
   "middle_27dc1d5": {
     "message": "中間"
   },
+  "minimize_file_preview_da911944": {
+    "message": "最小化文檔預覽"
+  },
+  "minimize_video_20aa554b": {
+    "message": "最小化視訊"
+  },
   "minus_fd961e2e": {
     "message": "-"
   },
@@ -1215,6 +1230,12 @@ const locale = {
   "pixels_52ece7d1": {
     "message": "像素"
   },
+  "play_media_comment_35257210": {
+    "message": "播放媒體評論。"
+  },
+  "play_media_comment_by_name_from_createdat_c230123d": {
+    "message": "播放{ name }於{ createdAt }創建的媒體評論。"
+  },
   "plus_d43cd4ec": {
     "message": "+"
   },
@@ -1551,6 +1572,12 @@ const locale = {
   "supported_file_types_srt_or_webvtt_7d827ed": {
     "message": "支援的檔案類型：SRT 或 WebVTT"
   },
+  "switch_to_pretty_html_editor_a3cee15f": {
+    "message": "切換到美觀的 HTML 編輯器"
+  },
+  "switch_to_raw_html_editor_f970ae1a": {
+    "message": "切換到原始 HTML 編輯器"
+  },
   "switch_to_the_html_editor_146dfffd": {
     "message": "切換到 html 編輯器"
   },
@@ -1587,6 +1614,9 @@ const locale = {
   "text_size_887c2f6": {
     "message": "文字大小"
   },
+  "the_document_preview_is_currently_being_processed__7d9ea135": {
+    "message": "文件預覽目前正在處理中。請稍後重試。"
+  },
   "the_material_is_in_the_public_domain_279c39a3": {
     "message": "該材料位於公用網域中。"
   },
@@ -1626,9 +1656,15 @@ const locale = {
   "thick_upward_arrow_acd20328": {
     "message": "粗向上箭頭"
   },
+  "this_document_cannot_be_displayed_within_canvas_7aba77be": {
+    "message": "在 Canvas 中無法顯示此文件。"
+  },
   "this_equation_cannot_be_rendered_in_basic_view_9b6c07ae": {
     "message": "此方程式不能在基本視圖中呈現。"
   },
+  "this_image_is_currently_unavailable_25c68857": {
+    "message": "此圖像目前不可用"
+  },
   "though_your_video_will_have_the_correct_title_in_t_90e427f3": {
     "message": "雖然您的影片在瀏覽器中有正確的標題，但我們無法在資料庫中將其更新。"
   },

package/lib/translated/nl/modules/common/fileUrl.js

@@ -91,13 +91,13 @@ export function downloadToWrap(url) {
 // NOTE: this can be removed once canvas-rce-api is updated
 //       to normalize the file URLs it returns.
 
-export function fixupFileUrl(contextType, contextId, fileInfo) {
+export function fixupFileUrl(contextType, contextId, fileInfo, canvasOrigin) {
   // it's annoying, but depending on how we got here
   // the file may have an href or a url
   const key = fileInfo.href ? 'href' : 'url';
 
   if (fileInfo[key]) {
-    let parsed = parseCanvasUrl(fileInfo[key]);
+    let parsed = parseCanvasUrl(fileInfo[key], canvasOrigin);
 
     if (!parsed) {
       return fileInfo;
@@ -122,7 +122,8 @@ export function fixupFileUrl(contextType, contextId, fileInfo) {
 // (which is necessary to show in an <img> tag), not viewed
 
 export function prepEmbedSrc(url) {
-  const parsed = parseCanvasUrl(url);
+  let canvasOrigin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window.location.origin;
+  const parsed = parseCanvasUrl(url, canvasOrigin);
 
   if (!parsed) {
     return url;

package/lib/translated/nl/modules/enhance-user-content/__tests__/enhance_user_content.test.js

@@ -33,6 +33,45 @@ describe('enhanceUserContent()', () => {
   afterEach(() => {
     document.body.removeChild(elem);
   });
+  describe('when an img has a src that matches a canvas file path', () => {
+    it('makes relative src absolute', () => {
+      subject('<img id="relative_img" src="/files/1?download_frd=1" />');
+      enhanceUserContent(document, {
+        canvasOrigin: 'https://canvas.is.here:2000/'
+      });
+      expect(document.getElementById('relative_img').getAttribute('src')).toEqual('https://canvas.is.here:2000/files/1?download_frd=1');
+    });
+    it('does not change absolute src', () => {
+      subject('<img id="relative_img" src="https://canvas.is.not.here:3000/files/1?download_frd=1" />');
+      enhanceUserContent(document, {
+        canvasOrigin: 'https://canvas.is.here:2000/'
+      });
+      expect(document.getElementById('relative_img').getAttribute('src')).toEqual('https://canvas.is.not.here:3000/files/1?download_frd=1');
+    });
+    it('sets the alt text on hidden images', () => {
+      subject('<img id="relative_img" src="/files/1?download_frd=1&hidden=1" />');
+      enhanceUserContent(document, {
+        canvasOrigin: 'https://canvas.is.here:2000/'
+      });
+      expect(document.getElementById('relative_img').getAttribute('alt')).toEqual('This image is currently unavailable');
+    });
+  });
+  describe('when an iframe has a src that matches a canvas file path', () => {
+    it('makes relative src absolute', () => {
+      subject('<iframe id="relative_iframe" src="/media_object_iframe" />');
+      enhanceUserContent(document, {
+        canvasOrigin: 'https://canvas.is.here:2000/'
+      });
+      expect(document.getElementById('relative_iframe').getAttribute('src')).toEqual('https://canvas.is.here:2000/media_object_iframe');
+    });
+    it('does not change absolute src', () => {
+      subject('<img id="relative_iframe" src="https://canvas.is.not.here:3000/files/1?download_frd=1" />');
+      enhanceUserContent(document, {
+        canvasOrigin: 'https://canvas.is.here:2000/'
+      });
+      expect(document.getElementById('relative_iframe').getAttribute('src')).toEqual('https://canvas.is.not.here:3000/files/1?download_frd=1');
+    });
+  });
   describe('when a link has an href that matches a canvas file path', () => {
     it('makes relative links absolute', () => {
       subject('<a id="relative_link" class="instructure_file_link instructure_scribd_file" href="/courses/1/files/1">file</a>');
@@ -89,7 +128,7 @@ describe('enhanceUserContent()', () => {
     });
     describe('when the link has neither inline_disabled class or no_preview class', () => {
       it('has the file_preview_link class and the target attribute', () => {
-        subject('<a class="instructure_file_link instructure_scribd_file" href="/courses/1/files/1" target="_blank">file</a>');
+        subject('<a id="alink" class="instructure_file_link instructure_scribd_file" href="/courses/1/files/1" target="_blank">file</a>');
         enhanceUserContent();
         const aTag = document.querySelector('a');
         expect(aTag.classList.contains('file_preview_link')).toBeTruthy();
@@ -97,6 +136,21 @@ describe('enhanceUserContent()', () => {
       });
     });
   });
+  describe('internal links target attribute', () => {
+    it('is set to the provided options', () => {
+      // which is the case for img file links
+      subject(`<a id="blank_target" title="Link" href="/courses/1/files/79?wrap=1" target="_blank">some file</a>
+        <a id="no_target" title="Link" href="/courses/1/files/79?wrap=1">a file</a>
+        <a id="a_target" title="Link" href="/courses/1/files/79?wrap=1" target="a_target">another file</a>`);
+      enhanceUserContent(document, {
+        canvasOrigin: 'https://canvas.here',
+        canvasLinksTarget: 'open_here'
+      });
+      expect(document.getElementById('blank_target').getAttribute('target')).toEqual('open_here');
+      expect(document.getElementById('no_target').getAttribute('target')).toEqual('open_here');
+      expect(document.getElementById('a_target').getAttribute('target')).toEqual('a_target');
+    });
+  });
   describe('external links', () => {
     it('adds the exernal link icon', () => {
       subject('<a href="https://instructure.com/">external link</a>');

package/lib/translated/nl/modules/enhance-user-content/doc_previews.js

@@ -131,7 +131,7 @@ export function loadDocPreview($container, options) {
     iframe.setAttribute('src', sanitizedUrl);
     iframe.setAttribute('width', opts.width);
     iframe.setAttribute('allowfullscreen', '1');
-    iframe.setAttribute('style', `border: 0; overflow: auto; height: 99%; min-height': ${minHeight}`);
+    iframe.setAttribute('style', `border: 0; overflow: auto; height: 99%; min-height: ${minHeight}`);
     iframe.id = opts.id;
     canvadocWrapper.appendChild(iframe);
   } else if (!opts.disableGooglePreviews && (!opts.mimetype || isPreviewable(opts.mimetype)) && opts.attachment_id || opts.public_url) {
@@ -204,10 +204,10 @@ export function loadDocPreview($container, options) {
     // eslint-disable-next-line no-lonely-if
     if (opts.attachment_preview_processing) {
       $container.innerHTML = `<p>
-          ${htmlEscape("The document preview is currently being processed. Please try again later.")}
+          ${htmlEscape("Het voorbeeld van het document wordt momenteel verwerkt. Probeer het later opnieuw.")}
           </p>`;
     } else {
-      $container.innerHTML = `<p>${htmlEscape("This document cannot be displayed within Canvas.")}</p>`;
+      $container.innerHTML = `<p>${htmlEscape("Dit document kan niet in Canvas weergegeven worden.")}</p>`;
     }
   }
 }

package/lib/translated/nl/modules/enhance-user-content/enhance_user_content.js

@@ -39,7 +39,7 @@ function makeDownloadButton(download_url, filename) {
   a.appendChild($icon);
   const srspan = document.createElement('span');
   srspan.setAttribute('class', 'screenreader-only');
-  srspan.innerHTML = htmlEscape("Download " + filename);
+  srspan.innerHTML = htmlEscape(filename + " downloaden");
   a.appendChild(srspan);
   return a;
 }
@@ -55,7 +55,7 @@ function makeExternalLinkIcon(forLink) {
   $icon.firstChild.setAttribute('style', 'width:1em; height:1em; vertical-align:middle; fill:currentColor');
   const srspan = document.createElement('span');
   srspan.setAttribute('class', 'screenreader-only');
-  srspan.innerHTML = htmlEscape("Links to an external site.");
+  srspan.innerHTML = htmlEscape("Koppelingen naar een externe site.");
   $icon.appendChild(srspan);
   return $icon;
 }
@@ -95,7 +95,7 @@ function handleYoutubeLink($link) {
           style='font-size: 0.8em;'
           class='hide_youtube_embed_link'
         >
-          ${htmlEscape("Minimize Video")}
+          ${htmlEscape("Video minimaliseren")}
         </a>
       `;
       $video.querySelectorAll('.hide_youtube_embed_link').forEach($elem => {
@@ -133,7 +133,8 @@ export function enhanceUserContent() {
     customEnhanceFunc,
     canvasOrigin,
     kalturaSettings,
-    disableGooglePreviews
+    disableGooglePreviews,
+    canvasLinksTarget
   } = opts;
   const content = container instanceof HTMLElement && container || document.getElementById('content') || document;
 
@@ -145,23 +146,39 @@ export function enhanceUserContent() {
   content.querySelectorAll('.user_content:not(.enhanced)').forEach(elem => elem.classList.add('unenhanced'));
   content.querySelectorAll('.unenhanced').forEach(unenhanced_elem => {
     unenhanced_elem.querySelectorAll('img').forEach(img => {
-      // if the image file is unpublished it's replaced with the lock image
+      const src = img.getAttribute('src');
+
+      if (!/^\/[^/]/.test(src)) {
+        return;
+      } // if the image file is unpublished it's replaced with the lock image
       // and canvas adds hidden=1 to the URL.
       // we also need to strip the alt text
-      if (/hidden=1$/.test(img.getAttribute('src'))) {
-        img.setAttribute('alt', "This image is currently unavailable");
+
+
+      if (/hidden=1$/.test(src)) {
+        img.setAttribute('alt', "Deze afbeelding is momenteel niet beschikbaar");
       }
     });
     setData(unenhanced_elem, 'unenhanced_content_html', unenhanced_elem.innerHTML); // guarantee relative links point to canvas
 
     if (canvasOrigin) {
-      unenhanced_elem.querySelectorAll('a').forEach(link => {
+      const attributes = ['href', 'src'];
+      const selector = '[href], [src]';
+      unenhanced_elem.querySelectorAll(selector).forEach(element => {
         try {
-          const href = link.getAttribute('href');
+          for (const a of attributes) {
+            const potentialUrl = element.getAttribute(a);
+
+            if (!/^\/[^/]/.test(potentialUrl)) {
+              continue;
+            }
+
+            const absoluteUrl = new URL(potentialUrl, canvasOrigin);
+            element.setAttribute(a, absoluteUrl.href);
 
-          if (href[0] !== '#') {
-            const url = new URL(href, canvasOrigin);
-            link.setAttribute('href', url.href);
+            if (canvasLinksTarget && element.tagName === 'A' && (!element.getAttribute('target') || element.getAttribute('target') === '_blank')) {
+              element.setAttribute('target', canvasLinksTarget);
+            }
           }
         } catch (_ignore) {// canvasOrigin probably isn't a valid base url
         }
@@ -169,7 +186,7 @@ export function enhanceUserContent() {
     }
 
     unenhanced_elem.querySelectorAll('a:not(.not_external, .external)').forEach(childLink => {
-      if (!isExternalLink(childLink)) return;
+      if (!isExternalLink(childLink, canvasOrigin)) return;
       if (childLink.tagName === 'IMG' || childLink.querySelectorAll('img').length > 0) return;
       childLink.classList.add('external');
       childLink.setAttribute('target', '_blank');

package/lib/translated/nl/modules/enhance-user-content/instructure_helper.js

@@ -36,11 +36,19 @@ export function getTld(hostname) {
         length = parts.length;
   return (length > 1 ? [parts[length - 2], parts[length - 1]] : parts).join('.');
 }
-const locationTld = getTld(window.location.hostname);
 export function isExternalLink(element) {
+  let canvasOrigin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window.location.origin;
+  let canvasHost;
+
+  try {
+    canvasHost = new URL(canvasOrigin).hostname;
+  } catch (_ex) {
+    canvasHost = window.location.hostname;
+  }
+
   const href = element.getAttribute('href'); // if a browser doesnt support <a>.hostname then just dont mark anything as external, better to not get false positives.
 
-  return !!(href && href.length && !href.match(/^(mailto\:|javascript\:)/) && element.hostname && getTld(element.hostname) !== locationTld);
+  return !!(href && href.length && !href.match(/^(mailto\:|javascript\:)/) && element.hostname && getTld(element.hostname) !== getTld(canvasHost));
 }
 export function showFilePreview(event) {
   var _event$target, _event$currentTarget;
@@ -129,7 +137,8 @@ export function showFilePreviewInline(event, disableGooglePreviews) {
     method: 'GET',
     headers: {
       Accept: 'application/json'
-    }
+    },
+    credentials: 'include'
   }).then(response => {
     if (!response.ok) throw new Error(`${response.status}: ${response.statusText}`);
     return response;
@@ -152,7 +161,7 @@ export function showFilePreviewInline(event, disableGooglePreviews) {
       $minimizeLink.setAttribute('href', '#');
       $minimizeLink.setAttribute('style', 'font-size: 0.8em;');
       $minimizeLink.setAttribute('class', 'hide_file_preview_link');
-      $minimizeLink.innerHTML = htmlEscape("Minimize File Preview");
+      $minimizeLink.innerHTML = htmlEscape("Voorbeeld van bestand minimaliseren");
       $minimizeLink.addEventListener('click', event2 => {
         event2.preventDefault();
         resetInlinePreview($link, $div);
@@ -167,7 +176,7 @@ export function showFilePreviewInline(event, disableGooglePreviews) {
     }
   }).catch(ex => {
     showFlashAlert({
-      message: "Failed getting file contents",
+      message: "Kan geen bestandsinhoud ophalen",
       type: 'error'
     }); // eslint-disable-next-line no-console
 

package/lib/translated/nl/modules/enhance-user-content/media_comment_thumbnail.js

@@ -60,9 +60,9 @@ function createMediaCommentThumbnail(elem, size, keepOriginalText, kalturaSettin
   let altText;
 
   if (authorName && createdAt) {
-    altText = "Play media comment by " + authorName + " from " + createdAt + ".";
+    altText = "Media-opmerking van " + authorName + " afspelen die gemaakt is op " + createdAt + ".";
   } else {
-    altText = "Play media comment.";
+    altText = "Media-opmerking afspelen.";
   }
 
   if (id) {

package/lib/translated/nl/modules/rce/StatusBar.js

@@ -196,7 +196,7 @@ export default function StatusBar(props) {
 
   function renderHtmlEditorMessage() {
     const message = props.editorView === PRETTY_HTML_EDITOR_VIEW ? "Jammer genoeg is de pretty HTML-editor niet toetsenbordtoegankelijk. Open de raw HTML-editor hier." : "Open de pretty HTML-editor";
-    const label = props.editorView === PRETTY_HTML_EDITOR_VIEW ? "Switch to raw HTML Editor" : "Switch to pretty HTML Editor";
+    const label = props.editorView === PRETTY_HTML_EDITOR_VIEW ? "Overschakelen naar basis HTML-editor" : "Overschakelen geavanceerde HTML-editor";
     return /*#__PURE__*/React.createElement(View, {
       "data-testid": "html-editor-message"
     }, /*#__PURE__*/React.createElement(Button, {

package/lib/translated/nl/modules/rce/__tests__/contentInsertion.test.js

@@ -303,7 +303,7 @@ describe('contentInsertion', () => {
       image.href = 'https://mycanvas.com:3000/some/path';
       image.url = 'https://mycanvas.com:3000/some/path';
       contentInsertion.insertImage(editor, image, canvasOrigin);
-      expect(editor.content).toEqual('<img alt="Here Be Images" src="/some/path"/>');
+      expect(editor.content).toEqual('<img alt="Here Be Images" src="/some/path/preview"/>');
     });
     it('leaves non-Canvas URLs as absolute', () => {
       image.href = 'https://yodawg.com:3001/some/path';

package/lib/translated/nl/modules/rce/__tests__/contentRendering.test.js

@@ -123,6 +123,16 @@ describe('contentRendering', () => {
       const rendered = contentRendering.renderImage(image);
       expect(rendered).toEqual('<a href="http://someurl" target="_blank" rel="noopener noreferrer"><img alt="Here Be Images" src="/users/2/files/17/preview?verifier=xyzzy"/></a>');
     });
+    it('rewrites image urls if they are from the current origin', () => {
+      image.href = 'https://instructure.com/courses/1/files/1/download?verifier=xyzzy';
+      const rendered = contentRendering.renderImage(image, 'https://instructure.com');
+      expect(rendered).toEqual('<img alt="Here Be Images" src="/courses/1/files/1/preview?verifier=xyzzy"/>');
+    });
+    it('rewrites image urls if they are relative', () => {
+      image.href = '/courses/1/files/1/download?verifier=xyzzy';
+      const rendered = contentRendering.renderImage(image, 'https://instructure.com');
+      expect(rendered).toEqual('<img alt="Here Be Images" src="/courses/1/files/1/preview?verifier=xyzzy"/>');
+    });
   });
   describe('renderVideo', () => {
     it('builds html from tray video data', () => {

package/lib/translated/nl/modules/rce/contentRendering.js

@@ -46,7 +46,7 @@ export function renderLink(data, contents, canvasOrigin) {
 }
 export function renderLinkedImage(linkElem, image, canvasOrigin) {
   const linkHref = linkElem.getAttribute('href');
-  image.href = prepEmbedSrc(image.href);
+  image.href = prepEmbedSrc(image.href, canvasOrigin);
   return renderToStaticMarkup( /*#__PURE__*/React.createElement("a", {
     href: absoluteToRelativeUrl(linkHref, canvasOrigin),
     "data-mce-href": linkHref
@@ -93,7 +93,7 @@ export function constructJSXImageElement(image, canvasOrigin) {
   return ret;
 }
 export function renderImage(image, canvasOrigin, opts) {
-  image.href = prepEmbedSrc(image.href);
+  image.href = prepEmbedSrc(image.href, canvasOrigin);
   return renderToStaticMarkup(constructJSXImageElement(image, canvasOrigin, opts));
 }
 export function renderVideo(video, canvasOrigin) {

package/lib/translated/nl/modules/rce/plugins/instructure_icon_maker/components/CreateIconMakerForm/Header.js

@@ -89,6 +89,7 @@ export const Header = _ref => {
   })), !editing && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "small"
   }, getAltTextLabel(), /*#__PURE__*/React.createElement(TextArea, {
+    label: "",
     "aria-label": "Alt tekst",
     id: "icon-alt-text",
     height: "4rem",

package/lib/translated/nl/modules/rce/plugins/instructure_wordcount/components/WordCountModal.js

@@ -81,7 +81,8 @@ export const WordCountModal = _ref3 => {
     padding: "x-large"
   }, renderBody(headers, rows)), /*#__PURE__*/React.createElement(Modal.Footer, null, /*#__PURE__*/React.createElement(BaseButton, {
     onClick: onDismiss,
-    "data-testid": "footer-close-button"
+    "data-testid": "footer-close-button",
+    color: "primary"
   }, "Sluiten")));
 };
 WordCountModal.propTypes = {

package/lib/translated/nl/modules/rce/plugins/instructure_wordcount/utils/__tests__/countContent.test.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 { countWords, countCharsNoSpaces, countChars, callbackForCategory, countShouldIgnore, getTinymceCount, countContent, IGNORE_ATTRIBUTE } from '../countContent';
+import { countWords, countCharsNoSpaces, countChars, callbackForCategory, countShouldIgnore, getTinymceCount, countContent, IGNORE_WORDCOUNT_ATTRIBUTE } from '../countContent';
 const editor = {
   getBody: () => ({
     querySelectorAll: () => [createNode('hello world'), createNode('hi again')]
@@ -39,7 +39,7 @@ const editor = {
 const createNode = function (content) {
   let charsOnly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const node = document.createElement('p');
-  node.setAttribute(IGNORE_ATTRIBUTE, charsOnly ? 'chars-only' : '');
+  node.setAttribute(IGNORE_WORDCOUNT_ATTRIBUTE, charsOnly ? 'chars-only' : '');
   node.innerText = content;
   return node;
 };

package/lib/translated/nl/modules/rce/plugins/instructure_wordcount/utils/countContent.js

@@ -15,9 +15,9 @@
  * 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/>.
  */
-export const IGNORE_ATTRIBUTE = 'data-ignore-wordcount';
+export const IGNORE_WORDCOUNT_ATTRIBUTE = 'data-ignore-wordcount';
 export const countWords = node => {
-  if (node.getAttribute(IGNORE_ATTRIBUTE) === 'chars-only') return 0;
+  if (node.getAttribute(IGNORE_WORDCOUNT_ATTRIBUTE) === 'chars-only') return 0;
   const textContent = (node === null || node === void 0 ? void 0 : node.innerText) || '';
   const trimmedTextContent = textContent.trim();
   if (trimmedTextContent.length === 0) return 0;
@@ -55,7 +55,7 @@ export const callbackForCategory = category => {
 };
 export const countShouldIgnore = (ed, scope, category) => {
   if (scope === 'selection') return 0;
-  const nodesToCount = Array.from(ed.getBody().querySelectorAll(`[${IGNORE_ATTRIBUTE}]`));
+  const nodesToCount = Array.from(ed.getBody().querySelectorAll(`[${IGNORE_WORDCOUNT_ATTRIBUTE}]`));
   const callback = callbackForCategory(category);
   return nodesToCount.reduce((total, node) => total + callback(node), 0);
 };

package/lib/translated/nl/modules/rce/plugins/shared/CanvasContentTray.js

@@ -313,6 +313,28 @@ export default function CanvasContentTray(props) {
       scrollingAreaRef.current.style.overscrollBehaviorY = 'contain';
     }
   }, [hasOpened]);
+  useEffect(() => {
+    var _trayRef$current;
+
+    if (!hasOpened) return;
+    let c = document.querySelector('[role="main"]');
+    let target_w = 0;
+    if (!c) return;
+    const margin = window.getComputedStyle(c).direction === 'ltr' ? document.body.getBoundingClientRect().right - c.getBoundingClientRect().right : c.getBoundingClientRect().left;
+    target_w = c.offsetWidth - ((_trayRef$current = trayRef.current) === null || _trayRef$current === void 0 ? void 0 : _trayRef$current.offsetWidth) + margin;
+
+    if (target_w >= 320 && target_w < c.offsetWidth) {
+      c.style.boxSizing = 'border-box';
+      c.style.width = `${target_w}px`;
+    }
+
+    setHidingTrayOnAction(target_w < 320);
+    return () => {
+      c = document.querySelector('[role="main"]');
+      if (!c) return;
+      c.style.width = '';
+    };
+  }, [hasOpened]);
 
   function handleOpenTray() {
     bridge.focusEditor(editor);
@@ -423,29 +445,6 @@ export default function CanvasContentTray(props) {
     onClose: handleCloseTray,
     onExit: handleExitTray,
     onOpen: handleOpenTray,
-    onEntered: () => {
-      const c = document.querySelector('[role="main"]');
-      let target_w = 0;
-
-      if (c) {
-        var _trayRef$current;
-
-        const margin = window.getComputedStyle(c).direction === 'ltr' ? document.body.getBoundingClientRect().right - c.getBoundingClientRect().right : c.getBoundingClientRect().left;
-        target_w = c.offsetWidth - ((_trayRef$current = trayRef.current) === null || _trayRef$current === void 0 ? void 0 : _trayRef$current.offsetWidth) + margin;
-
-        if (target_w >= 320 && target_w < c.offsetWidth) {
-          c.style.boxSizing = 'border-box';
-          c.style.width = `${target_w}px`;
-        }
-      }
-
-      setHidingTrayOnAction(target_w < 320);
-    },
-    onExiting: () => {
-      const c = document.querySelector('[role="main"]');
-      if (c) c.style.width = '';
-    },
-    onExited: () => console.log('exited'),
     contentRef: el => trayRef.current = el
   }, isOpen && hasOpened ? /*#__PURE__*/React.createElement(Flex, {
     direction: "column",