@instructure/canvas-rce 5.6.16 → 5.6.18

package/lib/translated/cy/modules/rce/RCEWrapper.js

@@ -21,8 +21,7 @@ import React, { Suspense } from 'react';
 import { Editor } from '@tinymce/tinymce-react';
 import _ from 'lodash';
 import { StoreProvider } from './plugins/shared/StoreContext';
-import themeable from '@instructure/ui-themeable'; // eslint-disable-line  @typescript-eslint/no-unused-vars
-
+import themeable from '@instructure/ui-themeable';
 import { IconKeyboardShortcutsLine } from '@instructure/ui-icons';
 import { Alert } from '@instructure/ui-alerts';
 import { Spinner } from '@instructure/ui-spinner';
@@ -46,14 +45,11 @@ import CanvasContentTray from './plugins/shared/CanvasContentTray';
 import StatusBar, { PRETTY_HTML_EDITOR_VIEW, RAW_HTML_EDITOR_VIEW, WYSIWYG_VIEW } from './StatusBar';
 import { VIEW_CHANGE } from './customEvents';
 import ShowOnFocusButton from './ShowOnFocusButton';
-import theme from '../skins/theme'; // eslint-disable-line  @typescript-eslint/no-unused-vars
-
-import { isAudio, isImage, isVideo } from './plugins/shared/fileTypeUtils';
+import theme from '../skins/theme';
 import KeyboardShortcutModal from './KeyboardShortcutModal';
 import AlertMessageArea from './AlertMessageArea';
 import alertHandler from './alertHandler';
 import { isFileLink, isImageEmbed } from './plugins/shared/ContentSelection';
-import { AUDIO_PLAYER_SIZE, VIDEO_SIZE_DEFAULT } from './plugins/instructure_record/VideoOptionsTray/TrayController';
 import { countShouldIgnore } from './plugins/instructure_wordcount/utils/countContent';
 import launchWordcountModal from './plugins/instructure_wordcount/clickCallback';
 import { determineOSDependentKey } from './userOS';
@@ -3610,10 +3606,6 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
       }
     };
 
-    this.handleExternalClick = () => {
-      debounce(this.checkAccessibility, 1000)();
-    };
-
     this.handleInputChange = () => {
       this.checkAccessibility();
     };
@@ -3628,9 +3620,7 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
       textarea.dataset.rich_text = true; // start with the textarea and tinymce in sync
 
       textarea.value = this.getCode();
-      textarea.style.height = this.state.height; // Capture click events outside the iframe
-
-      document.addEventListener('click', this.handleExternalClick);
+      textarea.style.height = this.state.height;
 
       if (document.body.classList.contains('Underline-All-Links__enabled')) {
         this.iframe.contentDocument.body.classList.add('Underline-All-Links__enabled');
@@ -3833,8 +3823,9 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
         }
 
         this.storage.removeItem(this.autoSaveKey);
-      });
-      this.checkAccessibility();
+      }); // let the content be restored
+
+      debounce(this.checkAccessibility, 1000)();
     };
 
     this.doAutoSave = function (e) {
@@ -3894,7 +3885,12 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
     this.onEditorChange = (content, _editor) => {
       var _this$props$onContent, _this$props2;
 
-      (_this$props$onContent = (_this$props2 = this.props).onContentChange) === null || _this$props$onContent === void 0 ? void 0 : _this$props$onContent.call(_this$props2, content);
+      (_this$props$onContent = (_this$props2 = this.props).onContentChange) === null || _this$props$onContent === void 0 ? void 0 : _this$props$onContent.call(_this$props2, content); // check accessibility when clearing the editor,
+      // all other times should be checked by handleInputChange
+
+      if (content === '') {
+        this.checkAccessibility();
+      }
     };
 
     this.onResize = (_e, coordinates) => {
@@ -4110,22 +4106,16 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
     const {
       new_math_equation_handling = false,
       rce_ux_improvements = false,
-      rce_better_paste = false,
       rce_new_external_tool_dialog_in_canvas = false,
-      rce_improved_placeholders = false,
       explicit_latex_typesetting = false,
-      rce_show_studio_media_options = false,
       rce_transform_loaded_content = false,
       media_links_use_attachment_id = false
     } = this.props.features;
     return {
       new_math_equation_handling,
       rce_ux_improvements,
-      rce_better_paste,
       rce_new_external_tool_dialog_in_canvas,
-      rce_improved_placeholders,
       explicit_latex_typesetting,
-      rce_show_studio_media_options,
       rce_transform_loaded_content,
       media_links_use_attachment_id
     };
@@ -4135,7 +4125,8 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
     return {
       locale: normalizeLocale(this.props.language),
       flashAlertTimeout: this.props.flashAlertTimeout,
-      timezone: this.props.timezone
+      timezone: this.props.timezone,
+      lockedAttachments: this.props.lockedAttachments
     };
   }
 
@@ -4327,88 +4318,7 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
   }
 
   insertImagePlaceholder(fileMetaProps) {
-    var _this$props$features;
-
-    if ((_this$props$features = this.props.features) !== null && _this$props$features !== void 0 && _this$props$features.rce_improved_placeholders) {
-      return insertPlaceholder(this.mceInstance(), fileMetaProps.name, placeholderInfoFor(fileMetaProps));
-    } // wrap this in a promise primarily so specs can await on the placeholder to be in the DOM
-
-
-    const prom = new Promise((resolve, reject) => {
-      let width, height;
-      let align = 'middle';
-
-      if (isImage(fileMetaProps.contentType) && fileMetaProps.displayAs !== 'link') {
-        const image = new Image();
-
-        image.onload = () => {
-          var _window$visualViewpor4;
-
-          width = image.width;
-          height = image.height;
-          if (!fileMetaProps.domObject.preview) URL.revokeObjectURL(image.src); // we constrain the <img> to max-width: 100%, so scale the size down if necessary
-
-          const maxWidth = Math.floor(this.mceInstance().getBody().clientWidth || ((_window$visualViewpor4 = window.visualViewport) === null || _window$visualViewpor4 === void 0 ? void 0 : _window$visualViewpor4.width) || Number.MAX_SAFE_INTEGER);
-
-          if (width > maxWidth) {
-            height = Math.round(maxWidth / width * height);
-            width = maxWidth;
-          }
-
-          width = `${width}px`;
-          height = `${height}px`;
-          insertImagePlaceholderFRD(this.mceInstance(), fileMetaProps.name, width, height, align);
-          resolve();
-        };
-
-        image.onerror = () => {
-          if (!fileMetaProps.domObject.preview) URL.revokeObjectURL(image.src);
-          reject();
-        };
-
-        image.src = fileMetaProps.domObject.preview || URL.createObjectURL(fileMetaProps.domObject);
-      } else {
-        if (isVideo(fileMetaProps.contentType || fileMetaProps.type)) {
-          width = VIDEO_SIZE_DEFAULT.width;
-          height = VIDEO_SIZE_DEFAULT.height;
-          align = 'bottom';
-        } else if (isAudio(fileMetaProps.contentType || fileMetaProps.type)) {
-          width = AUDIO_PLAYER_SIZE.width;
-          height = AUDIO_PLAYER_SIZE.height;
-          align = 'bottom';
-        } else {
-          width = `${fileMetaProps.name.length}rem`;
-          height = '1rem';
-        }
-
-        insertImagePlaceholderFRD(this.mceInstance(), fileMetaProps.name, width, height, align);
-        resolve();
-      }
-
-      function insertImagePlaceholderFRD(editor, imgName, imgWidth, imgHeight, imgAlign) {
-        // if you're wondering, the &nbsp; scatter about in the svg
-        // is because tinymce will strip empty elements
-        const markup = `
-<span
-  aria-label="${"Wrthi\u2019n llwytho"}"
-  data-placeholder-for="${encodeURIComponent(imgName)}"
-  style="width: ${imgWidth}; height: ${imgHeight}; vertical-align: ${imgAlign};"
->
-  <svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" height="100px" width="100px">
-    <g style="stroke-width:.5rem;fill:none;stroke-linecap:round;">&nbsp;
-      <circle class="c1" cx="50%" cy="50%" r="28px">&nbsp;</circle>
-      <circle class="c2" cx="50%" cy="50%" r="28px">&nbsp;</circle>
-      &nbsp;
-    </g>
-    &nbsp;
-  </svg>
-</span>`;
-        editor.undoManager.ignore(() => {
-          editor.execCommand('mceInsertContent', false, markup);
-        });
-      }
-    });
-    return prom;
+    return insertPlaceholder(this.mceInstance(), fileMetaProps.name, placeholderInfoFor(fileMetaProps));
   }
 
   insertVideo(video) {
@@ -4429,20 +4339,7 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
   }
 
   removePlaceholders(name) {
-    var _this$props$features2;
-
-    if ((_this$props$features2 = this.props.features) !== null && _this$props$features2 !== void 0 && _this$props$features2.rce_improved_placeholders) {
-      removePlaceholder(this.mceInstance(), name);
-    } else {
-      const placeholder = this.mceInstance().dom.doc.querySelector(`[data-placeholder-for="${encodeURIComponent(name)}"]`);
-
-      if (placeholder) {
-        const editor = this.mceInstance();
-        editor.undoManager.ignore(() => {
-          editor.dom.remove(placeholder);
-        });
-      }
-    }
+    removePlaceholder(this.mceInstance(), name);
   }
 
   insertLink(link) {
@@ -4837,24 +4734,20 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
   }
 
   wrapOptions() {
-    var _this$props$trayProps2, _this$props$trayProps3, _this$props$features3, _this$props$features4, _this$props$features5, _this$props$trayProps4, _sanitizePlugins;
+    var _this$props$trayProps2, _this$props$trayProps3, _this$props$features, _this$props$trayProps4, _sanitizePlugins;
 
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const rcsExists = !!((_this$props$trayProps2 = this.props.trayProps) !== null && _this$props$trayProps2 !== void 0 && _this$props$trayProps2.host && (_this$props$trayProps3 = this.props.trayProps) !== null && _this$props$trayProps3 !== void 0 && _this$props$trayProps3.jwt);
     const userLocale = editorLanguage(this.language);
     const setupCallback = options.setup;
     const isOnCanvasDomain = window.origin === this.props.canvasOrigin;
-    const canvasPlugins = rcsExists ? ['instructure_links', 'instructure_image', 'instructure_documents', 'instructure_equation', !isOnCanvasDomain || (_this$props$features3 = this.props.features) !== null && _this$props$features3 !== void 0 && _this$props$features3.rce_new_external_tool_dialog_in_canvas ? 'instructure_rce_external_tools' : 'instructure_external_tools', 'a11y_checker'] : ['instructure_links'];
+    const canvasPlugins = rcsExists ? ['instructure_links', 'instructure_image', 'instructure_documents', 'instructure_equation', !isOnCanvasDomain || (_this$props$features = this.props.features) !== null && _this$props$features !== void 0 && _this$props$features.rce_new_external_tool_dialog_in_canvas ? 'instructure_rce_external_tools' : 'instructure_external_tools', 'a11y_checker'] : ['instructure_links'];
 
     if (rcsExists && !this.props.instRecordDisabled) {
       canvasPlugins.splice(2, 0, 'instructure_record');
     }
 
-    if ((_this$props$features4 = this.props.features) !== null && _this$props$features4 !== void 0 && _this$props$features4.rce_show_studio_media_options) {
-      canvasPlugins.push('instructure_studio_media_options');
-    }
-
-    const pastePlugins = rcsExists && (_this$props$features5 = this.props.features) !== null && _this$props$features5 !== void 0 && _this$props$features5.rce_better_paste ? ['instructure_paste', 'paste'] : ['paste'];
+    const pastePlugins = rcsExists ? ['instructure_paste', 'paste'] : ['paste'];
 
     if (rcsExists && this.props.use_rce_icon_maker && ((_this$props$trayProps4 = this.props.trayProps) === null || _this$props$trayProps4 === void 0 ? void 0 : _this$props$trayProps4.contextType) === 'course') {
       canvasPlugins.push('instructure_icon_maker');
@@ -4956,7 +4849,7 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
       // handles all of that complexity. It that ever changes in the
       // future in an upgraded version, we will have to update the
       // logic in those other places as well.
-      plugins: mergePlugins(['autolink', 'media', 'table', 'link', 'directionality', 'lists', 'textpattern', 'hr', 'instructure-ui-icons', 'instructure_condensed_buttons', 'instructure_links', 'instructure_html_view', 'instructure_media_embed', 'a11y_checker', 'wordcount', 'instructure_wordcount', ...pastePlugins, ...canvasPlugins], // filter out the plugins designated for removal
+      plugins: mergePlugins(['autolink', 'media', 'table', 'link', 'directionality', 'lists', 'textpattern', 'hr', 'instructure-ui-icons', 'instructure_condensed_buttons', 'instructure_links', 'instructure_html_view', 'instructure_media_embed', 'a11y_checker', 'wordcount', 'instructure_wordcount', 'instructure_studio_media_options', ...pastePlugins, ...canvasPlugins], // filter out the plugins designated for removal
       (_sanitizePlugins = sanitizePlugins(options.plugins)) === null || _sanitizePlugins === void 0 ? void 0 : _sanitizePlugins.filter(p => p.length > 0 && p[0] !== '-'), this.pluginsToExclude),
       textpattern_patterns: [{
         start: '* ',

package/lib/translated/cy/modules/rce/__tests__/RCEWrapper.test.js

@@ -277,11 +277,8 @@ describe('RCEWrapper', () => {
         expect(rce.checkReadyToGetCode(stub)).toEqual(false);
       });
     });
-    describe('insertImagePlaceholder (new)', () => {
+    describe('insertImagePlaceholder', () => {
       // Full testing of placehodlers can be found in loadingPlaceholder.test.ts
-      beforeEach(() => {
-        rce.props.features.rce_improved_placeholders = true;
-      });
       it('can insert a placeholder', async () => {
         const square = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFElEQVR42mNk+A+ERADGUYX0VQgAXAYT9xTSUocAAAAASUVORK5CYII=';
         const props = {
@@ -297,172 +294,6 @@ describe('RCEWrapper', () => {
         expect(jsdomInnerText(placeholderElem)).toContain('square.png');
       });
     });
-    describe('insertImagePlaceholder (legacy)', () => {
-      function makePlaceholderMarkup(name) {
-        let width = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '10px';
-        let height = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '10px';
-        let valign = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'middle';
-        return `
-<span
-  aria-label=\"Loading\"
-  data-placeholder-for=\"${name}\"
-  style=\"width: ${width}; height: ${height}; vertical-align: ${valign};\"
->
-  <svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" x=\"0px\" y=\"0px\" viewBox=\"0 0 100 100\" height=\"100px\" width=\"100px\">
-    <g style=\"stroke-width:.5rem;fill:none;stroke-linecap:round;\">&nbsp;
-      <circle class=\"c1\" cx=\"50%\" cy=\"50%\" r=\"28px\">&nbsp;</circle>
-      <circle class=\"c2\" cx=\"50%\" cy=\"50%\" r=\"28px\">&nbsp;</circle>
-      &nbsp;
-    </g>
-    &nbsp;
-  </svg>
-</span>`;
-      }
-
-      let globalImage;
-
-      function mockImage(props) {
-        // mock enough for RCEWrapper.insertImagePlaceholder
-        globalImage = global.Image;
-
-        global.Image = function () {
-          const img = {
-            _src: null,
-            width: '10',
-            height: '10',
-            ...props,
-
-            get src() {
-              return this._src;
-            },
-
-            // when the src is set, wait a tick then call the onload handler
-            set src(newSrc) {
-              this._src = newSrc;
-              window.setTimeout(() => this.onload(), 1);
-            }
-
-          };
-          return img;
-        };
-      }
-
-      function restoreImage() {
-        global.Image = globalImage;
-      }
-
-      afterEach(() => {
-        restoreImage();
-      });
-      beforeEach(() => {
-        rce.props.features.rce_improved_placeholders = false;
-      });
-      it('inserts a placeholder image with the proper metadata', async () => {
-        mockImage();
-        const greenSquare = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFElEQVR42mNk+A+ERADGUYX0VQgAXAYT9xTSUocAAAAASUVORK5CYII=';
-        const props = {
-          name: 'green_square',
-          domObject: {
-            preview: greenSquare
-          },
-          contentType: 'image/png'
-        };
-        const imageMarkup = makePlaceholderMarkup('green_square');
-        await rce.insertImagePlaceholder(props);
-        expect(editorCommandSpy).toHaveBeenCalledWith('mceInsertContent', false, imageMarkup);
-      });
-      it('inserts a placeholder image with an encoded name to prevent nested quotes', async () => {
-        mockImage();
-        const greenSquare = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFElEQVR42mNk+A+ERADGUYX0VQgAXAYT9xTSUocAAAAASUVORK5CYII=';
-        const props = {
-          name: 'filename "with" quotes',
-          domObject: {
-            preview: greenSquare
-          },
-          contentType: 'image/png'
-        };
-        const imageMarkup = makePlaceholderMarkup('filename%20%22with%22%20quotes');
-        await rce.insertImagePlaceholder(props);
-        expect(editorCommandSpy).toHaveBeenCalledWith('mceInsertContent', false, imageMarkup);
-      }); // jsdom doesn't actually render anything so any query about the size of an element returns 0
-      // this makes this test impossible in jest + jsdom
-      // it('constrains the image placeholder to the width of the rce', async () => {
-      //   mockImage({width: 1000, height: 1000})
-      //   const greenSquare =
-      //     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFElEQVR42mNk+A+ERADGUYX0VQgAXAYT9xTSUocAAAAASUVORK5CYII='
-      //   const props = {
-      //     name: 'green_square',
-      //     domObject: {
-      //       preview: greenSquare,
-      //     },
-      //     contentType: 'image/png',
-      //   }
-      //
-      //   const imageMarkup = `
-      //     <span
-      //       aria-label=\"Loading\"
-      //       data-placeholder-for=\"green_square\"
-      //       style=\"width: 500px; height: 500px; vertical-align: middle;\"
-      //     >
-      //       <svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" x=\"0px\" y=\"0px\" viewBox=\"0 0 100 100\" height=\"100px\" width=\"100px\">
-      //         <g style=\"stroke-width:.5rem;fill:none;stroke-linecap:round;\">&nbsp;
-      //           <circle class=\"c1\" cx=\"50%\" cy=\"50%\" r=\"28px\">&nbsp;</circle>
-      //           <circle class=\"c2\" cx=\"50%\" cy=\"50%\" r=\"28px\">&nbsp;</circle>
-      //           &nbsp;
-      //         </g>
-      //         &nbsp;
-      //       </svg>
-      //     </span>`
-      //   await rce.insertImagePlaceholder(props)
-      //   expect(editorCommandSpy).toHaveBeenCalledWith('mceInsertContent', false, imageMarkup)
-      // })
-
-      it('inserts a text file placeholder image with the proper metadata', async () => {
-        const props = {
-          name: 'file.txt',
-          domObject: {},
-          contentType: 'text/plain'
-        };
-        const imageMarkup = makePlaceholderMarkup('file.txt', '8rem', '1rem');
-        await rce.insertImagePlaceholder(props);
-        expect(editorCommandSpy).toHaveBeenCalledWith('mceInsertContent', false, imageMarkup);
-      });
-      it('inserts a video file placeholder image with the proper metadata', async () => {
-        const props = {
-          name: 'file.mov',
-          domObject: {},
-          contentType: 'video/quicktime'
-        };
-        const imageMarkup = makePlaceholderMarkup('file.mov', '400px', '225px', 'bottom');
-        await rce.insertImagePlaceholder(props);
-        expect(editorCommandSpy).toHaveBeenCalledWith('mceInsertContent', false, imageMarkup);
-      });
-      it('inserts an audio file placeholder image with the proper metadata', async () => {
-        const props = {
-          name: 'file.mp3',
-          domObject: {},
-          contentType: 'audio/mp3'
-        };
-        const imageMarkup = makePlaceholderMarkup('file.mp3', '320px', '14.25rem', 'bottom');
-        await rce.insertImagePlaceholder(props);
-        expect(editorCommandSpy).toHaveBeenCalledWith('mceInsertContent', false, imageMarkup);
-      });
-      it('inserts a little placeholder for images displayed as links', async () => {
-        mockImage();
-        const square = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFElEQVR42mNk+A+ERADGUYX0VQgAXAYT9xTSUocAAAAASUVORK5CYII=';
-        const props = {
-          name: 'square.png',
-          domObject: {
-            preview: square
-          },
-          contentType: 'image/png',
-          displayAs: 'link'
-        };
-        const imageMarkup = makePlaceholderMarkup('square.png', '10rem', '1rem');
-        await rce.insertImagePlaceholder(props);
-        expect(editorCommandSpy).toHaveBeenCalledWith('mceInsertContent', false, imageMarkup);
-      });
-    });
     describe('removePlaceholders', () => {
       it('removes placeholders that match the given name', () => {
         const placeholder = document.createElement('img');
@@ -845,24 +676,6 @@ describe('RCEWrapper', () => {
       const options = wrapper.wrapOptions({});
       expect(options.plugins.indexOf('instructure_record')).toEqual(-1);
     });
-    it('includes instructure_studio_media_options in plugins if feature enabled', () => {
-      const wrapper = createBasicElement({
-        features: {
-          rce_show_studio_media_options: true
-        }
-      });
-      const options = wrapper.wrapOptions({});
-      expect(options.plugins).toContain('instructure_studio_media_options');
-    });
-    it('does not include instructure_studio_media_options in plugins if feature disabled', () => {
-      const wrapper = createBasicElement({
-        features: {
-          rce_show_studio_media_options: false
-        }
-      });
-      const options = wrapper.wrapOptions({});
-      expect(options.plugins).not.toContain('instructure_studio_media_options');
-    });
     it('instructure_rce_external_tools if enabled and rcs available', () => {
       for (const rcsAvailable in [true, false]) {
         for (const flagEnabled in [true, false]) {

package/lib/translated/cy/modules/rce/plugins/instructure_image/ImageEmbedOptions.js

@@ -17,6 +17,7 @@
  */
 import formatMessage from '../../../format-message';
 import { scaleForHeight, scaleForWidth } from '../shared/DimensionUtils';
+import RCEGlobals from '../../RCEGlobals';
 export const MIN_HEIGHT = 10;
 export const MIN_WIDTH = 10;
 export const MIN_WIDTH_VIDEO = 320;
@@ -127,6 +128,16 @@ export function fromVideoEmbed($element) {
   }
 
   videoOptions.videoSize = imageSizeFromKnownOptions(videoOptions);
+
+  if (RCEGlobals.getFeatures().media_links_use_attachment_id) {
+    const source = $videoIframe.getAttribute('src');
+    const matches = source === null || source === void 0 ? void 0 : source.match(/^\/media_attachments_iframe\/(\d+)/);
+
+    if (matches) {
+      videoOptions.attachmentId = matches[1];
+    }
+  }
+
   return videoOptions;
 }
 export function scaleImageForHeight(naturalWidth, naturalHeight, targetHeight) {

package/lib/translated/cy/modules/rce/plugins/instructure_image/__tests__/ImageEmbedOptions.test.js

@@ -16,6 +16,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import { CUSTOM, EXTRA_LARGE, LARGE, MEDIUM, MIN_WIDTH, MIN_HEIGHT, SMALL, fromImageEmbed, fromVideoEmbed, labelForImageSize, scaleImageForHeight, scaleImageForWidth, scaleToSize } from '../ImageEmbedOptions';
+import RCEGlobals from '../../../RCEGlobals';
 Object.defineProperty(HTMLImageElement.prototype, 'naturalHeight', {
   get() {
     return this._naturalHeight;
@@ -536,5 +537,34 @@ describe('RCE > Plugins > Instructure Image > ImageEmbedOptions', () => {
       expect(getVideoOptions().videoSize).toEqual('custom'); // cuz it's 0x0
     }); // that's all we can unit test because we can't fully setup the video,
     // and the element doesn't have a size in jsdom
+
+    describe('attachmentId', () => {
+      beforeEach(() => {
+        $video.innerHTML = '<iframe allow="fullscreen" allowfullscreen data-media-id="17" data-media-type="video" src="/media_attachments_iframe/17?type=video&embedded=true" style="width:400px;height:225px;display:inline-block;" title="Video player for filename.mov"></iframe>';
+        RCEGlobals.getFeatures = jest.fn().mockReturnValue({
+          media_links_use_attachment_id: true
+        });
+      });
+      afterEach(() => {
+        jest.resetAllMocks();
+      });
+      it('is included', () => {
+        expect(getVideoOptions().attachmentId).toEqual('17');
+      });
+      it('is not included', () => {
+        RCEGlobals.getFeatures = jest.fn().mockReturnValue({
+          media_links_use_attachment_id: false
+        });
+        expect(getVideoOptions().attachmentId).toBeUndefined();
+      });
+      it('is not included due invalid src', () => {
+        $video.innerHTML = '<iframe allow="fullscreen" allowfullscreen data-media-id="17" data-media-type="video" src="/blahblahblah/17?type=video&embedded=true" style="width:400px;height:225px;display:inline-block;" title="Video player for filename.mov"></iframe>';
+        expect(getVideoOptions().attachmentId).toBeUndefined();
+      });
+      it('is not included due non-existent src', () => {
+        $video.innerHTML = '<iframe allow="fullscreen" allowfullscreen data-media-id="17" data-media-type="video" style="width:400px;height:225px;display:inline-block;" title="Video player for filename.mov"></iframe>';
+        expect(getVideoOptions().attachmentId).toBeUndefined();
+      });
+    });
   });
 });

package/lib/translated/cy/modules/rce/plugins/instructure_links/components/LinkOptionsTray/__tests__/LinkOptionsTray.test.js

@@ -143,6 +143,19 @@ describe('RCE "Links" Plugin > LinkOptionsTray', () => {
         expect(props.onSave).toHaveBeenCalledTimes(0);
       });
     });
+    describe('when a Link url is only spaces', () => {
+      beforeEach(() => {
+        props.content.text = '   ';
+        renderComponent();
+      });
+      it('is disabled', () => {
+        expect(tray.$doneButton.disabled).toBe(true);
+      });
+      it('does not call the .onSave prop when clicked', () => {
+        tray.$doneButton.click();
+        expect(props.onSave).toHaveBeenCalledTimes(0);
+      });
+    });
     describe('when clicked', () => {
       it('prevents the default click handler', () => {
         renderComponent();

package/lib/translated/cy/modules/rce/plugins/instructure_links/components/LinkOptionsTray/index.js

@@ -212,7 +212,7 @@ export default function LinkOptionsTray(props) {
     padding: "small medium",
     textAlign: "end"
   }, /*#__PURE__*/React.createElement(Button, {
-    disabled: showText && !text || !(url && isValidURL),
+    disabled: showText && text.trim().length === 0 || !(url && isValidURL),
     onClick: handleSave,
     color: "primary"
   }, "Wedi gorffen"))))));

package/lib/translated/cy/modules/rce/plugins/instructure_paste/plugin.js

@@ -129,8 +129,9 @@ tinymce.PluginManager.add('instructure_paste', function (editor) {
   async function handlePasteOrDrop(event) {
     var _bridge$activeEditor, _bridge$activeEditor$, _editor$rceWrapper;
 
-    const dataTransfer = event.type === 'paste' ? event.clipboardData : event.dataTransfer;
-    const files = (dataTransfer === null || dataTransfer === void 0 ? void 0 : dataTransfer.files) || [];
+    const isPaste = event.type === 'paste';
+    const dataTransfer = isPaste ? event.clipboardData : event.dataTransfer;
+    const files = Array.from((dataTransfer === null || dataTransfer === void 0 ? void 0 : dataTransfer.files) || []);
     const types = (dataTransfer === null || dataTransfer === void 0 ? void 0 : dataTransfer.types) || [];
     const isAudioVideoDisabled = (_bridge$activeEditor = bridge.activeEditor()) === null || _bridge$activeEditor === void 0 ? void 0 : (_bridge$activeEditor$ = _bridge$activeEditor.props) === null || _bridge$activeEditor$ === void 0 ? void 0 : _bridge$activeEditor$.instRecordDisabled; // delegate to tiny if there aren't any files to handle
 
@@ -143,9 +144,19 @@ tinymce.PluginManager.add('instructure_paste', function (editor) {
     event.preventDefault(); // Ensure the editor has focus, because downstream code requires that it does, and drag-n-drop
     // events can be started when the editor doesn't have focus.
 
-    if (!editor.hasFocus()) (_editor$rceWrapper = editor.rceWrapper) === null || _editor$rceWrapper === void 0 ? void 0 : _editor$rceWrapper.focus();
+    if (!editor.hasFocus()) (_editor$rceWrapper = editor.rceWrapper) === null || _editor$rceWrapper === void 0 ? void 0 : _editor$rceWrapper.focus(); // Checking if we've encountered an issue with file processing for paste events in the browser
+    // Specifically implementing due to this bug in Firefox: https://bugzilla.mozilla.org/show_bug.cgi?id=1699743
+    // However, there could be other issues that cause this condition so it's a nice safety net regardless
 
-    for (const file of Array.from(files)) {
+    if (isPaste && files.some(file => file.size === 0)) {
+      showFlashAlert({
+        message: "Wedi methu gludo un neu ragor o ffeiliau i fyny. Rhowch gynnig ar lwytho i fyny neu lusgo a gollwng ffeiliau.",
+        type: 'error'
+      });
+      return;
+    }
+
+    for (const file of files) {
       if (isAudioVideoDisabled && isAudioOrVideo(file.type)) {
         // Skip audio and video files when disabled
         continue;

package/lib/translated/cy/modules/rce/plugins/instructure_rce_external_tools/ExternalToolsEnv.js

@@ -115,19 +115,13 @@ export function externalToolsEnvFor(editor) {
       return (_props$canvasOrigin = (_props7 = props()) === null || _props7 === void 0 ? void 0 : _props7.canvasOrigin) !== null && _props$canvasOrigin !== void 0 ? _props$canvasOrigin : window.location.origin;
     },
 
-    get studioMediaOptionsEnabled() {
-      var _props$features$rce_s, _props8, _props8$features;
-
-      return (_props$features$rce_s = (_props8 = props()) === null || _props8 === void 0 ? void 0 : (_props8$features = _props8.features) === null || _props8$features === void 0 ? void 0 : _props8$features.rce_show_studio_media_options) !== null && _props$features$rce_s !== void 0 ? _props$features$rce_s : false;
-    },
-
     /**
      * Gets the context id that should be used when launching LTI iframes.
      */
     get containingCanvasLtiToolId() {
-      var _props9, _props9$externalTools;
+      var _props8, _props8$externalTools;
 
-      const propsToolId = (_props9 = props()) === null || _props9 === void 0 ? void 0 : (_props9$externalTools = _props9.externalToolsConfig) === null || _props9$externalTools === void 0 ? void 0 : _props9$externalTools.containingCanvasLtiToolId;
+      const propsToolId = (_props8 = props()) === null || _props8 === void 0 ? void 0 : (_props8$externalTools = _props8.externalToolsConfig) === null || _props8$externalTools === void 0 ? void 0 : _props8$externalTools.containingCanvasLtiToolId;
 
       if (typeof propsToolId === 'string') {
         return propsToolId;

package/lib/translated/cy/modules/rce/plugins/instructure_rce_external_tools/__tests__/ExternalToolsEnv.test.js

@@ -106,17 +106,4 @@ describe('ExternalToolsEnv', () => {
     rceWrapper.props.externalToolsConfig.ltiIframeAllowances = ['c', 'd'];
     expect(editorEnv().ltiIframeAllowPolicy).toEqual('c; d');
   });
-  test('studioMediaOptionsEnabled', () => {
-    expect(nullEnv().studioMediaOptionsEnabled).toEqual(false); // feature off
-
-    rceWrapper.props.features = {
-      rce_show_studio_media_options: false
-    };
-    expect(editorEnv().studioMediaOptionsEnabled).toEqual(false); // feature on
-
-    rceWrapper.props.features = {
-      rce_show_studio_media_options: true
-    };
-    expect(editorEnv().studioMediaOptionsEnabled).toEqual(true);
-  });
 });