@instructure/canvas-rce 5.6.0-beta.0 → 5.6.0

package/es/rce/plugins/instructure_links/components/Link.js

@@ -27,46 +27,9 @@ import { Flex } from '@instructure/ui-flex';
 import { View } from '@instructure/ui-view';
 import { Text } from '@instructure/ui-text';
 import { Focusable } from '@instructure/ui-focusable';
-import { SVGIcon } from '@instructure/ui-svg-images';
-import { IconDragHandleLine, IconAssignmentLine, IconDiscussionLine, IconModuleLine, IconQuizLine, IconAnnouncementLine, IconPublishSolid, IconUnpublishedSolid, IconDocumentLine } from '@instructure/ui-icons';
-
-function IconBlank() {
-  return /*#__PURE__*/React.createElement(SVGIcon, {
-    name: "IconBlank",
-    viewBox: "0 0 1920 1920"
-  }, /*#__PURE__*/React.createElement("g", {
-    role: "presentation"
-  }));
-}
-
-function getIcon(type) {
-  switch (type) {
-    case 'assignments':
-      return IconAssignmentLine;
-
-    case 'discussions':
-      return IconDiscussionLine;
-
-    case 'modules':
-      return IconModuleLine;
-
-    case 'quizzes':
-      return IconQuizLine;
-
-    case 'announcements':
-      return IconAnnouncementLine;
-
-    case 'wikiPages':
-      return IconDocumentLine;
-
-    case 'navigation':
-      return IconBlank;
-
-    default:
-      return IconDocumentLine;
-  }
-}
-
+import { IconDragHandleLine, IconPublishSolid, IconUnpublishedSolid } from '@instructure/ui-icons';
+import RCEGlobals from '../../../RCEGlobals';
+import { getIcon } from '../../shared/linkUtils';
 export default function Link(props) {
   const [isHovering, setIsHovering] = useState(false);
   const {
@@ -75,7 +38,8 @@ export default function Link(props) {
     date,
     date_type
   } = props.link;
-  const Icon = getIcon(props.type);
+  const type = props.type === 'quizzes' && props.link.quiz_type === 'quizzes.next' ? 'quizzes.next' : props.type;
+  const Icon = getIcon(type);
   const color = published ? 'success' : 'primary';
   let dateString = null;
 
@@ -83,8 +47,11 @@ export default function Link(props) {
     if (date === 'multiple') {
       dateString = formatMessage('Due: Multiple Dates');
     } else {
+      var _RCEGlobals$getConfig;
+
       // Uses user locale and timezone
-      const when = formatMessage.date(applyTimezoneOffsetToDate(date, ENV.TIMEZONE), 'long');
+      const configuredTimezone = (_RCEGlobals$getConfig = RCEGlobals.getConfig()) === null || _RCEGlobals$getConfig === void 0 ? void 0 : _RCEGlobals$getConfig.timezone;
+      const when = formatMessage.date(applyTimezoneOffsetToDate(date, configuredTimezone), 'long');
 
       switch (date_type) {
         case 'todo':
@@ -196,7 +163,8 @@ export default function Link(props) {
       color: color
     }, /*#__PURE__*/React.createElement(Icon, {
       size: "x-small",
-      inline: false
+      inline: false,
+      "data-type": type
     }))), /*#__PURE__*/React.createElement(Flex.Item, {
       padding: "0 x-small 0 0",
       grow: true,

package/es/rce/plugins/instructure_links/components/LinkOptionsTray/index.js

@@ -160,10 +160,10 @@ export default function LinkOptionsTray(props) {
   }, /*#__PURE__*/React.createElement(Heading, {
     as: "h2"
   }, formatMessage('Link Options'))), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
-    placement: "static",
-    variant: "icon",
-    onClick: props.onRequestClose
-  }, formatMessage('Close'))))), /*#__PURE__*/React.createElement(Flex.Item, {
+    color: "primary",
+    onClick: props.onRequestClose,
+    screenReaderLabel: formatMessage('Close')
+  })))), /*#__PURE__*/React.createElement(Flex.Item, {
     as: "form",
     grow: true,
     margin: "none",

package/es/rce/plugins/instructure_links/components/LinkSet.js

@@ -104,8 +104,7 @@ class LinkSet extends Component {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ScreenReaderContent, {
       id: this.describedByID
     }, formatMessage('Click to insert a link into the editor.')), /*#__PURE__*/React.createElement(List, {
-      variant: "unstyled",
-      as: "ul",
+      isUnstyled: true,
       margin: "0"
     }, this.props.collection.links.map((link, index, array) => /*#__PURE__*/React.createElement(List.Item, {
       key: link.href,

package/es/rce/plugins/instructure_media_embed/components/Embed.js

@@ -38,8 +38,9 @@ export function Embed(_ref) {
   }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(CloseButton, {
     onClick: onDismiss,
     offset: "medium",
-    placement: "end"
-  }, formatMessage('Close')), /*#__PURE__*/React.createElement(Heading, null, formatMessage('Embed'))), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(TextArea, {
+    placement: "end",
+    screenReaderLabel: formatMessage('Close')
+  }), /*#__PURE__*/React.createElement(Heading, null, formatMessage('Embed'))), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(TextArea, {
     maxHeight: "10rem",
     label: formatMessage('Embed Code'),
     value: embedCode,

package/es/rce/plugins/instructure_record/AudioOptionsTray/index.js

@@ -77,9 +77,10 @@ export default function AudioOptionsTray(_ref) {
     as: "h2"
   }, formatMessage('Audio Options'))), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
     placement: "static",
-    variant: "icon",
-    onClick: onDismiss
-  }, formatMessage('Close'))))), /*#__PURE__*/React.createElement(Flex.Item, {
+    color: "primary",
+    onClick: onDismiss,
+    screenReaderLabel: formatMessage('Close')
+  })))), /*#__PURE__*/React.createElement(Flex.Item, {
     as: "form",
     grow: true,
     margin: "none",

package/es/rce/plugins/instructure_record/VideoOptionsTray/index.js

@@ -17,8 +17,7 @@
  */
 import React, { useState } from 'react';
 import { arrayOf, bool, func, number, shape, string } from 'prop-types';
-import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { Button, CloseButton } from '@instructure/ui-buttons';
+import { Button, CloseButton, IconButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
 import { RadioInput, RadioInputGroup } from '@instructure/ui-radio-input';
 import { SimpleSelect } from '@instructure/ui-simple-select';
@@ -129,16 +128,18 @@ export default function VideoOptionsTray(props) {
   }, /*#__PURE__*/React.createElement(Tooltip, {
     on: ['hover', 'focus'],
     placement: "top",
-    tip: /*#__PURE__*/React.createElement(View, {
+    renderTip: /*#__PURE__*/React.createElement(View, {
       display: "block",
       id: "alt-text-label-tooltip",
       maxWidth: "14rem"
     }, tooltipText)
-  }, /*#__PURE__*/React.createElement(Button, {
-    icon: IconQuestionLine,
+  }, /*#__PURE__*/React.createElement(IconButton, {
+    renderIcon: IconQuestionLine,
     size: "small",
-    variant: "icon"
-  }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, tooltipText)))));
+    screenReaderLabel: tooltipText,
+    withBackground: false,
+    withBorder: false
+  }))));
   const messagesForSize = [];
 
   if (videoSize !== CUSTOM) {
@@ -179,10 +180,10 @@ export default function VideoOptionsTray(props) {
   }, /*#__PURE__*/React.createElement(Heading, {
     as: "h2"
   }, formatMessage('Video Options'))), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(CloseButton, {
-    placemet: "static",
-    variant: "icon",
-    onClick: onRequestClose
-  }, formatMessage('Close'))))), /*#__PURE__*/React.createElement(Flex.Item, {
+    color: "primary",
+    onClick: onRequestClose,
+    screenReaderLabel: formatMessage('Close')
+  })))), /*#__PURE__*/React.createElement(Flex.Item, {
     as: "form",
     grow: true,
     margin: "none",

package/es/rce/plugins/shared/ColorInput.js

@@ -152,14 +152,15 @@ export const ColorInput = _ref => {
       }, isOpen ? /*#__PURE__*/React.createElement(IconArrowOpenUpLine, null) : /*#__PURE__*/React.createElement(IconArrowOpenDownLine, null))
     }, /*#__PURE__*/React.createElement(CloseButton, {
       placement: "end",
-      onClick: () => setIsOpen(false)
-    }, formatMessage('Close')), /*#__PURE__*/React.createElement(Flex, {
+      onClick: () => setIsOpen(false),
+      screenReaderLabel: formatMessage('Close')
+    }), /*#__PURE__*/React.createElement(Flex, {
       alignItems: "center",
       as: "div",
       justifyItems: requireColor ? 'start' : 'center',
       padding: "x-large x-small small",
       width: "175px",
-      wrapItems: true,
+      wrap: "wrap",
       "data-testid": `${name}-popover`
     }, requireColor ? colorPreviews.slice(0, -1) : colorPreviews));
   }

package/es/rce/plugins/shared/ImageOptionsForm.js

@@ -54,13 +54,13 @@ const ImageOptionsForm = _ref => {
   }, /*#__PURE__*/React.createElement(Tooltip, {
     on: ['hover', 'focus'],
     placement: "top",
-    tip: /*#__PURE__*/React.createElement(View, {
+    renderTip: /*#__PURE__*/React.createElement(View, {
       display: "block",
       id: "alt-text-label-tooltip",
       maxWidth: "14rem"
     }, tooltipText)
   }, /*#__PURE__*/React.createElement(Button, {
-    icon: IconQuestionLine,
+    renderIcon: IconQuestionLine,
     size: "small",
     variant: "icon"
   }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, tooltipText)))));

package/es/rce/plugins/shared/Upload/ComputerPanel.js

@@ -25,9 +25,9 @@ import { StyleSheet, css } from 'aphrodite';
 import { FileDrop } from '@instructure/ui-file-drop';
 import { Billboard } from '@instructure/ui-billboard';
 import { Alert } from '@instructure/ui-alerts';
-import { Button } from '@instructure/ui-buttons';
+import { IconButton } from '@instructure/ui-buttons';
 import { px } from '@instructure/ui-utils';
-import { PresentationContent, ScreenReaderContent } from '@instructure/ui-a11y-content';
+import { PresentationContent } from '@instructure/ui-a11y-content';
 import { IconTrashLine } from '@instructure/ui-icons';
 import { Img } from '@instructure/ui-img';
 import { Text } from '@instructure/ui-text';
@@ -188,7 +188,7 @@ export default function ComputerPanel(_ref) {
           }),
           src: preview.preview,
           constrain: "contain",
-          inline: false
+          display: "block"
         });
       } else if (isText(theFile.type)) {
         return /*#__PURE__*/React.createElement(View, {
@@ -227,6 +227,7 @@ export default function ComputerPanel(_ref) {
   }
 
   if (theFile) {
+    const filename = theFile.name;
     return /*#__PURE__*/React.createElement("div", {
       style: {
         position: 'relative'
@@ -235,8 +236,8 @@ export default function ComputerPanel(_ref) {
     }, /*#__PURE__*/React.createElement(Flex, {
       direction: "row-reverse",
       margin: "none none medium"
-    }, /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(Button, {
-      buttonRef: el => {
+    }, /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(IconButton, {
+      elementRef: el => {
         clearButtonRef.current = el;
       },
       onClick: () => {
@@ -247,13 +248,16 @@ export default function ComputerPanel(_ref) {
           error: null
         });
       },
-      icon: IconTrashLine
-    }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, formatMessage('Clear selected file: {filename}', {
-      filename: theFile.name
-    })))), /*#__PURE__*/React.createElement(Flex.Item, {
+      renderIcon: IconTrashLine,
+      withBackground: false,
+      withBorder: false,
+      screenReaderLabel: formatMessage('Clear selected file: {filename}', {
+        filename
+      })
+    })), /*#__PURE__*/React.createElement(Flex.Item, {
       grow: true,
       shrink: true
-    }, /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement(Text, null, theFile.name)))), /*#__PURE__*/React.createElement(View, {
+    }, /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement(Text, null, filename)))), /*#__PURE__*/React.createElement(View, {
       as: "div",
       width: `${width}px`,
       height: `${height}px`,

package/es/rce/plugins/shared/Upload/UnsplashPanel.js

@@ -150,7 +150,8 @@ function Attribution(_ref) {
     href: profileUrl,
     target: "_blank",
     rel: "noopener",
-    fluidWidth: true
+    display: "block",
+    textAlign: "start"
   }, name)));
 }
 
@@ -239,7 +240,8 @@ export default function UnsplashPanel(_ref2) {
     key: resultImage.id
   }, /*#__PURE__*/React.createElement(Button, {
     variant: "link",
-    fluidWidth: true,
+    display: "block",
+    textAlign: "start",
     theme: {
       mediumPaddingHorizontal: '0'
     },

package/es/rce/plugins/shared/Upload/UploadFileModal.js

@@ -23,7 +23,6 @@ import { Heading } from '@instructure/ui-heading';
 import { Spinner } from '@instructure/ui-spinner';
 import { Tabs } from '@instructure/ui-tabs';
 import { ToggleDetails } from '@instructure/ui-toggle-details';
-import { Text } from '@instructure/ui-text';
 import formatMessage from '../../../../format-message';
 import RceApiSource from '../../../../rcs/api';
 import ImageOptionsForm from '../ImageOptionsForm';
@@ -158,8 +157,9 @@ const UploadFileModal = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
   }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(CloseButton, {
     onClick: onDismiss,
     offset: "small",
-    placement: "end"
-  }, formatMessage('Close')), /*#__PURE__*/React.createElement(Heading, null, label)), /*#__PURE__*/React.createElement(Modal.Body, {
+    placement: "end",
+    screenReaderLabel: formatMessage('Close')
+  }), /*#__PURE__*/React.createElement(Heading, null, label)), /*#__PURE__*/React.createElement(Modal.Body, {
     ref: ref
   }, /*#__PURE__*/React.createElement(Tabs, {
     onRequestTabChange: (event, _ref3) => {
@@ -176,7 +176,7 @@ const UploadFileModal = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
           renderTitle: function () {
             return formatMessage('Computer');
           },
-          selected: selectedPanel === 'COMPUTER'
+          isSelected: selectedPanel === 'COMPUTER'
         }, /*#__PURE__*/React.createElement(Suspense, {
           fallback: /*#__PURE__*/React.createElement(Spinner, {
             renderTitle: formatMessage('Loading'),
@@ -201,7 +201,7 @@ const UploadFileModal = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
           renderTitle: function () {
             return 'Unsplash';
           },
-          selected: selectedPanel === 'UNSPLASH'
+          isSelected: selectedPanel === 'UNSPLASH'
         }, /*#__PURE__*/React.createElement(Suspense, {
           fallback: /*#__PURE__*/React.createElement(Spinner, {
             renderTitle: formatMessage('Loading'),
@@ -221,7 +221,7 @@ const UploadFileModal = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
           renderTitle: function () {
             return formatMessage('URL');
           },
-          selected: selectedPanel === 'URL'
+          isSelected: selectedPanel === 'URL'
         }, /*#__PURE__*/React.createElement(Suspense, {
           fallback: /*#__PURE__*/React.createElement(Spinner, {
             renderTitle: formatMessage('Loading'),

package/es/rce/plugins/shared/linkUtils.js

@@ -0,0 +1,58 @@
+/*
+ * 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/>.
+ */
+import React from 'react';
+import { SVGIcon } from '@instructure/ui-svg-images';
+import { IconAssignmentLine, IconDiscussionLine, IconModuleLine, IconQuizLine, IconQuizSolid as IconNewQuiz, IconAnnouncementLine, IconDocumentLine } from '@instructure/ui-icons';
+export const IconBlank = props => {
+  return /*#__PURE__*/React.createElement(SVGIcon, Object.assign({
+    name: "IconBlank",
+    viewBox: "0 0 1920 1920"
+  }, props), /*#__PURE__*/React.createElement("g", {
+    role: "presentation"
+  }));
+};
+export const getIcon = type => {
+  switch (type) {
+    case 'assignments':
+      return IconAssignmentLine;
+
+    case 'discussions':
+      return IconDiscussionLine;
+
+    case 'modules':
+      return IconModuleLine;
+
+    case 'quizzes':
+      return IconQuizLine;
+
+    case 'quizzes.next':
+      return IconNewQuiz;
+
+    case 'announcements':
+      return IconAnnouncementLine;
+
+    case 'wikiPages':
+      return IconDocumentLine;
+
+    case 'navigation':
+      return IconBlank;
+
+    default:
+      return IconDocumentLine;
+  }
+};

package/es/rce/plugins/shared/useDataUrl.js

@@ -22,6 +22,7 @@ import { useState, useEffect } from 'react'; // Given a URL to some resource (li
 const useDataUrl = () => {
   const [url, setUrl] = useState('');
   const [dataUrl, setDataUrl] = useState('');
+  const [dataBlob, setDataBlob] = useState(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState();
   useEffect(() => {
@@ -37,7 +38,10 @@ const useDataUrl = () => {
         return new Promise((resolve, reject) => {
           const reader = new FileReader();
 
-          reader.onloadend = () => resolve(reader.result);
+          reader.onloadend = () => resolve({
+            result: reader.result,
+            blob
+          });
 
           reader.onerror = reject;
           reader.readAsDataURL(blob);
@@ -47,9 +51,14 @@ const useDataUrl = () => {
       }
     }
 
-    if (!!url) {
-      fetchDataUrl().then(result => {
+    if (url) {
+      fetchDataUrl().then(_ref => {
+        let {
+          result,
+          blob
+        } = _ref;
         setDataUrl(result);
+        setDataBlob(blob);
       }).catch(e => {
         setError(e);
       }).finally(() => setLoading(false));
@@ -59,7 +68,8 @@ const useDataUrl = () => {
     setUrl,
     dataUrl,
     dataLoading: loading,
-    dataError: error
+    dataError: error,
+    dataBlob
   };
 };
 

package/es/rce/userOS.js

@@ -0,0 +1,31 @@
+/*
+ * 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/>.
+ */
+export const determineUserOS = () => {
+  const rawOS = navigator.userAgent;
+  if (rawOS.indexOf('Mac') !== -1) return 'Mac';else if (rawOS.indexOf('Win') !== -1) return 'Windows';else return 'Other';
+};
+export const determineOSDependentKey = () => {
+  switch (determineUserOS()) {
+    case 'Mac':
+      return 'OPTION';
+
+    case 'Windows':
+    default:
+      return 'ALT';
+  }
+};

package/jest/jest-setup.js

@@ -41,6 +41,4 @@ if (typeof window.URL.createObjectURL === 'undefined') {
 }
 
 window.scroll = () => {}
-window.ENV = {
-  FEATURES: {}
-}
+window.ENV = {}

package/jest.config.js

@@ -31,10 +31,10 @@ module.exports = {
   ],
   setupFilesAfterEnv: [
     '<rootDir>/jest/jest-setup-framework.js',
-    '<rootDir>/../../jest/stubInstUi.js',
+    '<rootDir>/../../jest/stubInstUi.js'
   ],
   testPathIgnorePatterns: ['<rootDir>/node_modules', '<rootDir>/lib', '<rootDir>/canvas'],
-  testMatch: ['**/__tests__/**/?(*.)(spec|test).js'],
+  testMatch: ['**/__tests__/**/?(*.)(spec|test).[jt]s?(x)'],
   modulePathIgnorePatterns: ['<rootDir>/es', '<rootDir>/lib', '<rootDir>/canvas'],
   testEnvironment: '<rootDir>../../jest/strictTimeLimitEnvironment.js',
   moduleNameMapper: {
@@ -47,11 +47,15 @@ module.exports = {
   },
 
   transform: {
-    '\\.jsx?$': [
+    '\\.[jt]sx?$': [
       'babel-jest',
       {
         configFile: false,
-        presets: [['@babel/preset-env'], ['@babel/preset-react', {}]],
+        presets: [
+          ['@babel/preset-env'],
+          ['@babel/preset-react', {}],
+          ['@babel/preset-typescript', {}]
+        ],
         plugins: [
           ['@babel/plugin-proposal-decorators', {legacy: true}],
           [

package/lib/canvasFileBrowser/FlashAlert.js

@@ -49,10 +49,11 @@ import { Button } from '@instructure/ui-buttons';
 import { Text } from '@instructure/ui-text';
 import { PresentationContent, ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Transition } from '@instructure/ui-motion';
+import RCEGlobals from '../rce/RCEGlobals';
 const messageHolderId = 'flashalert_message_holder'; // specs fail if I reuse jquery's elements
 
 const screenreaderMessageHolderId = 'flash_screenreader_holder';
-const timeout = 10000; // An Alert with a message and "Details" button which surfaces
+const TIMEOUT = 10000; // An Alert with a message and "Details" button which surfaces
 // more info about the error when pressed.
 // Is displayed at the top of the document, and will close itself after a while
 
@@ -187,7 +188,7 @@ FlashAlert.propTypes = {
 FlashAlert.defaultProps = {
   error: null,
   variant: 'info',
-  timeout,
+  timeout: TIMEOUT,
   screenReaderOnly: false
 };
 export function showFlashAlert(_ref) {
@@ -218,13 +219,15 @@ export function showFlashAlert(_ref) {
   }
 
   function renderAlert(parent) {
+    var _RCEGlobals$getConfig;
+
+    const configuredTimeout = (_RCEGlobals$getConfig = RCEGlobals.getConfig()) === null || _RCEGlobals$getConfig === void 0 ? void 0 : _RCEGlobals$getConfig.flashAlertTimeout;
     ReactDOM.render( /*#__PURE__*/React.createElement(FlashAlert, {
       message: message,
-      timeout: Number.isNaN(parseInt(ENV.flashAlertTimeout, 10)) ? timeout : ENV.flashAlertTimeout,
+      timeout: Number.isNaN(parseInt(configuredTimeout, 10)) ? TIMEOUT : configuredTimeout,
       error: err,
       variant: type,
-      onClose: closeAlert.bind(null, parent) // eslint-disable-line react/jsx-no-bind
-      ,
+      onClose: closeAlert.bind(null, parent),
       screenReaderOnly: srOnly
     }), parent);
   }

package/lib/common/components/LoadMore.js

@@ -68,7 +68,8 @@ class LoadMore extends Component {
     }, /*#__PURE__*/React.createElement(Button, {
       variant: "link",
       onClick: this.loadMore,
-      fluidWidth: true
+      display: "block",
+      textAlign: "start"
     }, formatMessage('Load more results'))), hasChildren && this.props.hasMore && /*#__PURE__*/React.createElement("div", {
       "aria-hidden": !this.props.isLoading,
       className: css(styles.loader),

package/lib/rce/KeyboardShortcutModal.js

@@ -24,7 +24,9 @@ import { Modal } from '@instructure/ui-modal';
 import { CloseButton } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
 import formatMessage from '../format-message';
+import { determineOSDependentKey } from './userOS';
 export default function KeyboardShortcutModal(props) {
+  const OSKey = determineOSDependentKey();
   return /*#__PURE__*/React.createElement(Modal, {
     "data-testid": "RCE_KeyboardShortcutModal",
     "data-mce-component": true,
@@ -39,22 +41,23 @@ export default function KeyboardShortcutModal(props) {
   }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(CloseButton, {
     placement: "end",
     offset: "medium",
-    variant: "icon",
-    onClick: props.onDismiss
-  }, formatMessage('Close')), /*#__PURE__*/React.createElement(Heading, null, formatMessage('Keyboard Shortcuts'))), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(View, {
+    color: "primary",
+    onClick: props.onDismiss,
+    screenReaderLabel: formatMessage('Close')
+  }), /*#__PURE__*/React.createElement(Heading, null, formatMessage('Keyboard Shortcuts'))), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(View, {
     as: "div",
     margin: "small"
   }, /*#__PURE__*/React.createElement(List, {
-    variant: "unstyled"
+    isUnstyled: true
   }, /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
-  }, "ALT+F8/ALT+0"), ' ', formatMessage('Open this keyboard shortcuts dialog')), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
+  }, OSKey, "+F8/", OSKey, "+0"), ' ', formatMessage('Open this keyboard shortcuts dialog')), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
   }, "CTRL+F9"), " ", formatMessage('Focus element options toolbar')), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
-  }, "ALT+F9"), " ", formatMessage("Go to the editor's menubar")), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
+  }, OSKey, "+F9"), " ", formatMessage("Go to the editor's menubar")), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
-  }, "ALT+F10"), " ", formatMessage("Go to the editor's toolbar")), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
+  }, OSKey, "+F10"), " ", formatMessage("Go to the editor's toolbar")), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
   }, "ESC"), ' ', formatMessage('Close a menu or dialog. Also returns you to the editor area')), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"

package/lib/rce/RCE.js

@@ -59,6 +59,7 @@ const RCE = /*#__PURE__*/forwardRef(function RCE(props, rceRef) {
     textareaClassName,
     rcsProps,
     use_rce_icon_maker,
+    features,
     onFocus,
     onBlur,
     onInit,
@@ -97,6 +98,7 @@ const RCE = /*#__PURE__*/forwardRef(function RCE(props, rceRef) {
       textareaClassName,
       trayProps: rcsProps,
       use_rce_icon_maker,
+      features,
       editorOptions: Object.assign(editorOptions, {
         selector: `#${textareaId}`,
         height,
@@ -186,6 +188,12 @@ RCE.propTypes = {
   rcsProps: trayPropTypes,
   // enable the custom icon maker feature (temporary until the feature is forced on)
   use_rce_icon_maker: bool,
+  // record of feature statuses from containing page
+  features: objectOf(bool),
+  // configurable default timeout value for flash alerts
+  flashAlertTimeout: number,
+  // user's timezone
+  timezone: string.isRequired,
   // event handlers
   onFocus: func,
   // f(RCEWrapper component)