@instructure/canvas-rce 5.6.17 → 5.7.0

package/lib/translations/locales/zh-Hans.js

@@ -414,6 +414,9 @@ const locale = {
   "current_image_f16c249c": {
     "message": "当前图像"
   },
+  "current_link_945a47ee": {
+    "message": "当前链接"
+  },
   "current_volume_level_c55ab825": {
     "message": "当前音量"
   },
@@ -1134,6 +1137,9 @@ const locale = {
   "link_options_a16b758b": {
     "message": "链接选项"
   },
+  "link_type_linktypemessage_c6d26815": {
+    "message": "链接类型：{ linkTypeMessage }"
+  },
   "link_with_text_starting_with_start_b3fcbe71": {
     "message": "具有以{ start }开始的文本的链接"
   },
@@ -1248,6 +1254,9 @@ const locale = {
   "miscellaneous_e9818229": {
     "message": "其他"
   },
+  "module_90d9fd32": {
+    "message": "单元"
+  },
   "modules_c4325335": {
     "message": "单元"
   },
@@ -1296,12 +1305,18 @@ const locale = {
   "navigate_through_the_menu_or_toolbar_415a4e50": {
     "message": "导航菜单或工具栏"
   },
+  "navigation_ee9af92d": {
+    "message": "导航"
+  },
   "nested_greater_than_d852e60d": {
     "message": "嵌套大于"
   },
   "nested_less_than_27d17e58": {
     "message": "嵌套小于"
   },
+  "new_quiz_34aacba6": {
+    "message": "新测验"
+  },
   "next_40e12421": {
     "message": "下一步"
   },
@@ -2109,6 +2124,9 @@ const locale = {
   "up_c553575d": {
     "message": "上"
   },
+  "updated_link_a827e441": {
+    "message": "更新的链接"
+  },
   "upload_document_253f0478": {
     "message": "上传文档"
   },

package/lib/translations/locales/zh-Hant.js

@@ -414,6 +414,9 @@ const locale = {
   "current_image_f16c249c": {
     "message": "目前的圖像"
   },
+  "current_link_945a47ee": {
+    "message": "目前的連結"
+  },
   "current_volume_level_c55ab825": {
     "message": "目前音量"
   },
@@ -1134,6 +1137,9 @@ const locale = {
   "link_options_a16b758b": {
     "message": "連結選項"
   },
+  "link_type_linktypemessage_c6d26815": {
+    "message": "連結類型：{ linkTypeMessage }"
+  },
   "link_with_text_starting_with_start_b3fcbe71": {
     "message": "文字以 { start } 開始的連結"
   },
@@ -1248,6 +1254,9 @@ const locale = {
   "miscellaneous_e9818229": {
     "message": "雜項"
   },
+  "module_90d9fd32": {
+    "message": "單元"
+  },
   "modules_c4325335": {
     "message": "單元"
   },
@@ -1296,12 +1305,18 @@ const locale = {
   "navigate_through_the_menu_or_toolbar_415a4e50": {
     "message": "導航整個選單或工具欄"
   },
+  "navigation_ee9af92d": {
+    "message": "導航工具"
+  },
   "nested_greater_than_d852e60d": {
     "message": "巢式大於"
   },
   "nested_less_than_27d17e58": {
     "message": "巢式小於"
   },
+  "new_quiz_34aacba6": {
+    "message": "新測驗"
+  },
   "next_40e12421": {
     "message": "下一個"
   },
@@ -2109,6 +2124,9 @@ const locale = {
   "up_c553575d": {
     "message": "向上"
   },
+  "updated_link_a827e441": {
+    "message": "更新的連結"
+  },
   "upload_document_253f0478": {
     "message": "上傳文件"
   },

package/lib/translations/locales/zh.js

@@ -414,6 +414,9 @@ const locale = {
   "current_image_f16c249c": {
     "message": "当前图像"
   },
+  "current_link_945a47ee": {
+    "message": "当前链接"
+  },
   "current_volume_level_c55ab825": {
     "message": "当前音量"
   },
@@ -1134,6 +1137,9 @@ const locale = {
   "link_options_a16b758b": {
     "message": "链接选项"
   },
+  "link_type_linktypemessage_c6d26815": {
+    "message": "链接类型：{ linkTypeMessage }"
+  },
   "link_with_text_starting_with_start_b3fcbe71": {
     "message": "具有以{ start }开始的文本的链接"
   },
@@ -1248,6 +1254,9 @@ const locale = {
   "miscellaneous_e9818229": {
     "message": "其他"
   },
+  "module_90d9fd32": {
+    "message": "单元"
+  },
   "modules_c4325335": {
     "message": "单元"
   },
@@ -1296,12 +1305,18 @@ const locale = {
   "navigate_through_the_menu_or_toolbar_415a4e50": {
     "message": "导航菜单或工具栏"
   },
+  "navigation_ee9af92d": {
+    "message": "导航"
+  },
   "nested_greater_than_d852e60d": {
     "message": "嵌套大于"
   },
   "nested_less_than_27d17e58": {
     "message": "嵌套小于"
   },
+  "new_quiz_34aacba6": {
+    "message": "新测验"
+  },
   "next_40e12421": {
     "message": "下一步"
   },
@@ -2109,6 +2124,9 @@ const locale = {
   "up_c553575d": {
     "message": "上"
   },
+  "updated_link_a827e441": {
+    "message": "更新的链接"
+  },
   "upload_document_253f0478": {
     "message": "上传文档"
   },

package/lib/translations/locales/zh_HK.js

@@ -414,6 +414,9 @@ const locale = {
   "current_image_f16c249c": {
     "message": "目前的圖像"
   },
+  "current_link_945a47ee": {
+    "message": "目前的連結"
+  },
   "current_volume_level_c55ab825": {
     "message": "目前音量"
   },
@@ -1134,6 +1137,9 @@ const locale = {
   "link_options_a16b758b": {
     "message": "連結選項"
   },
+  "link_type_linktypemessage_c6d26815": {
+    "message": "連結類型：{ linkTypeMessage }"
+  },
   "link_with_text_starting_with_start_b3fcbe71": {
     "message": "文字以 { start } 開始的連結"
   },
@@ -1248,6 +1254,9 @@ const locale = {
   "miscellaneous_e9818229": {
     "message": "雜項"
   },
+  "module_90d9fd32": {
+    "message": "單元"
+  },
   "modules_c4325335": {
     "message": "單元"
   },
@@ -1296,12 +1305,18 @@ const locale = {
   "navigate_through_the_menu_or_toolbar_415a4e50": {
     "message": "導航整個選單或工具欄"
   },
+  "navigation_ee9af92d": {
+    "message": "導航工具"
+  },
   "nested_greater_than_d852e60d": {
     "message": "巢式大於"
   },
   "nested_less_than_27d17e58": {
     "message": "巢式小於"
   },
+  "new_quiz_34aacba6": {
+    "message": "新測驗"
+  },
   "next_40e12421": {
     "message": "下一個"
   },
@@ -2109,6 +2124,9 @@ const locale = {
   "up_c553575d": {
     "message": "向上"
   },
+  "updated_link_a827e441": {
+    "message": "更新的連結"
+  },
   "upload_document_253f0478": {
     "message": "上傳文件"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/canvas-rce",
-  "version": "5.6.17",
+  "version": "5.7.0",
   "description": "A component wrapping Canvas's usage of Tinymce",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -78,6 +78,7 @@
     "@instructure/canvas-media": "*",
     "@instructure/canvas-theme": "7",
     "@instructure/debounce": "^7",
+    "@instructure/emotion": "^8.38.1",
     "@instructure/k5uploader": "*",
     "@instructure/media-capture": "~8.4.1-rc.16",
     "@instructure/ui-a11y-content": "^7",
@@ -158,18 +159,18 @@
     "redux-batch-middleware": "^0.2.0",
     "redux-thunk": "^2",
     "scroll-into-view": "https://github.com/bkirkby/scroll-into-view.git#588b0ced98eeecf84e6fb2074aa076e80b7cffab",
-    "tinymce": "^5",
     "text-field-edit": "^3.2.0",
+    "tinymce": "^5",
     "uri-js": "^4.2.2",
     "wcag-element-contrast": "^1.0.1"
   },
   "devDependencies": {
     "@babel/cli": "^7",
     "@babel/core": "^7",
-    "@babel/preset-typescript": "^7",
-    "@babel/register": "7",
     "@babel/plugin-proposal-optional-chaining": "^7.20.7",
     "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+    "@babel/preset-typescript": "^7",
+    "@babel/register": "7",
     "@instructure/babel-plugin-themeable-styles": "7.19.0-canvas",
     "@instructure/browserslist-config-canvas-lms": ">=2",
     "@instructure/translations": ">=1",
@@ -198,6 +199,7 @@
     "jest": "^28",
     "jest-canvas-mock": "^2",
     "jest-junit": "^7",
+    "jest-mock-proxy": "3.1.2",
     "mathjax": "^3.2.0",
     "mocha": "^6",
     "mocha-junit-reporter": "^1.18.0",
@@ -209,6 +211,7 @@
     "shelljs": "^0.8.3",
     "sinon": "^7",
     "skin-deep": "^1",
+    "source-map-support": "0.5.21",
     "testcafe": "1.14.2",
     "testcafe-browser-provider-selenium": "^1.2.0",
     "testcafe-react-selectors": "^3.3.0",
@@ -218,9 +221,7 @@
     "webpack": "^5",
     "webpack-merge": "^5",
     "webpack-nano": "^1",
-    "webpack-plugin-serve": "^1",
-    "source-map-support": "0.5.21",
-    "jest-mock-proxy": "3.1.2"
+    "webpack-plugin-serve": "^1"
   },
   "resolutions": {
     "format-message-estree-util": "./packages/format-message-estree-util"

package/testcafe/entry.js

@@ -49,7 +49,6 @@ if (content) {
           'instructure_equation',
           'instructure_media_embed',
           'instructure_image',
-          'instructure_external_tools',
           'instructure_rce_external_tools',
           'instructure_record',
           'instructure_links',

package/es/rce/plugins/instructure_external_tools/clickCallback.js

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2019 - 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 ReactDOM from 'react-dom';
-export default function clickCallback(ed, ltiButtons) {
-  return import('./components/LtiToolsModal').then(_ref => {
-    let {
-      LtiToolsModal
-    } = _ref;
-    let container = document.querySelector('.canvas-rce-upload-container');
-
-    if (!container) {
-      container = document.createElement('div');
-      container.className = 'canvas-rce-upload-container';
-      document.body.appendChild(container);
-    }
-
-    const handleDismiss = () => {
-      ReactDOM.unmountComponentAtNode(container);
-      ed.focus();
-    };
-
-    ReactDOM.render( /*#__PURE__*/React.createElement(LtiToolsModal, {
-      editor: ed,
-      onDismiss: handleDismiss,
-      ltiButtons: ltiButtons
-    }), container);
-  });
-}

package/es/rce/plugins/instructure_external_tools/components/LtiToolsModal/ExpandoText.js

@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2019 - 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, { useState } from 'react';
-import { string } from 'prop-types';
-import { StyleSheet, css } from 'aphrodite';
-import { Text } from '@instructure/ui-text';
-import { View } from '@instructure/ui-view';
-import formatMessage from '../../../../../format-message';
-export default function ExpandoText(props) {
-  const [descExpanded, setDescExpanded] = useState(false);
-  const [focused, setFocused] = useState(false);
-  const {
-    text,
-    title
-  } = props;
-  const label = descExpanded ? formatMessage('Hide {title} description', {
-    title
-  }) : formatMessage('View {title} description', {
-    title
-  });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(View, {
-    as: "button",
-    background: "transparent",
-    display: "block",
-    borderWidth: "none",
-    textAlign: "start",
-    type: "button",
-    position: "relative",
-    padding: "none none none xx-small",
-    "aria-expanded": descExpanded,
-    borderRadius: "medium",
-    withFocusOutline: focused,
-    onClick: () => {
-      setDescExpanded(!descExpanded);
-    },
-    onFocus: () => setFocused(true),
-    onBlur: () => setFocused(false)
-  }, /*#__PURE__*/React.createElement(View, {
-    as: "span",
-    "aria-live": "assertive",
-    "aria-relevant": "text"
-  }, /*#__PURE__*/React.createElement(Text, {
-    color: "brand",
-    size: "x-small",
-    "aria-label": label
-  }, descExpanded ? formatMessage('Hide description') : formatMessage('View description')))), descExpanded && /*#__PURE__*/React.createElement(View, {
-    as: "span",
-    margin: "small none none xx-small",
-    display: "block",
-    minWidth: "10rem",
-    role: "presentation"
-  }, /*#__PURE__*/React.createElement(Text, {
-    as: "span",
-    color: "secondary"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles.descriptionText),
-    dangerouslySetInnerHTML: {
-      __html: text
-    }
-  }))));
-}
-ExpandoText.propTypes = {
-  text: string.isRequired,
-  title: string.isRequired
-};
-export const styles = StyleSheet.create({
-  descriptionText: {
-    lineHeight: '1.2rem',
-    p: {
-      margin: '1rem 0'
-    },
-    ':nth-child(1n)> :first-child': {
-      marginTop: '0',
-      display: 'inline-block'
-    },
-    ':nth-child(1n)> :last-child': {
-      marginBottom: '0'
-    }
-  }
-});

package/es/rce/plugins/instructure_external_tools/components/LtiToolsModal/LtiTool.js

@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2019 - 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, { useState } from 'react';
-import { func, string } from 'prop-types';
-import { Text } from '@instructure/ui-text';
-import { View } from '@instructure/ui-view';
-import ExpandoText from './ExpandoText';
-import formatMessage from '../../../../../format-message';
-import { StyleSheet, css } from 'aphrodite';
-export default function LtiTool(props) {
-  const [focused, setFocused] = useState(false);
-  const {
-    title,
-    image,
-    description,
-    onAction
-  } = props;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(View, {
-    as: "span",
-    withFocusOutline: focused,
-    className: css(styles.appButton),
-    padding: "xxx-small xxx-small xx-small",
-    borderRadius: "medium",
-    role: "button",
-    position: "relative",
-    onClick: () => {
-      onAction();
-    },
-    onKeyDown: e => {
-      if (e.keyCode === 13 || e.keyCode === 32) {
-        onAction();
-      }
-    },
-    onFocus: () => setFocused(true),
-    onBlur: () => setFocused(false),
-    tabIndex: "0"
-  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("img", {
-    src: image,
-    width: "28",
-    height: "28",
-    alt: ""
-  })), /*#__PURE__*/React.createElement(View, {
-    as: "span",
-    className: css(styles.appTitle),
-    margin: "none none none small"
-  }, /*#__PURE__*/React.createElement(Text, {
-    "aria-label": formatMessage('Open {title} application', {
-      title
-    }),
-    weight: "bold"
-  }, title))), description && renderDescription(description));
-
-  function renderDescription(desc) {
-    return /*#__PURE__*/React.createElement(View, {
-      as: "span",
-      margin: "none none none large",
-      display: "block"
-    }, /*#__PURE__*/React.createElement(ExpandoText, {
-      text: desc,
-      title: title
-    }));
-  }
-}
-LtiTool.propTypes = {
-  title: string.isRequired,
-  image: string.isRequired,
-  onAction: func.isRequired,
-  description: string
-};
-export const styles = StyleSheet.create({
-  appTitle: {
-    verticalAlign: 'middle'
-  },
-  appButton: {
-    cursor: 'pointer'
-  }
-});

package/es/rce/plugins/instructure_external_tools/components/LtiToolsModal/index.js

@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2019 - 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, { useState } from 'react';
-import { func, arrayOf, oneOfType, number, shape, string } from 'prop-types';
-import { Modal } from '@instructure/ui-modal';
-import { Button, CloseButton } from '@instructure/ui-buttons';
-import { Heading } from '@instructure/ui-heading';
-import { List } from '@instructure/ui-list';
-import { View } from '@instructure/ui-view';
-import { Flex } from '@instructure/ui-flex';
-import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { TextInput } from '@instructure/ui-text-input';
-import { IconSearchLine } from '@instructure/ui-icons';
-import { Alert } from '@instructure/ui-alerts';
-import formatMessage from '../../../../../format-message';
-import LtiTool from './LtiTool';
-import { instuiPopupMountNode } from '../../../../../util/fullscreenHelpers'; // TODO: we really need a way for the client to pass this to the RCE
-
-const getLiveRegion = () => document.getElementById('flash_screenreader_holder');
-
-const getFilterResults = (term, thingsToFilter) => {
-  if (term.length <= 0) {
-    return thingsToFilter;
-  }
-
-  const query = term ? new RegExp(term, 'i') : null;
-  return thingsToFilter.filter(item => query && query.test(item.title));
-};
-
-export function LtiToolsModal(props) {
-  const [filterTerm, setFilterTerm] = useState('');
-  const [filteredResults, setFilteredResults] = useState(props.ltiButtons);
-
-  const handleFilterChange = e => {
-    setFilterTerm(e.target.value);
-    setFilteredResults(getFilterResults(e.target.value, props.ltiButtons));
-  };
-
-  const filterEmpty = filteredResults.length <= 0;
-  return /*#__PURE__*/React.createElement(Modal, {
-    "data-mce-component": true,
-    liveRegion: getLiveRegion,
-    size: "medium",
-    theme: {
-      mediumMaxWidth: '42rem'
-    },
-    label: formatMessage('Apps'),
-    mountNode: instuiPopupMountNode,
-    onDismiss: props.onDismiss,
-    open: true,
-    shouldCloseOnDocumentClick: false
-  }, /*#__PURE__*/React.createElement(Modal.Header, {
-    theme: {
-      padding: '0.5rem'
-    }
-  }, /*#__PURE__*/React.createElement(CloseButton, {
-    placement: "end",
-    offset: "medium",
-    onClick: props.onDismiss,
-    screenReaderLabel: formatMessage('Close')
-  }), /*#__PURE__*/React.createElement(Heading, {
-    margin: "small"
-  }, formatMessage('All Apps')), /*#__PURE__*/React.createElement(View, {
-    as: "div",
-    padding: "x-small none x-small medium"
-  }, /*#__PURE__*/React.createElement(TextInput, {
-    type: "search",
-    renderLabel: /*#__PURE__*/React.createElement(ScreenReaderContent, null, formatMessage('Search')),
-    placeholder: formatMessage('Search'),
-    renderAfterInput: /*#__PURE__*/React.createElement(IconSearchLine, {
-      inline: false
-    }),
-    onChange: handleFilterChange
-  }))), /*#__PURE__*/React.createElement(Modal.Body, {
-    overflow: "fit"
-  }, /*#__PURE__*/React.createElement(Flex, {
-    as: "div",
-    direction: "column"
-  }, /*#__PURE__*/React.createElement(Flex.Item, {
-    as: "div",
-    shouldShrink: true,
-    shouldGrow: true
-  }, /*#__PURE__*/React.createElement(Alert, {
-    liveRegion: getLiveRegion,
-    variant: "info",
-    screenReaderOnly: !filterEmpty
-  }, filterEmpty && formatMessage('No results found for {filterTerm}', {
-    filterTerm
-  }), !filterEmpty && formatMessage(`Found { count, plural,
-              =0 {# results}
-              one {# result}
-              other {# results}
-            }`, {
-    count: filteredResults.length
-  })), renderTools(filteredResults)))), /*#__PURE__*/React.createElement(Modal.Footer, null, /*#__PURE__*/React.createElement(Button, {
-    onClick: props.onDismiss,
-    color: "primary"
-  }, formatMessage('Done'))));
-
-  function renderTools(ltiButtons) {
-    return /*#__PURE__*/React.createElement(List, {
-      isUnstyled: true
-    }, ltiButtons.sort((a, b) => a.title.localeCompare(b.title)).map(b => {
-      return /*#__PURE__*/React.createElement(List.Item, {
-        key: b.id
-      }, /*#__PURE__*/React.createElement(View, {
-        as: "div",
-        padding: "medium medium small none"
-      }, /*#__PURE__*/React.createElement(LtiTool, {
-        title: b.title,
-        image: b.image,
-        onAction: () => {
-          b.onAction();
-          props.onDismiss();
-        },
-        description: b.description
-      })));
-    }));
-  }
-}
-LtiToolsModal.propTypes = {
-  ltiButtons: arrayOf(shape({
-    description: string.isRequired,
-    id: oneOfType([string, number]).isRequired,
-    image: string.isRequired,
-    onAction: func.isRequired,
-    title: string.isRequired
-  })),
-  onDismiss: func.isRequired
-};