@dhis2/analytics 26.6.14 → 26.7.0

package/build/cjs/components/AboutAOUnit/AboutAOUnit.js

@@ -7,13 +7,13 @@ exports.default = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _appRuntime = require("@dhis2/app-runtime");
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
-var _d2UiRichText = require("@dhis2/d2-ui-rich-text");
 var _ui = require("@dhis2/ui");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _moment = _interopRequireDefault(require("moment"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _list = require("../../modules/list.js");
+var _index = require("../RichText/index.js");
 var _AboutAOUnitStyle = _interopRequireDefault(require("./styles/AboutAOUnit.style.js"));
 var _utils = require("./utils.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -154,12 +154,14 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
     small: true
   })), data && /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "content"
-  }, /*#__PURE__*/_react.default.createElement("p", {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + ((0, _classnames.default)('detailLine', {
       description: true,
       noDescription: !data.ao.displayDescription
     }) || "")
-  }, data.ao.displayDescription ? /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, data.ao.displayDescription) : _d2I18n.default.t('No description')), /*#__PURE__*/_react.default.createElement("div", {
+  }, data.ao.displayDescription ? /*#__PURE__*/_react.default.createElement(_index.RichTextParser, null, data.ao.displayDescription) : /*#__PURE__*/_react.default.createElement("p", {
+    className: `jsx-${_AboutAOUnitStyle.default.__hash}`
+  }, _d2I18n.default.t('No description'))), /*#__PURE__*/_react.default.createElement("div", {
     className: `jsx-${_AboutAOUnitStyle.default.__hash}`
   }, /*#__PURE__*/_react.default.createElement("p", {
     className: `jsx-${_AboutAOUnitStyle.default.__hash}` + " " + "detailLine"

package/build/cjs/components/Interpretations/InterpretationModal/CommentAddForm.js

@@ -9,7 +9,8 @@ var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-var _index = require("../common/index.js");
+var _index = require("../../RichText/index.js");
+var _index2 = require("../common/index.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -42,7 +43,7 @@ const CommentAddForm = _ref => {
     }
   });
   const inputPlaceholder = _d2I18n.default.t('Write a reply');
-  return /*#__PURE__*/_react.default.createElement(_index.MessageEditorContainer, {
+  return /*#__PURE__*/_react.default.createElement(_index2.MessageEditorContainer, {
     currentUser: currentUser
   }, showRichTextEditor ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_index.RichTextEditor, {
     inputPlaceholder: inputPlaceholder,
@@ -50,7 +51,7 @@ const CommentAddForm = _ref => {
     value: commentText,
     ref: focusRef,
     disabled: loading
-  }), /*#__PURE__*/_react.default.createElement(_index.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }), /*#__PURE__*/_react.default.createElement(_index2.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     primary: true,
     small: true,
     onClick: () => save({
@@ -65,7 +66,7 @@ const CommentAddForm = _ref => {
       setCommentText('');
       setShowRichTextEditor(false);
     }
-  }, _d2I18n.default.t('Cancel')))) : /*#__PURE__*/_react.default.createElement(_index.MessageInput, {
+  }, _d2I18n.default.t('Cancel')))) : /*#__PURE__*/_react.default.createElement(_index2.MessageInput, {
     onFocus: () => setShowRichTextEditor(true),
     placeholder: inputPlaceholder,
     ref: focusRef

package/build/cjs/components/Interpretations/InterpretationModal/CommentUpdateForm.js

@@ -10,7 +10,8 @@ var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-var _index = require("../common/index.js");
+var _index = require("../../RichText/index.js");
+var _index2 = require("../common/index.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -47,7 +48,7 @@ const CommentUpdateForm = _ref => {
   const errorText = error ? _d2I18n.default.t('Could not update comment') : '';
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _style.default.dynamic([["2690082310", [_ui.spacers.dp8, _ui.spacers.dp8, _ui.colors.grey100]]]) + " " + "message"
-  }, /*#__PURE__*/_react.default.createElement(_index.MessageEditorContainer, {
+  }, /*#__PURE__*/_react.default.createElement(_index2.MessageEditorContainer, {
     currentUser: currentUser
   }, /*#__PURE__*/_react.default.createElement(_index.RichTextEditor, {
     inputPlaceholder: _d2I18n.default.t('Enter comment text'),
@@ -55,7 +56,7 @@ const CommentUpdateForm = _ref => {
     value: commentText,
     disabled: loading,
     errorText: errorText
-  }), /*#__PURE__*/_react.default.createElement(_index.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }), /*#__PURE__*/_react.default.createElement(_index2.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     loading: loading,
     primary: true,
     small: true,

package/build/cjs/components/Interpretations/InterpretationsUnit/InterpretationForm.js

@@ -9,7 +9,8 @@ var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-var _index = require("../common/index.js");
+var _index = require("../../RichText/index.js");
+var _index2 = require("../common/index.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -44,16 +45,16 @@ const InterpretationForm = _ref => {
     }
   });
   const inputPlaceholder = _d2I18n.default.t('Write an interpretation');
-  return /*#__PURE__*/_react.default.createElement(_index.MessageEditorContainer, {
+  return /*#__PURE__*/_react.default.createElement(_index2.MessageEditorContainer, {
     currentUser: currentUser,
     dataTest: "interpretation-form"
-  }, showRichTextEditor ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_index.RichTextEditor, {
+  }, showRichTextEditor ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_index.RichTextEditor, {
     disabled: saveMutationInProgress,
     inputPlaceholder: inputPlaceholder,
     onChange: setInterpretationText,
     value: interpretationText,
     helpText: showNoTimeDimensionHelpText ? _d2I18n.default.t('Other people viewing this interpretation in the future may see more data.') : undefined
-  }), /*#__PURE__*/_react.default.createElement(_index.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }), /*#__PURE__*/_react.default.createElement(_index2.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     primary: true,
     small: true,
     loading: saveMutationInProgress,

package/build/cjs/components/Interpretations/common/Interpretation/InterpretationUpdateForm.js

@@ -10,7 +10,8 @@ var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-var _index = require("../index.js");
+var _index = require("../../../RichText/index.js");
+var _index2 = require("../index.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -56,7 +57,7 @@ const InterpretationUpdateForm = _ref3 => {
   const errorText = error ? error.message || _d2I18n.default.t('Could not update interpretation') : '';
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _style.default.dynamic([["2690082310", [_ui.spacers.dp8, _ui.spacers.dp8, _ui.colors.grey100]]]) + " " + "message"
-  }, /*#__PURE__*/_react.default.createElement(_index.MessageEditorContainer, {
+  }, /*#__PURE__*/_react.default.createElement(_index2.MessageEditorContainer, {
     currentUser: currentUser
   }, /*#__PURE__*/_react.default.createElement(_index.RichTextEditor, {
     inputPlaceholder: _d2I18n.default.t('Enter interpretation text'),
@@ -64,10 +65,10 @@ const InterpretationUpdateForm = _ref3 => {
     value: interpretationText,
     disabled: loading,
     errorText: errorText
-  }), showSharingLink && /*#__PURE__*/_react.default.createElement(_index.InterpretationSharingLink, {
+  }), showSharingLink && /*#__PURE__*/_react.default.createElement(_index2.InterpretationSharingLink, {
     id: id,
     type: "interpretation"
-  }), /*#__PURE__*/_react.default.createElement(_index.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }), /*#__PURE__*/_react.default.createElement(_index2.MessageButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     loading: loading,
     primary: true,
     small: true,

package/build/cjs/components/Interpretations/common/Message/Message.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.Message = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _appRuntime = require("@dhis2/app-runtime");
-var _d2UiRichText = require("@dhis2/d2-ui-rich-text");
 var _ui = require("@dhis2/ui");
 var _moment = _interopRequireDefault(require("moment"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
+var _index = require("../../../RichText/index.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const Message = _ref => {
   let {
@@ -34,7 +34,7 @@ const Message = _ref => {
     className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]])
   }, (0, _moment.default)(fromServerDate(created)).format('lll'))), /*#__PURE__*/_react.default.createElement("div", {
     className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "content"
-  }, /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, text)), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_index.RichTextParser, null, text)), /*#__PURE__*/_react.default.createElement("div", {
     className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "footer"
   }, children), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "4031345705",

package/build/cjs/components/Interpretations/common/Message/MessageEditorContainer.js

@@ -17,18 +17,18 @@ const MessageEditorContainer = _ref => {
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-test": dataTest,
-    className: _style.default.dynamic([["3807884305", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "container"
+    className: _style.default.dynamic([["969803715", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "container"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: _style.default.dynamic([["3807884305", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "avatar"
+    className: _style.default.dynamic([["969803715", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "avatar"
   }, /*#__PURE__*/_react.default.createElement(_ui.UserAvatar, {
     name: currentUser.name,
     medium: true
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: _style.default.dynamic([["3807884305", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "editor"
+    className: _style.default.dynamic([["969803715", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "editor"
   }, children), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: "3807884305",
+    id: "969803715",
     dynamic: [_ui.spacers.dp8, _ui.spacers.dp12]
-  }, [`.container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:${_ui.spacers.dp8};margin-top:${_ui.spacers.dp12};}`, ".avatar.__jsx-style-dynamic-selector{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;}", ".editor.__jsx-style-dynamic-selector{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}"]));
+  }, [`.container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:${_ui.spacers.dp8};margin-top:${_ui.spacers.dp12};}`, ".avatar.__jsx-style-dynamic-selector{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;}", ".editor.__jsx-style-dynamic-selector{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;height:100%;}"]));
 };
 exports.MessageEditorContainer = MessageEditorContainer;
 MessageEditorContainer.propTypes = {

package/build/cjs/components/Interpretations/common/index.js

@@ -25,17 +25,6 @@ Object.keys(_index2).forEach(function (key) {
     }
   });
 });
-var _index3 = require("./RichTextEditor/index.js");
-Object.keys(_index3).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _index3[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _index3[key];
-    }
-  });
-});
 var _getInterpretationAccess = require("./getInterpretationAccess.js");
 Object.keys(_getInterpretationAccess).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/build/cjs/components/{Interpretations/common/RichTextEditor/RichTextEditor.js → RichText/Editor/Editor.js}

@@ -3,16 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RichTextEditor = void 0;
+exports.Editor = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
-var _d2UiRichText = require("@dhis2/d2-ui-rich-text");
 var _ui = require("@dhis2/ui");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-var _UserMentionWrapper = require("../UserMention/UserMentionWrapper.js");
+var _UserMentionWrapper = require("../../UserMention/UserMentionWrapper.js");
+var _Parser = require("../Parser/Parser.js");
 var _markdownHandler = require("./markdownHandler.js");
-var _RichTextEditorStyle = require("./styles/RichTextEditor.style.js");
+var _EditorStyle = require("./styles/Editor.style.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -26,22 +27,22 @@ const EmojisPopover = _ref => {
     reference: reference,
     onClickOutside: onClose
   }, /*#__PURE__*/_react.default.createElement("ul", {
-    className: `jsx-${_RichTextEditorStyle.emojisPopoverClasses.__hash}` + " " + "emojisList"
+    className: `jsx-${_EditorStyle.emojisPopoverClasses.__hash}` + " " + "emojisList"
   }, /*#__PURE__*/_react.default.createElement("li", {
     onClick: () => onInsertMarkdown(_markdownHandler.EMOJI_SMILEY_FACE),
-    className: `jsx-${_RichTextEditorStyle.emojisPopoverClasses.__hash}`
-  }, /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_SMILEY_FACE])), /*#__PURE__*/_react.default.createElement("li", {
+    className: `jsx-${_EditorStyle.emojisPopoverClasses.__hash}`
+  }, /*#__PURE__*/_react.default.createElement(_Parser.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_SMILEY_FACE])), /*#__PURE__*/_react.default.createElement("li", {
     onClick: () => onInsertMarkdown(_markdownHandler.EMOJI_SAD_FACE),
-    className: `jsx-${_RichTextEditorStyle.emojisPopoverClasses.__hash}`
-  }, /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_SAD_FACE])), /*#__PURE__*/_react.default.createElement("li", {
+    className: `jsx-${_EditorStyle.emojisPopoverClasses.__hash}`
+  }, /*#__PURE__*/_react.default.createElement(_Parser.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_SAD_FACE])), /*#__PURE__*/_react.default.createElement("li", {
     onClick: () => onInsertMarkdown(_markdownHandler.EMOJI_THUMBS_UP),
-    className: `jsx-${_RichTextEditorStyle.emojisPopoverClasses.__hash}`
-  }, /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_THUMBS_UP])), /*#__PURE__*/_react.default.createElement("li", {
+    className: `jsx-${_EditorStyle.emojisPopoverClasses.__hash}`
+  }, /*#__PURE__*/_react.default.createElement(_Parser.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_THUMBS_UP])), /*#__PURE__*/_react.default.createElement("li", {
     onClick: () => onInsertMarkdown(_markdownHandler.EMOJI_THUMBS_DOWN),
-    className: `jsx-${_RichTextEditorStyle.emojisPopoverClasses.__hash}`
-  }, /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_THUMBS_DOWN]))), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _RichTextEditorStyle.emojisPopoverClasses.__hash
-  }, _RichTextEditorStyle.emojisPopoverClasses));
+    className: `jsx-${_EditorStyle.emojisPopoverClasses.__hash}`
+  }, /*#__PURE__*/_react.default.createElement(_Parser.Parser, null, _markdownHandler.emojis[_markdownHandler.EMOJI_THUMBS_DOWN]))), /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _EditorStyle.emojisPopoverClasses.__hash
+  }, _EditorStyle.emojisPopoverClasses));
 };
 EmojisPopover.propTypes = {
   onClose: _propTypes.default.func.isRequired,
@@ -69,7 +70,7 @@ const IconButtonWithTooltip = _ref2 => {
       ref: ref,
       onMouseOver: onMouseOver,
       onMouseOut: onMouseOut,
-      className: `jsx-${_RichTextEditorStyle.tooltipAnchorClasses.__hash}` + " " + "tooltip"
+      className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash}` + " " + "tooltip"
     }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
       secondary: true,
       small: true,
@@ -78,8 +79,8 @@ const IconButtonWithTooltip = _ref2 => {
       onClick: onClick
     }));
   }), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _RichTextEditorStyle.tooltipAnchorClasses.__hash
-  }, _RichTextEditorStyle.tooltipAnchorClasses));
+    id: _EditorStyle.tooltipAnchorClasses.__hash
+  }, _EditorStyle.tooltipAnchorClasses));
 };
 IconButtonWithTooltip.propTypes = {
   disabled: _propTypes.default.bool,
@@ -99,11 +100,11 @@ const Toolbar = _ref4 => {
   const [emojisPopoverIsOpen, setEmojisPopoverIsOpen] = (0, _react.useState)(false);
   const iconColor = disabled ? _ui.colors.grey600 : _ui.colors.grey700;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_RichTextEditorStyle.tooltipAnchorClasses.__hash} jsx-${_RichTextEditorStyle.toolbarClasses.__hash}` + " " + "toolbar"
+    className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash} jsx-${_EditorStyle.toolbarClasses.__hash}` + " " + "toolbar"
   }, !previewMode ? /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_RichTextEditorStyle.tooltipAnchorClasses.__hash} jsx-${_RichTextEditorStyle.toolbarClasses.__hash}` + " " + "actionsWrapper"
+    className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash} jsx-${_EditorStyle.toolbarClasses.__hash}` + " " + "actionsWrapper"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_RichTextEditorStyle.tooltipAnchorClasses.__hash} jsx-${_RichTextEditorStyle.toolbarClasses.__hash}` + " " + "mainActions"
+    className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash} jsx-${_EditorStyle.toolbarClasses.__hash}` + " " + "mainActions"
   }, /*#__PURE__*/_react.default.createElement(IconButtonWithTooltip, {
     tooltipContent: _d2I18n.default.t('Bold text'),
     disabled: disabled,
@@ -134,7 +135,7 @@ const Toolbar = _ref4 => {
     onClick: () => onInsertMarkdown(_markdownHandler.MENTION)
   }), /*#__PURE__*/_react.default.createElement("span", {
     ref: emojisButtonRef,
-    className: `jsx-${_RichTextEditorStyle.tooltipAnchorClasses.__hash} jsx-${_RichTextEditorStyle.toolbarClasses.__hash}` + " " + "tooltip"
+    className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash} jsx-${_EditorStyle.toolbarClasses.__hash}` + " " + "tooltip"
   }, /*#__PURE__*/_react.default.createElement(IconButtonWithTooltip, {
     tooltipContent: _d2I18n.default.t('Add emoji'),
     disabled: disabled,
@@ -150,24 +151,24 @@ const Toolbar = _ref4 => {
     },
     reference: emojisButtonRef
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_RichTextEditorStyle.tooltipAnchorClasses.__hash} jsx-${_RichTextEditorStyle.toolbarClasses.__hash}` + " " + "sideActions"
+    className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash} jsx-${_EditorStyle.toolbarClasses.__hash}` + " " + "sideActions"
   }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     secondary: true,
     small: true,
     disabled: previewButtonDisabled || disabled,
     onClick: onTogglePreview
   }, _d2I18n.default.t('Preview')))) : /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_RichTextEditorStyle.tooltipAnchorClasses.__hash} jsx-${_RichTextEditorStyle.toolbarClasses.__hash}` + " " + "previewWrapper"
+    className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash} jsx-${_EditorStyle.toolbarClasses.__hash}` + " " + "previewWrapper"
   }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     secondary: true,
     small: true,
     onClick: onTogglePreview,
     disabled: disabled
   }, _d2I18n.default.t('Back to write mode'))), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _RichTextEditorStyle.tooltipAnchorClasses.__hash
-  }, _RichTextEditorStyle.tooltipAnchorClasses), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _RichTextEditorStyle.toolbarClasses.__hash
-  }, _RichTextEditorStyle.toolbarClasses));
+    id: _EditorStyle.tooltipAnchorClasses.__hash
+  }, _EditorStyle.tooltipAnchorClasses), /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _EditorStyle.toolbarClasses.__hash
+  }, _EditorStyle.toolbarClasses));
 };
 Toolbar.propTypes = {
   previewButtonDisabled: _propTypes.default.bool.isRequired,
@@ -176,31 +177,45 @@ Toolbar.propTypes = {
   onTogglePreview: _propTypes.default.func.isRequired,
   disabled: _propTypes.default.bool
 };
-const RichTextEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref5, externalRef) => {
+const Editor = /*#__PURE__*/(0, _react.forwardRef)((_ref5, externalRef) => {
   let {
     value,
     disabled,
     inputPlaceholder,
     onChange,
     errorText,
-    helpText
+    helpText,
+    initialFocus,
+    resizable
   } = _ref5;
   const [previewMode, setPreviewMode] = (0, _react.useState)(false);
   const internalRef = (0, _react.useRef)();
   const textareaRef = externalRef || internalRef;
+  const caretPosRef = (0, _react.useRef)(undefined);
+  const insertMarkdownCallback = (text, caretPos) => {
+    caretPosRef.current = caretPos;
+    onChange(text);
+    textareaRef.current.focus();
+  };
   (0, _react.useEffect)(() => {
-    var _textareaRef$current;
-    return (_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 ? void 0 : _textareaRef$current.focus();
-  }, [textareaRef]);
+    if (initialFocus) {
+      var _textareaRef$current;
+      (_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 ? void 0 : _textareaRef$current.focus();
+    }
+  }, [initialFocus, textareaRef]);
+  (0, _react.useEffect)(() => {
+    if (caretPosRef.current) {
+      var _textareaRef$current2;
+      (_textareaRef$current2 = textareaRef.current) === null || _textareaRef$current2 === void 0 ? void 0 : _textareaRef$current2.setSelectionRange(caretPosRef.current, caretPosRef.current);
+      caretPosRef.current = undefined;
+    }
+  }, [value, textareaRef]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_RichTextEditorStyle.mainClasses.__hash}` + " " + "container"
+    "data-test": "@dhis2-analytics-richtexteditor",
+    className: `jsx-${_EditorStyle.mainClasses.__hash}` + " " + "container"
   }, /*#__PURE__*/_react.default.createElement(Toolbar, {
     onInsertMarkdown: markdown => {
-      (0, _markdownHandler.insertMarkdown)(markdown, textareaRef.current, (text, caretPos) => {
-        onChange(text);
-        textareaRef.current.focus();
-        textareaRef.current.selectionEnd = caretPos;
-      });
+      (0, _markdownHandler.insertMarkdown)(markdown, textareaRef.current, insertMarkdownCallback);
       if (markdown === _markdownHandler.MENTION) {
         textareaRef.current.dispatchEvent(new KeyboardEvent('keydown', {
           key: '@',
@@ -213,11 +228,9 @@ const RichTextEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref5, externalRef)
     previewButtonDisabled: !value,
     disabled: disabled
   }), previewMode ? /*#__PURE__*/_react.default.createElement("div", {
-    className: `jsx-${_RichTextEditorStyle.mainClasses.__hash}` + " " + "preview"
-  }, /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, value)) : /*#__PURE__*/_react.default.createElement(_ui.Field, {
-    error: !!errorText,
-    validationText: errorText,
-    helpText: helpText
+    className: `jsx-${_EditorStyle.mainClasses.__hash}` + " " + "preview"
+  }, /*#__PURE__*/_react.default.createElement(_Parser.Parser, null, value)) : /*#__PURE__*/_react.default.createElement("div", {
+    className: `jsx-${_EditorStyle.mainClasses.__hash}` + " " + "edit"
   }, /*#__PURE__*/_react.default.createElement(_UserMentionWrapper.UserMentionWrapper, {
     onUserSelect: onChange,
     inputReference: textareaRef
@@ -227,19 +240,29 @@ const RichTextEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref5, externalRef)
     disabled: disabled,
     value: value,
     onChange: event => onChange(event.target.value),
-    onKeyDown: event => (0, _markdownHandler.convertCtrlKey)(event, onChange),
-    className: `jsx-${_RichTextEditorStyle.mainClasses.__hash}` + " " + "textarea"
-  }))), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _RichTextEditorStyle.mainClasses.__hash
-  }, _RichTextEditorStyle.mainClasses));
+    onKeyDown: event => (0, _markdownHandler.convertCtrlKey)(event, insertMarkdownCallback),
+    className: `jsx-${_EditorStyle.mainClasses.__hash}` + " " + ((0, _classnames.default)('textarea', {
+      resizable
+    }) || "")
+  })), errorText && /*#__PURE__*/_react.default.createElement(_ui.Help, {
+    error: !!errorText
+  }, errorText), helpText && /*#__PURE__*/_react.default.createElement(_ui.Help, null, helpText)), /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _EditorStyle.mainClasses.__hash
+  }, _EditorStyle.mainClasses));
 });
-exports.RichTextEditor = RichTextEditor;
-RichTextEditor.displayName = 'RichTextEditor';
-RichTextEditor.propTypes = {
+exports.Editor = Editor;
+Editor.displayName = 'Editor';
+Editor.defaultProps = {
+  initialFocus: true,
+  resizable: true
+};
+Editor.propTypes = {
   value: _propTypes.default.string.isRequired,
   onChange: _propTypes.default.func.isRequired,
   disabled: _propTypes.default.bool,
   errorText: _propTypes.default.string,
   helpText: _propTypes.default.string,
-  inputPlaceholder: _propTypes.default.string
+  initialFocus: _propTypes.default.bool,
+  inputPlaceholder: _propTypes.default.string,
+  resizable: _propTypes.default.bool
 };

package/build/cjs/components/RichText/Editor/__tests__/Editor.spec.js

@@ -0,0 +1,38 @@
+"use strict";
+
+require("@testing-library/jest-dom");
+var _react = require("@testing-library/react");
+var _react2 = _interopRequireDefault(require("react"));
+var _Editor = require("../Editor.js");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const mockConvertCtrlKey = jest.fn();
+jest.mock('../markdownHandler.js', () => ({
+  convertCtrlKey: () => mockConvertCtrlKey()
+}));
+jest.mock('../../../UserMention/UserMentionWrapper.js', () => ({
+  UserMentionWrapper: jest.fn(props => /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, props.children))
+}));
+describe('RichText: Editor component', () => {
+  const componentProps = {
+    value: '',
+    onChange: jest.fn()
+  };
+  beforeEach(() => {
+    mockConvertCtrlKey.mockClear();
+  });
+  const renderComponent = props => {
+    return (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_Editor.Editor, props));
+  };
+  it('renders a result', () => {
+    renderComponent(componentProps);
+    expect(_react.screen.getByTestId('@dhis2-analytics-richtexteditor')).toBeVisible();
+  });
+  it('calls convertCtrlKey on keydown', () => {
+    renderComponent(componentProps);
+    _react.fireEvent.keyDown(_react.screen.getByRole('textbox'), {
+      key: 'A',
+      code: 'keyA'
+    });
+    expect(mockConvertCtrlKey).toHaveBeenCalled();
+  });
+});