@dhis2/analytics 28.0.3 → 28.0.5

package/build/cjs/components/PivotTable/PivotTableRow.js

@@ -13,12 +13,11 @@ var _PivotTableEngineContext = require("./PivotTableEngineContext.js");
 var _PivotTableRowHeaderCell = require("./PivotTableRowHeaderCell.js");
 var _PivotTableValueCell = require("./PivotTableValueCell.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const PivotTableRow = _ref => {
-  let {
-    clippingResult,
-    rowIndex,
-    onToggleContextualMenu
-  } = _ref;
+const PivotTableRow = ({
+  clippingResult,
+  rowIndex,
+  onToggleContextualMenu
+}) => {
   const engine = (0, _PivotTableEngineContext.usePivotTableEngine)();
   return /*#__PURE__*/_react.default.createElement("tr", null, (0, _times.default)(engine.rowDepth, x => x).map(rowLevel => /*#__PURE__*/_react.default.createElement(_PivotTableRowHeaderCell.PivotTableRowHeaderCell, {
     key: rowLevel,
@@ -27,27 +26,21 @@ const PivotTableRow = _ref => {
     rowLevel: rowLevel
   })), /*#__PURE__*/_react.default.createElement(_PivotTableClippedAxis.PivotTableClippedAxis, {
     axisClippingResult: clippingResult.columns,
-    EmptyComponent: _ref2 => {
-      let {
-        size
-      } = _ref2;
-      return /*#__PURE__*/_react.default.createElement(_PivotTableEmptyCell.PivotTableEmptyCell, {
-        classes: "value",
-        style: {
-          width: size
-        }
-      });
-    },
-    ItemComponent: _ref3 => {
-      let {
-        index: columnIndex
-      } = _ref3;
-      return /*#__PURE__*/_react.default.createElement(_PivotTableValueCell.PivotTableValueCell, {
-        row: rowIndex,
-        column: columnIndex,
-        onToggleContextualMenu: onToggleContextualMenu
-      });
-    }
+    EmptyComponent: ({
+      size
+    }) => /*#__PURE__*/_react.default.createElement(_PivotTableEmptyCell.PivotTableEmptyCell, {
+      classes: "value",
+      style: {
+        width: size
+      }
+    }),
+    ItemComponent: ({
+      index: columnIndex
+    }) => /*#__PURE__*/_react.default.createElement(_PivotTableValueCell.PivotTableValueCell, {
+      row: rowIndex,
+      column: columnIndex,
+      onToggleContextualMenu: onToggleContextualMenu
+    })
   }));
 };
 exports.PivotTableRow = PivotTableRow;

package/build/cjs/components/PivotTable/PivotTableRowHeaderCell.js

@@ -10,13 +10,12 @@ var _PivotTableCell = require("./PivotTableCell.js");
 var _PivotTableEngineContext = require("./PivotTableEngineContext.js");
 var _PivotTableHeaderCell = require("./PivotTableHeaderCell.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const PivotTableRowHeaderCell = _ref => {
+const PivotTableRowHeaderCell = ({
+  clippingResult,
+  rowIndex,
+  rowLevel
+}) => {
   var _engine$adaptiveClipp;
-  let {
-    clippingResult,
-    rowIndex,
-    rowLevel
-  } = _ref;
   const engine = (0, _PivotTableEngineContext.usePivotTableEngine)();
   const width = engine.adaptiveClippingController.columns.headerSizes[rowLevel];
   const height = (_engine$adaptiveClipp = engine.adaptiveClippingController.rows.sizes[engine.rowMap[rowIndex]]) === null || _engine$adaptiveClipp === void 0 ? void 0 : _engine$adaptiveClipp.size;

package/build/cjs/components/PivotTable/PivotTableSortIcon.js

@@ -14,11 +14,10 @@ var _SortIconIdle = require("./icons/SortIconIdle.js");
 var _PivotTableEngineContext = require("./PivotTableEngineContext.js");
 var _PivotTableStyle = require("./styles/PivotTable.style.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const PivotTableSortIcon = _ref => {
-  let {
-    index,
-    sortBy
-  } = _ref;
+const PivotTableSortIcon = ({
+  index,
+  sortBy
+}) => {
   const engine = (0, _PivotTableEngineContext.usePivotTableEngine)();
   const SortIcon = (sortBy === null || sortBy === void 0 ? void 0 : sortBy.column) === index ? sortBy.order === _pivotTableConstants.SORT_ORDER_ASCENDING ? _SortIconAscending.SortIconAscending : _SortIconDescending.SortIconDescending : _SortIconIdle.SortIconIdle;
   return /*#__PURE__*/_react.default.createElement("span", {

package/build/cjs/components/PivotTable/PivotTableTitleRow.js

@@ -11,16 +11,14 @@ var _react = _interopRequireWildcard(require("react"));
 var _PivotTableCell = require("./PivotTableCell.js");
 var _PivotTableEngineContext = require("./PivotTableEngineContext.js");
 var _PivotTableStyle = require("./styles/PivotTable.style.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const PivotTableTitleRow = _ref => {
+const PivotTableTitleRow = ({
+  title,
+  scrollPosition,
+  containerWidth
+}) => {
   var _scrollPosition$x;
-  let {
-    title,
-    scrollPosition,
-    containerWidth
-  } = _ref;
   const containerRef = (0, _react.useRef)(null);
   const [scrollWidth, setScrollWidth] = (0, _react.useState)(0);
   const [isTitleTruncated, setIsTitleTruncated] = (0, _react.useState)(false);
@@ -63,22 +61,19 @@ const PivotTableTitleRow = _ref => {
     className: `jsx-${_PivotTableStyle.cell.__hash}` + " " + "title-cell-content"
   }, isTitleTruncated ? /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
     content: title
-  }, _ref2 => {
-    let {
-      ref: tooltipRef,
-      onMouseOver,
-      onMouseOut
-    } = _ref2;
-    return /*#__PURE__*/_react.default.createElement("div", {
-      ref: tooltipRef,
-      onMouseOver: onMouseOver,
-      onMouseOut: onMouseOut,
-      style: {
-        maxWidth
-      },
-      className: `jsx-${_PivotTableStyle.cell.__hash}` + " " + "title-cell-content"
-    }, title);
-  }) : title)));
+  }, ({
+    ref: tooltipRef,
+    onMouseOver,
+    onMouseOut
+  }) => /*#__PURE__*/_react.default.createElement("div", {
+    ref: tooltipRef,
+    onMouseOver: onMouseOver,
+    onMouseOut: onMouseOut,
+    style: {
+      maxWidth
+    },
+    className: `jsx-${_PivotTableStyle.cell.__hash}` + " " + "title-cell-content"
+  }, title)) : title)));
 };
 exports.PivotTableTitleRow = PivotTableTitleRow;
 PivotTableTitleRow.propTypes = {

package/build/cjs/components/PivotTable/PivotTableTitleRows.js

@@ -10,12 +10,11 @@ var _getFilterText = _interopRequireDefault(require("../../visualizations/util/g
 var _PivotTableEngineContext = require("./PivotTableEngineContext.js");
 var _PivotTableTitleRow = require("./PivotTableTitleRow.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const PivotTableTitleRows = _ref => {
+const PivotTableTitleRows = ({
+  clippingResult,
+  width
+}) => {
   var _engine$visualization;
-  let {
-    clippingResult,
-    width
-  } = _ref;
   const engine = (0, _PivotTableEngineContext.usePivotTableEngine)();
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, engine.options.title ? /*#__PURE__*/_react.default.createElement(_PivotTableTitleRow.PivotTableTitleRow, {
     title: engine.options.title,

package/build/cjs/components/PivotTable/PivotTableValueCell.js

@@ -13,16 +13,14 @@ var _valueTypes = require("../../modules/valueTypes.js");
 var _PivotTableCell = require("./PivotTableCell.js");
 var _PivotTableEmptyCell = require("./PivotTableEmptyCell.js");
 var _PivotTableEngineContext = require("./PivotTableEngineContext.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const PivotTableValueCell = _ref => {
+const PivotTableValueCell = ({
+  row,
+  column,
+  onToggleContextualMenu
+}) => {
   var _cellContent$titleVal, _cellContent$rendered;
-  let {
-    row,
-    column,
-    onToggleContextualMenu
-  } = _ref;
   const engine = (0, _PivotTableEngineContext.usePivotTableEngine)();
   const cellRef = (0, _react.useRef)(undefined);
   const cellContent = engine.get({

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

@@ -14,88 +14,78 @@ var _UserMentionWrapper = require("../../UserMention/UserMentionWrapper.js");
 var _Parser = require("../Parser/Parser.js");
 var _markdownHandler = require("./markdownHandler.js");
 var _EditorStyle = require("./styles/Editor.style.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const EmojisPopover = _ref => {
-  let {
-    onInsertMarkdown,
-    onClose,
-    reference
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_ui.Popover, {
-    reference: reference,
-    onClickOutside: onClose
-  }, /*#__PURE__*/_react.default.createElement("ul", {
-    className: `jsx-${_EditorStyle.emojisPopoverClasses.__hash}` + " " + "emojisList"
-  }, /*#__PURE__*/_react.default.createElement("li", {
-    onClick: () => onInsertMarkdown(_markdownHandler.EMOJI_SMILEY_FACE),
-    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-${_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-${_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-${_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));
-};
+const EmojisPopover = ({
+  onInsertMarkdown,
+  onClose,
+  reference
+}) => /*#__PURE__*/_react.default.createElement(_ui.Popover, {
+  reference: reference,
+  onClickOutside: onClose
+}, /*#__PURE__*/_react.default.createElement("ul", {
+  className: `jsx-${_EditorStyle.emojisPopoverClasses.__hash}` + " " + "emojisList"
+}, /*#__PURE__*/_react.default.createElement("li", {
+  onClick: () => onInsertMarkdown(_markdownHandler.EMOJI_SMILEY_FACE),
+  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-${_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-${_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-${_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,
   onInsertMarkdown: _propTypes.default.func.isRequired,
   reference: _propTypes.default.object
 };
-const IconButtonWithTooltip = _ref2 => {
-  let {
-    tooltipContent,
-    disabled,
-    icon,
-    onClick
-  } = _ref2;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
-    content: tooltipContent,
-    placement: "bottom",
-    closeDelay: 200
-  }, _ref3 => {
-    let {
-      ref,
-      onMouseOver,
-      onMouseOut
-    } = _ref3;
-    return /*#__PURE__*/_react.default.createElement("span", {
-      ref: ref,
-      onMouseOver: onMouseOver,
-      onMouseOut: onMouseOut,
-      className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash}` + " " + "tooltip"
-    }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
-      secondary: true,
-      small: true,
-      disabled: disabled,
-      icon: icon,
-      onClick: onClick
-    }));
-  }), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _EditorStyle.tooltipAnchorClasses.__hash
-  }, _EditorStyle.tooltipAnchorClasses));
-};
+const IconButtonWithTooltip = ({
+  tooltipContent,
+  disabled,
+  icon,
+  onClick
+}) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
+  content: tooltipContent,
+  placement: "bottom",
+  closeDelay: 200
+}, ({
+  ref,
+  onMouseOver,
+  onMouseOut
+}) => /*#__PURE__*/_react.default.createElement("span", {
+  ref: ref,
+  onMouseOver: onMouseOver,
+  onMouseOut: onMouseOut,
+  className: `jsx-${_EditorStyle.tooltipAnchorClasses.__hash}` + " " + "tooltip"
+}, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  secondary: true,
+  small: true,
+  disabled: disabled,
+  icon: icon,
+  onClick: onClick,
+  "aria-label": tooltipContent
+}))), /*#__PURE__*/_react.default.createElement(_style.default, {
+  id: _EditorStyle.tooltipAnchorClasses.__hash
+}, _EditorStyle.tooltipAnchorClasses));
 IconButtonWithTooltip.propTypes = {
   disabled: _propTypes.default.bool,
   icon: _propTypes.default.node,
   tooltipContent: _propTypes.default.string,
   onClick: _propTypes.default.func
 };
-const Toolbar = _ref4 => {
-  let {
-    disabled,
-    onInsertMarkdown,
-    onTogglePreview,
-    previewButtonDisabled,
-    previewMode
-  } = _ref4;
+const Toolbar = ({
+  disabled,
+  onInsertMarkdown,
+  onTogglePreview,
+  previewButtonDisabled,
+  previewMode
+}) => {
   const emojisButtonRef = (0, _react.useRef)();
   const [emojisPopoverIsOpen, setEmojisPopoverIsOpen] = (0, _react.useState)(false);
   const iconColor = disabled ? _ui.colors.grey600 : _ui.colors.grey700;
@@ -177,17 +167,16 @@ Toolbar.propTypes = {
   onTogglePreview: _propTypes.default.func.isRequired,
   disabled: _propTypes.default.bool
 };
-const Editor = exports.Editor = /*#__PURE__*/(0, _react.forwardRef)((_ref5, externalRef) => {
-  let {
-    value,
-    disabled,
-    inputPlaceholder,
-    onChange,
-    errorText,
-    helpText,
-    initialFocus,
-    resizable
-  } = _ref5;
+const Editor = exports.Editor = /*#__PURE__*/(0, _react.forwardRef)(({
+  value,
+  disabled,
+  inputPlaceholder,
+  onChange,
+  errorText,
+  helpText,
+  initialFocus = true,
+  resizable = true
+}, externalRef) => {
   const [previewMode, setPreviewMode] = (0, _react.useState)(false);
   const internalRef = (0, _react.useRef)();
   const textareaRef = externalRef || internalRef;
@@ -251,10 +240,6 @@ const Editor = exports.Editor = /*#__PURE__*/(0, _react.forwardRef)((_ref5, exte
   }, _EditorStyle.mainClasses));
 });
 Editor.displayName = 'Editor';
-Editor.defaultProps = {
-  initialFocus: true,
-  resizable: true
-};
 Editor.propTypes = {
   value: _propTypes.default.string.isRequired,
   onChange: _propTypes.default.func.isRequired,

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

@@ -1,7 +1,7 @@
 "use strict";
 
-require("@testing-library/jest-dom");
 var _react = require("@testing-library/react");
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 var _react2 = _interopRequireDefault(require("react"));
 var _Editor = require("../Editor.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -23,16 +23,15 @@ describe('RichText: Editor component', () => {
   const renderComponent = props => {
     return (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_Editor.Editor, props));
   };
-  it('renders a result', () => {
+  test('renders a result', () => {
     renderComponent(componentProps);
     expect(_react.screen.getByTestId('@dhis2-analytics-richtexteditor')).toBeVisible();
   });
-  it('calls convertCtrlKey on keydown', () => {
+  test('calls convertCtrlKey on keydown', async () => {
+    const user = _userEvent.default.setup();
     renderComponent(componentProps);
-    _react.fireEvent.keyDown(_react.screen.getByRole('textbox'), {
-      key: 'A',
-      code: 'keyA'
-    });
+    await user.click(_react.screen.getByRole('textbox'));
+    await user.keyboard('A');
     expect(mockConvertCtrlKey).toHaveBeenCalled();
   });
 });

package/build/cjs/components/RichText/Parser/Parser.js

@@ -7,14 +7,12 @@ exports.Parser = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _MdParser = require("./MdParser.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const Parser = _ref => {
-  let {
-    children,
-    style
-  } = _ref;
+const Parser = ({
+  children,
+  style = null
+}) => {
   const MdParserInstance = (0, _react.useMemo)(() => new _MdParser.MdParser(), []);
   return children ? /*#__PURE__*/_react.default.createElement("div", {
     style: {
@@ -26,9 +24,6 @@ const Parser = _ref => {
   }) : null;
 };
 exports.Parser = Parser;
-Parser.defaultProps = {
-  style: null
-};
 Parser.propTypes = {
   children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
   style: _propTypes.default.object

package/build/cjs/components/RichText/Parser/__tests__/MdParser.spec.js

@@ -3,7 +3,7 @@
 var _MdParser = require("../MdParser.js");
 const Parser = new _MdParser.MdParser();
 describe('MdParser class', () => {
-  it('converts text into HTML', () => {
+  test('converts text into HTML', () => {
     const inlineTests = [['_italic_', '<em>italic</em>'], ['*bold*', '<strong>bold</strong>'], ['_ not italic because there is a space _', '_ not italic because there is a space _'], [':-)', '<span>\u{1F642}</span>'], [':)', '<span>\u{1F642}</span>'], [':-(', '<span>\u{1F641}</span>'], [':(', '<span>\u{1F641}</span>'], [':+1', '<span>\u{1F44D}</span>'], [':-1', '<span>\u{1F44E}</span>'], ['mixed _italic_ *bold* and :+1', 'mixed <em>italic</em> <strong>bold</strong> and <span>\u{1F44D}</span>'], ['_italic with * inside_', '<em>italic with * inside</em>'], ['*bold with _ inside*', '<strong>bold with _ inside</strong>'],
     // italic marker followed by : should work
     ['_italic_:', '<em>italic</em>:'], ['_italic_: some text, *bold*: some other text', '<em>italic</em>: some text, <strong>bold</strong>: some other text'],

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

@@ -1,7 +1,7 @@
 "use strict";
 
-var _enzyme = require("enzyme");
-var _react = _interopRequireDefault(require("react"));
+var _react = require("@testing-library/react");
+var _react2 = _interopRequireDefault(require("react"));
 var _Parser = require("../Parser.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 jest.mock('../MdParser.js', () => ({
@@ -12,30 +12,29 @@ jest.mock('../MdParser.js', () => ({
   })
 }));
 describe('RichText: Parser component', () => {
-  let richTextParser;
-  const defaultProps = {
-    style: {
+  test('should have rendered a result with the style prop', () => {
+    const style = {
       color: 'blue',
       whiteSpace: 'pre-line'
-    }
-  };
-  const renderComponent = (props, text) => {
-    return (0, _enzyme.shallow)(/*#__PURE__*/_react.default.createElement(_Parser.Parser, props, text));
-  };
-  it('should have rendered a result', () => {
-    richTextParser = renderComponent({}, 'test');
-    expect(richTextParser).toHaveLength(1);
-  });
-  it('should have rendered a result with the style prop', () => {
-    richTextParser = renderComponent(defaultProps, 'test prop');
-    expect(richTextParser.props().style).toEqual(defaultProps.style);
+    };
+    const {
+      container
+    } = (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_Parser.Parser, {
+      style: style
+    }, 'test prop'));
+    const divEl = container.querySelector('div');
+    expect(divEl.style.color).toBe(style.color);
+    expect(divEl.style.whiteSpace).toBe(style.whiteSpace);
   });
-  it('should have rendered content', () => {
-    richTextParser = renderComponent({}, 'plain text');
-    expect(richTextParser.html()).toEqual('<div>converted text</div>');
+  test('should have rendered content', () => {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_Parser.Parser, null, 'plain text'));
+    expect(_react.screen.getByText('converted text')).toBeInTheDocument();
   });
-  it('should return null if no children is passed', () => {
-    richTextParser = renderComponent({}, undefined);
-    expect(richTextParser.html()).toBe(null);
+  test('should return null if no children is passed', () => {
+    const {
+      container
+    } = (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_Parser.Parser, null));
+    const divEl = container.querySelector('div');
+    expect(divEl).toBe(null);
   });
 });

package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuBar.js

@@ -7,8 +7,7 @@ exports.useHoverMenubarContext = exports.HoverMenuBar = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const throwErrorIfNotInitialized = () => {
   throw new Error('`HoverMenubarContext` has not been initialised');
@@ -22,32 +21,42 @@ const HoverMenubarContext = /*#__PURE__*/(0, _react.createContext)({
 });
 const useHoverMenubarContext = () => (0, _react.useContext)(HoverMenubarContext);
 exports.useHoverMenubarContext = useHoverMenubarContext;
-const HoverMenuBar = _ref => {
-  let {
-    children,
-    dataTest
-  } = _ref;
+const HoverMenuBar = ({
+  children,
+  dataTest = 'dhis2-analytics-hovermenubar'
+}) => {
   const [openedDropdownEl, setOpenedDropdownEl] = (0, _react.useState)(null);
-  const [lastHoveredSubMenuEl, setLastHoveredSubMenuEl] = (0, _react.useState)(null);
+  const lastHoveredSubMenuElRef = (0, _react.useRef)(null);
   const [isInHoverMode, setIsInHoverMode] = (0, _react.useState)(false);
   const closeMenu = (0, _react.useCallback)(() => {
     setIsInHoverMode(false);
     setOpenedDropdownEl(null);
   }, []);
+  const setLastHoveredSubMenuEl = (0, _react.useCallback)(element => {
+    lastHoveredSubMenuElRef.current = element;
+  }, []);
   const onDocumentClick = (0, _react.useCallback)(event => {
-    const isClickOnOpenedSubMenuAnchor = lastHoveredSubMenuEl && (lastHoveredSubMenuEl === event.target || lastHoveredSubMenuEl.contains(event.target));
+    const isClickOnOpenedSubMenuAnchor = lastHoveredSubMenuElRef.current && (lastHoveredSubMenuElRef.current === event.target || lastHoveredSubMenuElRef.current.contains(event.target));
     if (!isClickOnOpenedSubMenuAnchor) {
       closeMenu();
     }
-  }, [closeMenu, lastHoveredSubMenuEl]);
+  }, [closeMenu]);
   const onDropDownButtonClick = (0, _react.useCallback)(event => {
     if (!isInHoverMode) {
+      /* Stop event propagation to avoid it from bubling up to the
+       * document, which would actually cause the menu to close again
+       * immediately */
+      event.stopPropagation();
       setIsInHoverMode(true);
       setOpenedDropdownEl(event.currentTarget);
+      document.addEventListener('click', onDocumentClick, {
+        once: true
+      });
     } else {
+      document.removeEventListener('click', onDocumentClick);
       closeMenu();
     }
-  }, [closeMenu, isInHoverMode]);
+  }, [closeMenu, isInHoverMode, onDocumentClick]);
   const onDropDownButtonMouseOver = (0, _react.useCallback)(event => {
     if (isInHoverMode) {
       setOpenedDropdownEl(event.currentTarget);
@@ -67,16 +76,6 @@ const HoverMenuBar = _ref => {
       closeMenu();
     }
   }, [closeMenu]);
-  (0, _react.useEffect)(() => {
-    if (isInHoverMode) {
-      document.addEventListener('click', onDocumentClick, {
-        once: true
-      });
-    }
-    return () => {
-      document.removeEventListener('click', onDocumentClick);
-    };
-  }, [onDocumentClick, isInHoverMode]);
   return /*#__PURE__*/_react.default.createElement(HoverMenubarContext.Provider, {
     value: {
       onDropDownButtonClick,
@@ -93,9 +92,6 @@ const HoverMenuBar = _ref => {
   }, [".jsx-3020154784{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}"])));
 };
 exports.HoverMenuBar = HoverMenuBar;
-HoverMenuBar.defaultProps = {
-  dataTest: 'dhis2-analytics-hovermenubar'
-};
 HoverMenuBar.propTypes = {
   children: _propTypes.default.node.isRequired,
   dataTest: _propTypes.default.string