@instructure/canvas-rce 5.14.0 → 5.14.2

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

@@ -15,13 +15,13 @@
  * 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 { fromImageEmbed, fromVideoEmbed } from '../instructure_image/ImageEmbedOptions';
-import { isOnlyTextSelected } from '../../contentInsertionUtils'; // eslint-disable-next-line import/no-nodejs-modules
 
-import * as url from 'url';
+import { fromImageEmbed, fromVideoEmbed } from '../instructure_image/ImageEmbedOptions';
+import { isOnlyTextSelected } from '../../contentInsertionUtils';
 import formatMessage from '../../../format-message';
 import { isStudioEmbeddedMedia } from './StudioLtiSupportUtils';
 import RCEGlobals from '../../RCEGlobals';
+import { parseUrlPath } from '../../../util/url-util';
 const FILE_DOWNLOAD_PATH_REGEX = /^\/(courses\/\d+\/)?files\/\d+\/download$/;
 export const LINK_TYPE = 'link';
 export const FILE_LINK_TYPE = 'file-link';
@@ -35,37 +35,29 @@ export const DISPLAY_AS_EMBED_DISABLED = 'embed-disabled';
 export const DISPLAY_AS_DOWNLOAD_LINK = 'download-link';
 export function asImageEmbed($element) {
   const nodeName = $element === null || $element === void 0 ? void 0 : $element.nodeName.toLowerCase();
-
   if (nodeName !== 'img') {
     return null;
   }
-
-  return { ...fromImageEmbed($element),
+  return {
+    ...fromImageEmbed($element),
     $element,
     type: IMAGE_EMBED_TYPE
   };
 }
 export function asLink($element, editor) {
   var _$link;
-
   let $link = $element;
-
   if (((_$link = $link) === null || _$link === void 0 ? void 0 : _$link.tagName) !== 'A') {
     // the user may have selected some text that is w/in a link
     // but didn't include the <a>. Let's see if that's true
-    $link = editor.dom.getParent($link, 'a[href]');
+    $link = editor && editor.dom.getParent($link, 'a[href]');
   }
-
   if (!$link || $link.tagName !== 'A' || !$link.href) {
     return null;
   }
-
-  const {
-    pathname
-  } = url.parse($link.href);
+  const pathname = parseUrlPath($link.href);
   const type = FILE_DOWNLOAD_PATH_REGEX.test(pathname) ? FILE_LINK_TYPE : LINK_TYPE;
   let displayAs = DISPLAY_AS_LINK;
-
   if ($link.classList.contains('no_preview')) {
     displayAs = DISPLAY_AS_DOWNLOAD_LINK;
   } else if ($link.classList.contains('auto_open')) {
@@ -73,7 +65,6 @@ export function asLink($element, editor) {
   } else if ($link.classList.contains('inline_disabled')) {
     displayAs = DISPLAY_AS_EMBED_DISABLED;
   }
-
   const contentType = $link.getAttribute('data-course-type');
   const fileName = $link.getAttribute('title');
   const published = $link.getAttribute('data-published') === 'true';
@@ -91,7 +82,9 @@ export function asLink($element, editor) {
     fileName,
     published
   };
-} // the video element is a bit tricky.
+}
+
+// the video element is a bit tricky.
 // tinymce won't let me add many attributes to the iframe,
 // even though I've listed them in tinymce.config.js
 // extended_valid_elements.
@@ -99,17 +92,14 @@ export function asLink($element, editor) {
 // and it's attributes, even though this could change with future
 // tinymce releases.
 // see https://github.com/tinymce/tinymce/issues/5181
-
 export function asVideoElement($element) {
   var _$videoElem$parentEle;
-
   const $videoElem = findMediaPlayerIframe($element);
-
   if (!isVideoElement($videoElem) && !isStudioEmbeddedMedia($videoElem)) {
     return null;
   }
-
-  return { ...fromVideoEmbed($videoElem),
+  return {
+    ...fromVideoEmbed($videoElem),
     $element,
     type: VIDEO_EMBED_TYPE,
     id: ((_$videoElem$parentEle = $videoElem.parentElement) === null || _$videoElem$parentEle === void 0 ? void 0 : _$videoElem$parentEle.getAttribute('data-mce-p-data-media-id')) || $videoElem.getAttribute('data-mce-p-data-media-id')
@@ -117,11 +107,9 @@ export function asVideoElement($element) {
 }
 export function asAudioElement($element) {
   var _$element$parentEleme;
-
   if (!$element) {
     return null;
   }
-
   const $audioIframe = $element.tagName === 'IFRAME' ? $element : $element.firstElementChild;
   const $tinymceIframeShim = $audioIframe.parentElement;
   const title = ($audioIframe.getAttribute('title') || $tinymceIframeShim.getAttribute('data-mce-p-title') || '').replace(formatMessage('Video player for '), '');
@@ -129,69 +117,55 @@ export function asAudioElement($element) {
     titleText: title,
     id: ((_$element$parentEleme = $element.parentElement) === null || _$element$parentEleme === void 0 ? void 0 : _$element$parentEleme.getAttribute('data-mce-p-data-media-id')) || $element.getAttribute('data-mce-p-data-media-id')
   };
-
   if ($audioIframe.tagName === 'IFRAME') {
     const audioDoc = $audioIframe.contentDocument;
-
     try {
       var _audioDoc$querySelect;
-
       const trackSJson = (_audioDoc$querySelect = audioDoc.querySelector('[data-tracks]')) === null || _audioDoc$querySelect === void 0 ? void 0 : _audioDoc$querySelect.getAttribute('data-tracks');
-
       if (trackSJson) {
         audioOptions.tracks = JSON.parse(trackSJson);
-      } // eslint-disable-next-line no-empty
-
+      }
+      // eslint-disable-next-line no-empty
     } catch (e) {}
   }
-
   if (RCEGlobals.getFeatures().media_links_use_attachment_id) {
     const source = $audioIframe.getAttribute('src');
     const matches = source === null || source === void 0 ? void 0 : source.match(/\/media_attachments_iframe\/(\d+)/);
-
     if (matches) {
       audioOptions.attachmentId = matches[1];
     }
   }
-
   return audioOptions;
 }
-
 function asText($element, editor) {
   const text = editor && editor.selection.getContent({
     format: 'text'
   });
-
   if (!text) {
     return null;
   }
-
   return {
     $element,
     text,
     type: TEXT_TYPE
   };
 }
-
 function asNone($element) {
   return {
     $element: $element || null,
     type: NONE_TYPE
   };
 }
-
 export function getContentFromElement($element, editor) {
   if (!($element && $element.nodeName)) {
     return asNone();
   }
-
   const content = asLink($element, editor) || asImageEmbed($element) || asVideoElement($element) || asText($element, editor) || asNone($element);
   return content;
 }
 export function getContentFromEditor(editor) {
   let expandSelection = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   let $element;
-
   if (editor && editor.selection) {
     // tinymce selects the element around the cursor, whether it's
     // content is selected in the copy/paste sense or not.
@@ -201,15 +175,14 @@ export function getContentFromEditor(editor) {
       $element = editor.selection.getNode();
     }
   }
-
   if ($element == null) {
     return asNone();
   }
-
   return getContentFromElement($element, editor);
-} // if the selection is somewhere w/in a <a>,
-// find the <a> and return it's info
+}
 
+// if the selection is somewhere w/in a <a>,
+// find the <a> and return it's info
 export function getLinkContentFromEditor(editor) {
   const $element = editor.selection.getNode();
   return $element ? asLink($element, editor) : null;
@@ -220,33 +193,25 @@ export function isFileLink($element, editor) {
 export function isImageEmbed($element) {
   return !!asImageEmbed($element) && !$element.getAttribute('data-placeholder-for');
 }
-
 function isMediaElement($element, mediaType) {
   var _tinymceIframeShim$fi, _tinymceIframeShim$ge;
-
   // the video is hosted in an iframe, but tinymce
   // wraps it in a span with swizzled attribute names
   if (!($element !== null && $element !== void 0 && $element.getAttribute) || !$element) {
     return false;
   }
-
   const tinymceIframeShim = $element.tagName === 'IFRAME' ? $element.parentElement : $element;
-
   if (((_tinymceIframeShim$fi = tinymceIframeShim.firstElementChild) === null || _tinymceIframeShim$fi === void 0 ? void 0 : _tinymceIframeShim$fi.tagName) !== 'IFRAME') {
     return false;
   }
-
   const media_obj_id = tinymceIframeShim.getAttribute('data-mce-p-data-media-id');
   const is_media_attachment_iframe = (_tinymceIframeShim$ge = tinymceIframeShim.getAttribute('data-mce-p-src')) === null || _tinymceIframeShim$ge === void 0 ? void 0 : _tinymceIframeShim$ge.includes('media_attachments_iframe');
-
   if (!media_obj_id && !is_media_attachment_iframe) {
     return false;
   }
-
   const media_type = tinymceIframeShim.getAttribute('data-mce-p-data-media-type');
   return media_type === mediaType;
 }
-
 export function isVideoElement($element) {
   return isMediaElement($element, 'video');
 }
@@ -255,27 +220,21 @@ export function isAudioElement($element) {
 }
 export function findMediaPlayerIframe(elem) {
   var _elem$firstElementChi;
-
   if (!elem) return null;
-
   if (elem.tagName === 'IFRAME') {
     // we have the iframe
     return elem;
   }
-
   if (((_elem$firstElementChi = elem.firstElementChild) === null || _elem$firstElementChi === void 0 ? void 0 : _elem$firstElementChi.tagName) === 'IFRAME') {
     // we have the shim tinymce puts around the iframe
     return elem.firstElementChild;
   }
-
   if (elem.classList.contains('mce-shim')) {
     var _elem$previousSibling;
-
     // tinymce puts a <span class='mce-shin'> after the iframe (since v5, I think)
     if (((_elem$previousSibling = elem.previousSibling) === null || _elem$previousSibling === void 0 ? void 0 : _elem$previousSibling.tagName) === 'IFRAME') {
       return elem.previousSibling;
     }
   }
-
   return null;
 }

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

@@ -15,52 +15,45 @@
  * 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/>.
  */
+
 function scaleEvenly(width, height, scaleFactor, constraints) {
   const minHeight = constraints.minHeight || 0;
   const minWidth = constraints.minWidth || 0;
   const scaledWidth = width * scaleFactor;
   const scaledHeight = height * scaleFactor;
   let minimumScaleFactor = scaleFactor;
-
   if (scaledWidth < minWidth) {
     const atLeastMinWidth = Math.max(scaledWidth, minWidth);
     minimumScaleFactor = atLeastMinWidth / width;
   }
-
   if (scaledHeight < minHeight) {
     const atLeastMinHeight = Math.max(scaledHeight, minHeight);
     minimumScaleFactor = Math.max(atLeastMinHeight / height, minimumScaleFactor);
   }
-
   return {
     height: Math.round(height * minimumScaleFactor),
     width: Math.round(width * minimumScaleFactor)
   };
 }
-
 export function scaleForHeight(width, height, targetHeight) {
   let constraints = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
   if (targetHeight == null) {
     return {
       height: null,
       width: null
     };
   }
-
   const scaleFactor = targetHeight / height;
   return scaleEvenly(width, height, scaleFactor, constraints);
 }
 export function scaleForWidth(width, height, targetWidth) {
   let constraints = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
   if (targetWidth == null) {
     return {
       height: null,
       width: null
     };
   }
-
   const scaleFactor = targetWidth / width;
   return scaleEvenly(width, height, scaleFactor, constraints);
 }

package/es/rce/plugins/shared/DimensionsInput/DimensionInput.js

@@ -15,6 +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 React from 'react';
 import { func, shape, string } from 'prop-types';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
@@ -22,34 +23,33 @@ import { NumberInput } from '@instructure/ui-number-input';
 export default function DimensionInput(props) {
   const {
     dimensionState,
-    label
+    label,
+    messages
   } = props;
   const {
     addOffset,
     inputValue,
     setInputValue
   } = dimensionState;
-
   function handleChange(_event, value) {
     setInputValue(value);
   }
-
   function handleDecrement() {
     addOffset(-1);
   }
-
   function handleIncrement() {
     addOffset(1);
   }
-
   return /*#__PURE__*/React.createElement(NumberInput, {
+    allowStringValue: true,
     renderLabel: /*#__PURE__*/React.createElement(ScreenReaderContent, null, label),
     onChange: handleChange,
     onDecrement: handleDecrement,
     onIncrement: handleIncrement,
     isRequired: true,
     showArrows: false,
-    value: inputValue
+    value: inputValue,
+    messages: messages
   });
 }
 DimensionInput.propTypes = {

package/es/rce/plugins/shared/DimensionsInput/index.js

@@ -15,24 +15,34 @@
  * 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 { bool, func, number, shape, string } from 'prop-types';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { FormFieldGroup } from '@instructure/ui-form-field';
-import { IconLockLine } from '@instructure/ui-icons';
+import { IconLockLine, IconWarningSolid } from '@instructure/ui-icons';
 import { Flex } from '@instructure/ui-flex';
 import { Text } from '@instructure/ui-text';
 import { RadioInput, RadioInputGroup } from '@instructure/ui-radio-input';
 import formatMessage from '../../../../format-message';
 import DimensionInput from './DimensionInput';
 export { default as useDimensionsState } from './useDimensionsState';
-
+const errorMessage = message => {
+  return /*#__PURE__*/React.createElement(Flex, {
+    gap: "xx-small",
+    alignItems: "center"
+  }, /*#__PURE__*/React.createElement(IconWarningSolid, {
+    color: "error"
+  }), /*#__PURE__*/React.createElement(Text, {
+    color: "danger",
+    size: "small"
+  }, message));
+};
 const getMessage = (dimensionsState, minWidth, minHeight, minPercentage) => {
   let result = {
     text: formatMessage('Aspect ratio will be preserved'),
     type: 'hint'
   };
-
   if (dimensionsState.usePercentageUnits) {
     if (!dimensionsState.isNumeric) {
       result = {
@@ -41,7 +51,7 @@ const getMessage = (dimensionsState, minWidth, minHeight, minPercentage) => {
       };
     } else if (!dimensionsState.isAtLeastMinimums) {
       result = {
-        text: formatMessage('Must be at least {percentage}%', {
+        text: formatMessage('Percentage must be at least {percentage}%', {
           percentage: minPercentage
         }),
         type: 'error'
@@ -54,17 +64,15 @@ const getMessage = (dimensionsState, minWidth, minHeight, minPercentage) => {
     };
   } else if (!dimensionsState.isAtLeastMinimums) {
     result = {
-      text: formatMessage('Must be at least {width} x {height}px', {
+      text: formatMessage('Pixels must be at least {width} x {height}px', {
         width: minWidth,
         height: minHeight
       }),
       type: 'error'
     };
   }
-
   return result;
 };
-
 export default function DimensionsInput(props) {
   const {
     dimensionsState,
@@ -73,12 +81,24 @@ export default function DimensionsInput(props) {
     minPercentage,
     hidePercentage
   } = props;
-
   const handleDimensionTypeChange = e => {
     dimensionsState.setUsePercentageUnits(e.target.value === 'percentage');
   };
-
   const message = getMessage(dimensionsState, minWidth, minHeight, minPercentage);
+  const secondaryMessage = {
+    ...message,
+    text: ''
+  };
+  const displayMessage = message => {
+    if (!message) {
+      return;
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "message"
+    }, message.type === 'error' ? errorMessage(message.text) : /*#__PURE__*/React.createElement(Text, {
+      size: "small"
+    }, message.text));
+  };
   return /*#__PURE__*/React.createElement(Flex, {
     direction: "column"
   }, /*#__PURE__*/React.createElement(Flex.Item, {
@@ -100,8 +120,7 @@ export default function DimensionsInput(props) {
   }))), /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "small"
   }, /*#__PURE__*/React.createElement(FormFieldGroup, {
-    description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, formatMessage('Dimensions')),
-    messages: [message]
+    description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, formatMessage('Dimensions'))
   }, /*#__PURE__*/React.createElement(Flex, {
     alignItems: "start",
     direction: "row",
@@ -111,7 +130,8 @@ export default function DimensionsInput(props) {
     shouldGrow: true
   }, /*#__PURE__*/React.createElement(DimensionInput, {
     dimensionState: dimensionsState.percentageState,
-    label: formatMessage('Percentage')
+    label: formatMessage('Percentage'),
+    messages: [secondaryMessage]
   })), /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "x-small small"
   }, "%")) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Flex.Item, {
@@ -119,7 +139,8 @@ export default function DimensionsInput(props) {
   }, /*#__PURE__*/React.createElement(DimensionInput, {
     dimensionState: dimensionsState.widthState,
     label: formatMessage('Width'),
-    minValue: minWidth
+    minValue: minWidth,
+    messages: [secondaryMessage]
   })), /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "x-small small"
   }, /*#__PURE__*/React.createElement(IconLockLine, null)), /*#__PURE__*/React.createElement(Flex.Item, {
@@ -127,8 +148,9 @@ export default function DimensionsInput(props) {
   }, /*#__PURE__*/React.createElement(DimensionInput, {
     dimensionState: dimensionsState.heightState,
     label: formatMessage('Height'),
-    minValue: minHeight
-  })))))));
+    minValue: minHeight,
+    messages: [secondaryMessage]
+  }))))), displayMessage(message)));
 }
 DimensionsInput.propTypes = {
   dimensionsState: shape({

package/es/rce/plugins/shared/DimensionsInput/useDimensionsState.js

@@ -15,30 +15,25 @@
  * 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 { useState } from 'react';
 import { scaleForHeight, scaleForWidth } from '../DimensionUtils';
-
 function normalizedNumber(number) {
   if (number == null) {
     return null;
   }
-
   return Number.isFinite(number) ? Math.round(number) : NaN;
 }
-
 function parseAsInteger(inputString) {
   if (inputString.trim() === '') {
     return null;
   }
-
   const number = Number.parseFloat(inputString, 10);
   return Number.isFinite(number) ? Math.round(number) : NaN;
 }
-
 function inputValueFor(initialNumber) {
   return Number.isFinite(initialNumber) ? `${initialNumber}` : '';
 }
-
 export default function useDimensionsState(initialDimensions, constraints) {
   const {
     appliedHeight,
@@ -81,19 +76,17 @@ export default function useDimensionsState(initialDimensions, constraints) {
     height: scaleForHeight,
     width: scaleForWidth
   };
-
   function updateDimensions(attributes) {
-    setDimensions({ ...dimensions,
+    setDimensions({
+      ...dimensions,
       ...attributes,
       numericHeight: normalizedNumber(attributes.numericHeight),
       numericWidth: normalizedNumber(attributes.numericWidth),
       numericPercentage: normalizedNumber(attributes.numericPercentage)
     });
   }
-
   function scaleDimensions(dimensionName, number, scaleConstraints) {
     let width, height, percentage;
-
     if (dimensionName === 'percentage') {
       width = naturalWidth;
       height = naturalHeight;
@@ -105,14 +98,12 @@ export default function useDimensionsState(initialDimensions, constraints) {
       height = scaledDimensions.height;
       percentage = initialNumericValues.percentage;
     }
-
     return {
       width,
       height,
       percentage
     };
   }
-
   function setNumericDimension(dimensionName, number) {
     const {
       height,
@@ -128,7 +119,6 @@ export default function useDimensionsState(initialDimensions, constraints) {
       inputPercentage: inputValueFor(percentage)
     });
   }
-
   function setDimensionValue(dimensionName, value) {
     const number = parseAsInteger(value);
     const {
@@ -145,63 +135,49 @@ export default function useDimensionsState(initialDimensions, constraints) {
       inputPercentage: dimensionName === 'percentage' ? value : inputValueFor(percentage)
     });
   }
-
   function offsetDimension(dimensionName, offset) {
     const minValue = dimensionMinimums[dimensionName];
     const initialNumber = initialNumericValues[dimensionName];
     const numericValue = currentNumericValues[dimensionName];
-
     if (numericValue != null && !Number.isFinite(numericValue)) {
       return;
     }
-
     const newNumber = numericValue == null ? initialNumber + offset : Math.max(minValue, Math.floor(numericValue + offset));
     setNumericDimension(dimensionName, newNumber);
   }
-
   const widthState = {
     inputValue: dimensions.inputWidth,
-
     addOffset(offset) {
       offsetDimension('width', offset);
     },
-
     setInputValue(value) {
       setDimensionValue('width', value);
     }
-
   };
   const heightState = {
     inputValue: dimensions.inputHeight,
-
     addOffset(offset) {
       offsetDimension('height', offset);
     },
-
     setInputValue(value) {
       setDimensionValue('height', value);
     }
-
   };
   const percentageState = {
     inputValue: dimensions.inputPercentage,
-
     addOffset(offset) {
       offsetDimension('percentage', offset);
     },
-
     setInputValue(value) {
       setDimensionValue('percentage', value);
     }
-
   };
-
   const handleUsePercentageUnitsChange = value => {
-    setDimensions({ ...dimensions,
+    setDimensions({
+      ...dimensions,
       usePercentageUnits: value
     });
   };
-
   const isNumeric = dimensions.usePercentageUnits ? Number.isFinite(dimensions.numericPercentage) : [dimensions.numericHeight, dimensions.numericWidth].every(Number.isFinite);
   const isAtLeastMinimums = dimensions.usePercentageUnits ? dimensions.numericPercentage >= minPercentage : dimensions.numericHeight >= minHeight && dimensions.numericWidth >= minWidth;
   return {

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

@@ -17,8 +17,9 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-import formatMessage from '../../../format-message'; // TODO: a placeholder. Design a better one. See CORE-2826
+import formatMessage from '../../../format-message';
 
+// TODO: a placeholder. Design a better one. See CORE-2826
 export default class ErrorBoundary extends React.Component {
   constructor(props) {
     super(props);
@@ -26,7 +27,6 @@ export default class ErrorBoundary extends React.Component {
       hasError: false
     };
   }
-
   static getDerivedStateFromError(error) {
     // Update state so the next render will show the fallback UI.
     return {
@@ -34,7 +34,6 @@ export default class ErrorBoundary extends React.Component {
       error
     };
   }
-
   render() {
     if (this.state.hasError) {
       const msg = this.state.error.message ? this.state.error.message : this.state.error.toString();
@@ -44,10 +43,8 @@ export default class ErrorBoundary extends React.Component {
         }
       }, /*#__PURE__*/React.createElement("h2", null, formatMessage('Something went wrong.')), /*#__PURE__*/React.createElement("p", null, msg));
     }
-
     return this.props.children;
   }
-
 }
 ErrorBoundary.propTypes = {
   children: PropTypes.node