@dhis2/analytics 25.2.3 → 26.0.0

package/build/es/__demo__/Toolbar.stories.js

@@ -0,0 +1,69 @@
+import { storiesOf } from '@storybook/react';
+import React, { useState } from 'react';
+import { HoverMenuBar, HoverMenuDropdown, HoverMenuList, HoverMenuListItem, InterpretationsAndDetailsToggler, Toolbar, ToolbarSidebar, UpdateButton } from '../components/Toolbar/index.js';
+
+function ToolbarWithState() {
+  const [isHidden, setIsHidden] = useState(false);
+  const [isSidebarShowing, setIsSidebarShowing] = useState(false);
+  return /*#__PURE__*/React.createElement(Toolbar, null, /*#__PURE__*/React.createElement(ToolbarSidebar, {
+    isHidden: isHidden
+  }, /*#__PURE__*/React.createElement("span", null, "Toolbar side bar"), /*#__PURE__*/React.createElement("a", {
+    style: {
+      paddingLeft: 12,
+      textDecoration: 'underline',
+      cursor: 'pointer'
+    },
+    onClick: () => setIsHidden(true)
+  }, "click to hide")), /*#__PURE__*/React.createElement(UpdateButton, null), /*#__PURE__*/React.createElement(HoverMenuBar, null, /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: "Menu A"
+  }, /*#__PURE__*/React.createElement(HoverMenuList, null, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item A.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item A.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item A.3"
+  }))), /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: "Menu B"
+  }, /*#__PURE__*/React.createElement(HoverMenuList, null, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1"
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.1.3"
+  })), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2"
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.2.3"
+  })), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3",
+    disabled: true
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item B.3.3"
+  })))), /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: "Menu C",
+    disabled: true
+  }, /*#__PURE__*/React.createElement(HoverMenuList, null, /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item C.1"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item C.2"
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
+    label: "Menu item C.3"
+  })))), /*#__PURE__*/React.createElement(InterpretationsAndDetailsToggler, {
+    isShowing: isSidebarShowing,
+    onClick: () => setIsSidebarShowing(current => !current)
+  }));
+}
+
+storiesOf('Toolbar', module).add('default', () => {
+  return /*#__PURE__*/React.createElement(ToolbarWithState, null);
+});

package/build/es/components/FileMenu/FileMenu.js

@@ -1,12 +1,11 @@
-import _JSXStyle from "styled-jsx/style";
-import { IconAdd24, IconLaunch24, IconSave24, IconEdit24, IconTranslate24, IconShare24, IconLink24, IconDelete24, SharingDialog, colors, FlyoutMenu, Layer, MenuItem, MenuDivider, Popper } from '@dhis2/ui';
+import { IconAdd24, IconLaunch24, IconSave24, IconEdit24, IconTranslate24, IconShare24, IconLink24, IconDelete24, SharingDialog, colors, MenuDivider } from '@dhis2/ui';
 import PropTypes from 'prop-types';
-import React, { createRef, useState } from 'react';
+import React, { useState } from 'react';
 import i18n from '../../locales/index.js';
 import { OpenFileDialog } from '../OpenFileDialog/OpenFileDialog.js';
+import { HoverMenuListItem, HoverMenuList, HoverMenuDropdown } from '../Toolbar/index.js';
 import { TranslationDialog } from '../TranslationDialog/index.js';
 import { DeleteDialog } from './DeleteDialog.js';
-import { fileMenuStyles } from './FileMenu.styles.js';
 import { GetLinkDialog } from './GetLinkDialog.js';
 import { RenameDialog } from './RenameDialog.js';
 import { SaveAsDialog } from './SaveAsDialog.js';
@@ -30,24 +29,14 @@ export const FileMenu = _ref => {
     onError,
     onTranslate
   } = _ref;
-  const [menuIsOpen, setMenuIsOpen] = useState(false);
-  const [currentDialog, setCurrentDialog] = useState(null); // Escape key press closes the menu
-
-  const onKeyDown = e => {
-    if ((e === null || e === void 0 ? void 0 : e.keyCode) === 27) {
-      setMenuIsOpen(false);
-    }
-  };
+  const [currentDialog, setCurrentDialog] = useState(null);
 
   const onMenuItemClick = dialogToOpen => () => {
-    setMenuIsOpen(false);
     setCurrentDialog(dialogToOpen);
   };
 
   const onDialogClose = () => setCurrentDialog(null);
 
-  const toggleMenu = () => setMenuIsOpen(!menuIsOpen);
-
   const onDeleteConfirm = () => {
     // The dialog must be closed before calling the callback
     // otherwise the fileObject is changed to null before the
@@ -57,8 +46,6 @@ export const FileMenu = _ref => {
     onDelete();
   };
 
-  const buttonRef = /*#__PURE__*/createRef();
-
   const renderDialog = () => {
     switch (currentDialog) {
       case 'rename':
@@ -120,19 +107,7 @@ export const FileMenu = _ref => {
 
   const iconActiveColor = colors.grey700;
   const iconInactiveColor = colors.grey500;
-  return /*#__PURE__*/React.createElement("div", {
-    onKeyDown: onKeyDown,
-    className: "jsx-".concat(fileMenuStyles.__hash)
-  }, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: fileMenuStyles.__hash
-  }, fileMenuStyles), /*#__PURE__*/React.createElement("div", {
-    ref: buttonRef,
-    className: "jsx-".concat(fileMenuStyles.__hash)
-  }, /*#__PURE__*/React.createElement("button", {
-    onClick: toggleMenu,
-    "data-test": "file-menu-toggle",
-    className: "jsx-".concat(fileMenuStyles.__hash) + " " + "menu-toggle"
-  }, i18n.t('File'))), /*#__PURE__*/React.createElement(OpenFileDialog, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OpenFileDialog, {
     open: currentDialog === 'open',
     type: fileType,
     filterVisTypes: filterVisTypes,
@@ -144,45 +119,33 @@ export const FileMenu = _ref => {
     },
     onNew: onNew,
     currentUser: currentUser
-  }), menuIsOpen && /*#__PURE__*/React.createElement(Layer, {
-    onBackdropClick: toggleMenu,
-    position: "fixed",
-    level: 2000,
-    dataTest: "file-menu-toggle-layer"
-  }, /*#__PURE__*/React.createElement(Popper, {
-    reference: buttonRef,
-    placement: "bottom-start"
-  }, /*#__PURE__*/React.createElement(FlyoutMenu, {
+  }), /*#__PURE__*/React.createElement(HoverMenuDropdown, {
+    label: i18n.t('File')
+  }, /*#__PURE__*/React.createElement(HoverMenuList, {
     dataTest: "file-menu-container"
-  }, /*#__PURE__*/React.createElement(MenuItem, {
+  }, /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('New'),
     icon: /*#__PURE__*/React.createElement(IconAdd24, {
       color: iconActiveColor
     }),
-    onClick: () => {
-      toggleMenu();
-      onNew();
-    },
+    onClick: onNew,
     dataTest: "file-menu-new"
-  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Open…'),
     icon: /*#__PURE__*/React.createElement(IconLaunch24, {
       color: iconActiveColor
     }),
     onClick: onMenuItemClick('open'),
     dataTest: "file-menu-open"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: fileObject !== null && fileObject !== void 0 && fileObject.id ? i18n.t('Save') : i18n.t('Save…'),
     icon: /*#__PURE__*/React.createElement(IconSave24, {
       color: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access = fileObject.access) !== null && _fileObject$access !== void 0 && _fileObject$access.update) ? iconInactiveColor : iconActiveColor
     }),
     disabled: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access2 = fileObject.access) !== null && _fileObject$access2 !== void 0 && _fileObject$access2.update),
-    onClick: fileObject !== null && fileObject !== void 0 && fileObject.id ? () => {
-      toggleMenu();
-      onSave();
-    } : onMenuItemClick('saveas'),
+    onClick: fileObject !== null && fileObject !== void 0 && fileObject.id ? onSave : onMenuItemClick('saveas'),
     dataTest: "file-menu-save"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Save as…'),
     icon: /*#__PURE__*/React.createElement(IconSave24, {
       color: !(onSaveAs && fileObject !== null && fileObject !== void 0 && fileObject.id) ? iconInactiveColor : iconActiveColor
@@ -190,7 +153,7 @@ export const FileMenu = _ref => {
     disabled: !(onSaveAs && fileObject !== null && fileObject !== void 0 && fileObject.id),
     onClick: onMenuItemClick('saveas'),
     dataTest: "file-menu-saveas"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Rename…'),
     icon: /*#__PURE__*/React.createElement(IconEdit24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access3 = fileObject.access) !== null && _fileObject$access3 !== void 0 && _fileObject$access3.update ? iconActiveColor : iconInactiveColor
@@ -198,7 +161,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access4 = fileObject.access) !== null && _fileObject$access4 !== void 0 && _fileObject$access4.update),
     onClick: onMenuItemClick('rename'),
     dataTest: "file-menu-rename"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Translate…'),
     icon: /*#__PURE__*/React.createElement(IconTranslate24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access5 = fileObject.access) !== null && _fileObject$access5 !== void 0 && _fileObject$access5.update ? iconActiveColor : iconInactiveColor
@@ -206,7 +169,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access6 = fileObject.access) !== null && _fileObject$access6 !== void 0 && _fileObject$access6.update),
     onClick: onMenuItemClick('translate'),
     dataTest: "file-menu-translate"
-  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Share…'),
     icon: /*#__PURE__*/React.createElement(IconShare24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access7 = fileObject.access) !== null && _fileObject$access7 !== void 0 && _fileObject$access7.manage ? iconActiveColor : iconInactiveColor
@@ -214,7 +177,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access8 = fileObject.access) !== null && _fileObject$access8 !== void 0 && _fileObject$access8.manage),
     onClick: onMenuItemClick('sharing'),
     dataTest: "file-menu-sharing"
-  }), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Get link…'),
     icon: /*#__PURE__*/React.createElement(IconLink24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id ? iconActiveColor : iconInactiveColor
@@ -222,7 +185,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id),
     onClick: onMenuItemClick('getlink'),
     dataTest: "file-menu-getlink"
-  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(MenuItem, {
+  }), /*#__PURE__*/React.createElement(MenuDivider, null), /*#__PURE__*/React.createElement(HoverMenuListItem, {
     label: i18n.t('Delete'),
     destructive: true,
     icon: /*#__PURE__*/React.createElement(IconDelete24, {
@@ -231,7 +194,7 @@ export const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id && fileObject !== null && fileObject !== void 0 && (_fileObject$access10 = fileObject.access) !== null && _fileObject$access10 !== void 0 && _fileObject$access10.delete),
     onClick: onMenuItemClick('delete'),
     dataTest: "file-menu-delete"
-  })))), renderDialog());
+  }))), renderDialog());
 };
 FileMenu.defaultProps = {
   onDelete: Function.prototype,