Merge pull request #208 from dhis2/fix/SharingDialog-props-and-DataTa…

…bleContectMenu-initial-position Fix sharing dialog props and data table context menu initial position
dhis2 · Mar 20, 2018 · a997985 · a997985
2 parents 4501fdf + b8d1f09
commit a997985
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/sharing/src/SharingDialog.component.js b/packages/sharing/src/SharingDialog.component.js
@@ -44,7 +44,7 @@ class SharingDialog extends React.Component {
     componentDidMount() {
         this.loadDataSharingSettings();
         if (this.props.open && this.props.type && this.props.id) {
-            this.loadObjectFromApi();
+            this.loadObjectFromApi(this.props);
         }
     }
 
@@ -53,11 +53,11 @@ class SharingDialog extends React.Component {
 
         if (hasChanged('id') || hasChanged('type')) {
             this.resetState();
-            if (nextProps.open) this.loadObjectFromApi();
+            if (nextProps.open) this.loadObjectFromApi(nextProps);
         }
 
         if (!this.props.open && nextProps.open) {
-            this.loadObjectFromApi();
+            this.loadObjectFromApi(nextProps);
         }
     }
 
@@ -119,9 +119,8 @@ class SharingDialog extends React.Component {
         });
     }
 
-    loadObjectFromApi = () => {
+    loadObjectFromApi = ({ type, id }) => {
         const api = this.props.d2.Api.getApi();
-        const { type, id } = this.props;
 
         api
         .get('sharing', { type, id })

diff --git a/src/data-table/DataTableContextMenu.component.js b/src/data-table/DataTableContextMenu.component.js
@@ -13,9 +13,14 @@ function DataTableContextMenu(props, context) {
         .keys(props.actions)
         .filter(menuActionKey => typeof props.actions[menuActionKey] === 'function');
 
+    // Transition and left styles were added to prevent initial rendering in top-left
+    // https://github.com/mui-org/material-ui/issues/8040
     const cmStyle = {
         position: 'fixed',
+        left: -1000,
+        transition: 'left 0s, top 0s',
     };
+
     const {
         actions,
         activeItem,