@instructure/canvas-rce 5.6.16 → 5.7.0

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

@@ -26,7 +26,7 @@ import { Button, IconButton, CondensedButton } from '@instructure/ui-buttons';
 import { Flex } from '@instructure/ui-flex';
 import { View } from '@instructure/ui-view';
 import { Badge } from '@instructure/ui-badge';
-import { ApplyTheme } from '@instructure/ui-themeable';
+import { InstUISettingsProvider } from '@instructure/emotion';
 import { Text } from '@instructure/ui-text';
 import { SVGIcon } from '@instructure/ui-svg-images';
 import { IconA11yLine, IconKeyboardShortcutsLine, IconMiniArrowEndLine, IconFullScreenLine, IconExitFullScreenLine } from '@instructure/ui-icons';
@@ -192,10 +192,12 @@ export default function StatusBar(props) {
       return button;
     }
 
-    return /*#__PURE__*/React.createElement(ApplyTheme, {
+    return /*#__PURE__*/React.createElement(InstUISettingsProvider, {
       theme: {
-        [Badge.theme]: {
-          colorPrimary: props.a11yBadgeColor
+        componentOverrides: {
+          Badge: {
+            colorPrimary: props.a11yBadgeColor
+          }
         }
       }
     }, /*#__PURE__*/React.createElement(Badge, {

package/lib/translated/th/modules/rce/__tests__/RCE.test.js

@@ -36,7 +36,7 @@ describe('RCE', () => {
     render( /*#__PURE__*/React.createElement(RCE, {
       textareaId: "textarea3"
     }), target);
-    await waitFor(() => expect(bridge.activeEditor().constructor.displayName).toEqual('RCEWrapper'));
+    await waitFor(() => expect(bridge.activeEditor().constructor.name).toEqual('RCEWrapper'));
   });
   it('supports getCode() and setCode() on its ref', async () => {
     const rceRef = /*#__PURE__*/createRef(null);

package/lib/translated/th/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,46 +676,20 @@ 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', () => {
+    it('instructure_rce_external_tools if rcs available', () => {
       for (const rcsAvailable in [true, false]) {
-        for (const flagEnabled in [true, false]) {
-          for (const onCanvasDomain in [true, false]) {
-            const enabledPlugins = createBasicElement({
-              canvasOrigin: onCanvasDomain ? window.location.origin : 'https://nq.com',
-              trayProps: { ...trayProps().trayProps,
-                ...(rcsAvailable ? {} : {
-                  jwt: null
-                })
-              },
-              features: {
-                rce_new_external_tool_dialog_in_canvas: flagEnabled
-              }
-            }).wrapOptions().plugins;
-
-            if (rcsAvailable && (flagEnabled || !onCanvasDomain)) {
-              expect(enabledPlugins).toContain('instructure_rce_external_tools');
-            } else {
-              expect(enabledPlugins).not.toContain('instructure_rce_external_tools');
-            }
+        const enabledPlugins = createBasicElement({
+          trayProps: { ...trayProps().trayProps,
+            ...(rcsAvailable ? {} : {
+              jwt: null
+            })
           }
+        }).wrapOptions().plugins;
+
+        if (rcsAvailable) {
+          expect(enabledPlugins).toContain('instructure_rce_external_tools');
+        } else {
+          expect(enabledPlugins).not.toContain('instructure_rce_external_tools');
         }
       }
     });

package/lib/translated/th/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/th/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/th/modules/rce/plugins/instructure_links/components/CollectionPanel.js

@@ -17,7 +17,7 @@
  */
 import React from 'react';
 import { bool, func, string } from 'prop-types';
-import { collectionsShape } from './propTypes';
+import { collectionsShape, linkShape } from './propTypes';
 import AccordionSection from './AccordionSection';
 import LinkSet from './LinkSet';
 export default function CollectionPanel(props) {
@@ -52,7 +52,8 @@ export default function CollectionPanel(props) {
     contextType: props.contextType,
     searchString: props.searchString,
     editing: props.editing,
-    onEditClick: props.onEditClick
+    onEditClick: props.onEditClick,
+    selectedLink: props.selectedLink
   })));
 }
 CollectionPanel.propTypes = {
@@ -72,7 +73,8 @@ CollectionPanel.propTypes = {
   onChangeAccordion: func.isRequired,
   selectedAccordionIndex: string,
   editing: bool,
-  onEditClick: func
+  onEditClick: func,
+  selectedLink: linkShape
 };
 CollectionPanel.defaultProps = {
   renderNewPageLink: false,

package/lib/translated/th/modules/rce/plugins/instructure_links/components/Link.js

@@ -22,7 +22,7 @@ import formatMessage from '../../../../format-message';
 import { renderLink as renderLinkHtml } from '../../../contentRendering';
 import dragHtml from '../../../../sidebar/dragHtml';
 import { applyTimezoneOffsetToDate } from '../../shared/dateUtils';
-import { AccessibleContent } from '@instructure/ui-a11y-content';
+import { AccessibleContent, ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Flex } from '@instructure/ui-flex';
 import { View } from '@instructure/ui-view';
 import { Text } from '@instructure/ui-text';
@@ -182,7 +182,9 @@ export default function Link(props) {
     }, /*#__PURE__*/React.createElement(View, {
       as: "div",
       margin: "0"
-    }, title), dateString ? /*#__PURE__*/React.createElement(View, {
+    }, title, props.isSelected && /*#__PURE__*/React.createElement(ScreenReaderContent, {
+      "data-testid": "selected-link-indicator"
+    }, "Selected")), dateString ? /*#__PURE__*/React.createElement(View, {
       as: "div"
     }, dateString) : null), 'published' in props.link && /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(AccessibleContent, {
       alt: publishedMsg
@@ -202,5 +204,6 @@ Link.propTypes = {
   describedByID: string.isRequired,
   elementRef: func,
   editing: bool,
-  onEditClick: func
+  onEditClick: func,
+  isSelected: bool
 };

package/lib/translated/th/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/th/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"
   }, "Done"))))));

package/lib/translated/th/modules/rce/plugins/instructure_links/components/LinkSet.js

@@ -17,7 +17,7 @@
  */
 import React, { Component, useRef } from 'react';
 import { bool, func, string } from 'prop-types';
-import { linksShape, linkType } from './propTypes';
+import { linkShape, linksShape, linkType } from './propTypes';
 import formatMessage from '../../../../format-message';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { List } from '@instructure/ui-list';
@@ -89,6 +89,13 @@ class LinkSet extends Component {
     return !this.hasLinks(props) && !props.collection.hasMore && !props.collection.isLoading;
   }
 
+  compareURLs() {
+    let url1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    let url2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    if (url1 === '' || url2 === '') return false;
+    return url1.split('?')[0] === url2.split('?')[0];
+  }
+
   renderLinks(lastItemRef) {
     function refFor(index, array) {
       if (!lastItemRef || index !== array.length - 1) {
@@ -107,19 +114,24 @@ class LinkSet extends Component {
       variant: "unstyled",
       as: "ul",
       margin: "0"
-    }, this.props.collection.links.map((link, index, array) => /*#__PURE__*/React.createElement(List.Item, {
-      key: link.href,
-      spacing: "none",
-      padding: "0"
-    }, /*#__PURE__*/React.createElement(Link, {
-      link: link,
-      type: this.props.type,
-      onClick: this.props.onLinkClick,
-      describedByID: this.describedByID,
-      elementRef: refFor(index, array),
-      editing: this.props.editing,
-      onEditClick: this.props.onEditClick
-    })))));
+    }, this.props.collection.links.map((link, index, array) => {
+      var _this$props$selectedL;
+
+      return /*#__PURE__*/React.createElement(List.Item, {
+        key: link.href,
+        spacing: "none",
+        padding: "0"
+      }, /*#__PURE__*/React.createElement(Link, {
+        link: link,
+        type: this.props.type,
+        onClick: this.props.onLinkClick,
+        describedByID: this.describedByID,
+        elementRef: refFor(index, array),
+        editing: this.props.editing,
+        onEditClick: this.props.onEditClick,
+        isSelected: this.compareURLs((_this$props$selectedL = this.props.selectedLink) === null || _this$props$selectedL === void 0 ? void 0 : _this$props$selectedL.href, link.href)
+      }));
+    })));
   }
 
   renderEmptyIndicator() {
@@ -171,6 +183,7 @@ LinkSet.propTypes = {
   suppressRenderEmpty: bool,
   searchString: string,
   editing: bool,
-  onEditClick: func
+  onEditClick: func,
+  selectedLink: linkShape
 };
 export default LinkSet;

package/lib/translated/th/modules/rce/plugins/instructure_links/components/LinksPanel.js

@@ -18,7 +18,7 @@
 import React from 'react';
 import { bool, func, string } from 'prop-types';
 import formatMessage from '../../../../format-message';
-import { collectionsShape } from './propTypes';
+import { collectionsShape, linkShape } from './propTypes';
 import NavigationPanel from './NavigationPanel';
 import CollectionPanel from './CollectionPanel';
 import { View } from '@instructure/ui-view';
@@ -34,31 +34,37 @@ function LinksPanel(props) {
   }, (isCourse || isGroup) && /*#__PURE__*/React.createElement(CollectionPanel, Object.assign({}, collectionProps, {
     editing: props.editing,
     onEditClick: props.onEditClick,
+    selectedLink: props.selectedLink,
     collection: "wikiPages",
     label: "Pages"
   })), isCourse && /*#__PURE__*/React.createElement(CollectionPanel, Object.assign({}, collectionProps, {
     editing: props.editing,
     onEditClick: props.onEditClick,
+    selectedLink: props.selectedLink,
     collection: "assignments",
     label: "Assignments"
   })), isCourse && /*#__PURE__*/React.createElement(CollectionPanel, Object.assign({}, collectionProps, {
     editing: props.editing,
     onEditClick: props.onEditClick,
+    selectedLink: props.selectedLink,
     collection: "quizzes",
     label: "Quizzes"
   })), (isCourse || isGroup) && /*#__PURE__*/React.createElement(CollectionPanel, Object.assign({}, collectionProps, {
     editing: props.editing,
     onEditClick: props.onEditClick,
+    selectedLink: props.selectedLink,
     collection: "announcements",
     label: "Announcements"
   })), (isCourse || isGroup) && /*#__PURE__*/React.createElement(CollectionPanel, Object.assign({}, collectionProps, {
     editing: props.editing,
     onEditClick: props.onEditClick,
+    selectedLink: props.selectedLink,
     collection: "discussions",
     label: "Discussions"
   })), isCourse && /*#__PURE__*/React.createElement(CollectionPanel, Object.assign({}, collectionProps, {
     editing: props.editing,
     onEditClick: props.onEditClick,
+    selectedLink: props.selectedLink,
     collection: "modules",
     label: "Modules"
   })), /*#__PURE__*/React.createElement(NavigationPanel, {
@@ -84,7 +90,8 @@ LinksPanel.propTypes = {
   onLinkClick: func,
   canCreatePages: bool,
   editing: bool,
-  onEditClick: func
+  onEditClick: func,
+  selectedLink: linkShape
 };
 LinksPanel.defaultProps = {
   selectedAccordionIndex: '',

package/lib/translated/th/modules/rce/plugins/instructure_links/components/__tests__/LinkSet.test.js

@@ -180,4 +180,27 @@ describe('RCE "Links" Plugin > LinkSet', () => {
     });
     expect(getByText('Loading')).toBeInTheDocument();
   });
+  it('adds a SR indicator to the selected link', async () => {
+    const {
+      findByTestId
+    } = renderComponent({
+      collection: {
+        hasMore: false,
+        isLoading: false,
+        links: [{
+          href: 'url1',
+          title: 'link1'
+        }, {
+          href: 'url2',
+          title: 'link2'
+        }],
+        lastError: {}
+      },
+      selectedLink: {
+        href: 'url2',
+        title: 'link2'
+      }
+    });
+    expect(await findByTestId('selected-link-indicator')).toBeInTheDocument();
+  });
 });

package/lib/translated/th/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: "One or more files failed to paste. Please try uploading or dragging and dropping files.",
+        type: 'error'
+      });
+      return;
+    }
+
+    for (const file of files) {
       if (isAudioVideoDisabled && isAudioOrVideo(file.type)) {
         // Skip audio and video files when disabled
         continue;

package/lib/translated/th/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;