@dhis2/analytics 25.2.1 → 25.2.2

package/build/cjs/__demo__/FileMenu.stories.js

@@ -8,8 +8,6 @@ var _react2 = _interopRequireDefault(require("react"));
 
 var _FileMenu = require("../components/FileMenu/FileMenu.js");
 
-var _index = require("../components/Toolbar/index.js");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const configMock = {
@@ -62,19 +60,19 @@ const visReadonlyObject = { ...visObject,
 };
 (0, _react.storiesOf)('FileMenu', module).add('Simple', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
   config: configMock
-}, /*#__PURE__*/_react2.default.createElement(_index.HoverMenuBar, null, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
+}, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
   currentUser: user,
   fileType: "visualization"
-})))).add('With AO', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
+}))).add('With AO', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
   config: configMock
-}, /*#__PURE__*/_react2.default.createElement(_index.HoverMenuBar, null, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
+}, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
   currentUser: user,
   fileType: "visualization",
   fileObject: visObject
-})))).add('With readonly AO', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
+}))).add('With readonly AO', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
   config: configMock
-}, /*#__PURE__*/_react2.default.createElement(_index.HoverMenuBar, null, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
+}, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
   currentUser: user,
   fileType: "visualization",
   fileObject: visReadonlyObject
-}))));
+})));

package/build/cjs/components/FileMenu/FileMenu.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.FileMenu = void 0;
 
+var _style = _interopRequireDefault(require("styled-jsx/style"));
+
 var _ui = require("@dhis2/ui");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -15,12 +17,12 @@ var _index = _interopRequireDefault(require("../../locales/index.js"));
 
 var _OpenFileDialog = require("../OpenFileDialog/OpenFileDialog.js");
 
-var _index2 = require("../Toolbar/index.js");
-
-var _index3 = require("../TranslationDialog/index.js");
+var _index2 = require("../TranslationDialog/index.js");
 
 var _DeleteDialog = require("./DeleteDialog.js");
 
+var _FileMenuStyles = require("./FileMenu.styles.js");
+
 var _GetLinkDialog = require("./GetLinkDialog.js");
 
 var _RenameDialog = require("./RenameDialog.js");
@@ -54,14 +56,24 @@ const FileMenu = _ref => {
     onError,
     onTranslate
   } = _ref;
-  const [currentDialog, setCurrentDialog] = (0, _react.useState)(null);
+  const [menuIsOpen, setMenuIsOpen] = (0, _react.useState)(false);
+  const [currentDialog, setCurrentDialog] = (0, _react.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 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
@@ -71,6 +83,8 @@ const FileMenu = _ref => {
     onDelete();
   };
 
+  const buttonRef = /*#__PURE__*/(0, _react.createRef)();
+
   const renderDialog = () => {
     switch (currentDialog) {
       case 'rename':
@@ -83,7 +97,7 @@ const FileMenu = _ref => {
         });
 
       case 'translate':
-        return /*#__PURE__*/_react.default.createElement(_index3.TranslationDialog, {
+        return /*#__PURE__*/_react.default.createElement(_index2.TranslationDialog, {
           objectToTranslate: fileObject,
           fieldsToTranslate: ['name', 'description'],
           onClose: onDialogClose,
@@ -132,7 +146,19 @@ const FileMenu = _ref => {
 
   const iconActiveColor = _ui.colors.grey700;
   const iconInactiveColor = _ui.colors.grey500;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_OpenFileDialog.OpenFileDialog, {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    onKeyDown: onKeyDown,
+    className: "jsx-".concat(_FileMenuStyles.fileMenuStyles.__hash)
+  }, /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _FileMenuStyles.fileMenuStyles.__hash
+  }, _FileMenuStyles.fileMenuStyles), /*#__PURE__*/_react.default.createElement("div", {
+    ref: buttonRef,
+    className: "jsx-".concat(_FileMenuStyles.fileMenuStyles.__hash)
+  }, /*#__PURE__*/_react.default.createElement("button", {
+    onClick: toggleMenu,
+    "data-test": "file-menu-toggle",
+    className: "jsx-".concat(_FileMenuStyles.fileMenuStyles.__hash) + " " + "menu-toggle"
+  }, _index.default.t('File'))), /*#__PURE__*/_react.default.createElement(_OpenFileDialog.OpenFileDialog, {
     open: currentDialog === 'open',
     type: fileType,
     filterVisTypes: filterVisTypes,
@@ -144,33 +170,45 @@ const FileMenu = _ref => {
     },
     onNew: onNew,
     currentUser: currentUser
-  }), /*#__PURE__*/_react.default.createElement(_index2.HoverMenuDropdown, {
-    label: _index.default.t('File')
-  }, /*#__PURE__*/_react.default.createElement(_index2.HoverMenuList, {
+  }), menuIsOpen && /*#__PURE__*/_react.default.createElement(_ui.Layer, {
+    onBackdropClick: toggleMenu,
+    position: "fixed",
+    level: 2000,
+    dataTest: "file-menu-toggle-layer"
+  }, /*#__PURE__*/_react.default.createElement(_ui.Popper, {
+    reference: buttonRef,
+    placement: "bottom-start"
+  }, /*#__PURE__*/_react.default.createElement(_ui.FlyoutMenu, {
     dataTest: "file-menu-container"
-  }, /*#__PURE__*/_react.default.createElement(_index2.HoverMenuListItem, {
+  }, /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('New'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconAdd24, {
       color: iconActiveColor
     }),
-    onClick: onNew,
+    onClick: () => {
+      toggleMenu();
+      onNew();
+    },
     dataTest: "file-menu-new"
-  }), /*#__PURE__*/_react.default.createElement(_ui.MenuDivider, null), /*#__PURE__*/_react.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuDivider, null), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('Open…'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconLaunch24, {
       color: iconActiveColor
     }),
     onClick: onMenuItemClick('open'),
     dataTest: "file-menu-open"
-  }), /*#__PURE__*/_react.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: fileObject !== null && fileObject !== void 0 && fileObject.id ? _index.default.t('Save') : _index.default.t('Save…'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.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 ? onSave : onMenuItemClick('saveas'),
+    onClick: fileObject !== null && fileObject !== void 0 && fileObject.id ? () => {
+      toggleMenu();
+      onSave();
+    } : onMenuItemClick('saveas'),
     dataTest: "file-menu-save"
-  }), /*#__PURE__*/_react.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('Save as…'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconSave24, {
       color: !(onSaveAs && fileObject !== null && fileObject !== void 0 && fileObject.id) ? iconInactiveColor : iconActiveColor
@@ -178,7 +216,7 @@ const FileMenu = _ref => {
     disabled: !(onSaveAs && fileObject !== null && fileObject !== void 0 && fileObject.id),
     onClick: onMenuItemClick('saveas'),
     dataTest: "file-menu-saveas"
-  }), /*#__PURE__*/_react.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('Rename…'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.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
@@ -186,7 +224,7 @@ 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.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('Translate…'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.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
@@ -194,7 +232,7 @@ 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.default.createElement(_ui.MenuDivider, null), /*#__PURE__*/_react.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuDivider, null), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('Share…'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.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
@@ -202,7 +240,7 @@ 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.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('Get link…'),
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconLink24, {
       color: fileObject !== null && fileObject !== void 0 && fileObject.id ? iconActiveColor : iconInactiveColor
@@ -210,7 +248,7 @@ const FileMenu = _ref => {
     disabled: !(fileObject !== null && fileObject !== void 0 && fileObject.id),
     onClick: onMenuItemClick('getlink'),
     dataTest: "file-menu-getlink"
-  }), /*#__PURE__*/_react.default.createElement(_ui.MenuDivider, null), /*#__PURE__*/_react.default.createElement(_index2.HoverMenuListItem, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.MenuDivider, null), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
     label: _index.default.t('Delete'),
     destructive: true,
     icon: /*#__PURE__*/_react.default.createElement(_ui.IconDelete24, {
@@ -219,7 +257,7 @@ 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());
 };
 
 exports.FileMenu = FileMenu;