@mailstep/design-system 0.7.47-beta.7 → 0.7.47-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mailstep/design-system",
-  "version": "0.7.47-beta.7",
+  "version": "0.7.47-beta.9",
   "license": "ISC",
   "type": "module",
   "main": "./ui/index.js",

package/ui/Blocks/CommonGrid/components/gridCells/RowActionsCell.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useMemo } from 'react';
 import Checkbox from '../../../../Forms/Checkbox';
 import { x } from '@xstyled/styled-components';
@@ -19,6 +19,7 @@ export var RowActionsCell = function (_a) {
     var actionColumnDefinition = _a.actionColumnDefinition, rowData = _a.rowData, uxState = _a.uxState, withCheckboxes = _a.withCheckboxes, onUxChange = _a.onUxChange, onRowAction = _a.onRowAction;
     var rowDataId = rowData === null || rowData === void 0 ? void 0 : rowData.id;
     // @TODO this should be in parent component
+    console.log('uxState', uxState);
     var checkedRows = uxState === null || uxState === void 0 ? void 0 : uxState.checkedRows;
     var canEdit = isFunction(actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.canRowEdit)
         ? actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.canRowEdit(rowData)
@@ -53,20 +54,5 @@ export var RowActionsCell = function (_a) {
             onClick();
         }
     }, [onClick]);
-    var actions = useMemo(function () {
-        var actionOptions = [];
-        if (withCheckboxes) {
-            actionOptions.push(_jsx(x.div, { w: "100%", h: "100%", display: "flex", children: _jsx(Checkbox, { checked: isChecked, onChange: onCheckboxChange, label: "" }) }));
-        }
-        if (canEdit) {
-            actionOptions.push(_jsx(IconButtonInCell, { icon: "pen", onClick: handleOnClick, linkTo: linkTo }, "edit"));
-        }
-        if (!canEdit && canRead) {
-            actionOptions.push(_jsx(IconButtonInCell, { icon: "chevronRight", onClick: handleOnClick, linkTo: linkTo }, "read"));
-        }
-        return actionOptions;
-    }, [canEdit, canRead, handleOnClick, linkTo, isChecked, withCheckboxes, onCheckboxChange]);
-    if (actions.length === 0)
-        return null;
-    return (_jsx(x.div, { w: "100%", display: "flex", alignItems: "center", gap: "16px", children: actions }));
+    return (_jsxs(x.div, { w: "100%", display: "flex", alignItems: "center", gap: "16px", children: [withCheckboxes && (_jsx(x.div, { w: "100%", h: "100%", display: "flex", children: _jsx(Checkbox, { checked: isChecked, onChange: onCheckboxChange, label: "" }) })), canEdit && _jsx(IconButtonInCell, { icon: "pen", onClick: handleOnClick, linkTo: linkTo }, "edit"), !canEdit && canRead && _jsx(IconButtonInCell, { icon: "chevronRight", onClick: handleOnClick, linkTo: linkTo }, "read")] }));
 };

package/ui/Blocks/CommonGrid/hooks/useEditReadAsColumn.js

@@ -21,7 +21,7 @@ var useEditReadAsColumn = function (props) {
             return {
                 flexBasis: (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.flexBasis) || 88,
                 forceCheckboxes: true,
-                addRowNumbers: actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.addRowNumbers,
+                addRowNumbers: actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.addRowNumbers
             };
         }
         else if (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.addRowNumbers) {
@@ -44,7 +44,7 @@ var useEditReadAsColumn = function (props) {
     }, [onRowAction, onRowEditClick, onRowReadClick]);
     var canRowEdit = (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.canRowEdit) !== undefined;
     var canRowRead = (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.canRowRead) !== undefined;
-    var stickTo = (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.stickTo) || 'right';
+    var stickTo = (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.stickTo) || 'left';
     var flexBasis = (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.flexBasis) || 88;
     var withCheckboxes = !!((_a = actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.actionOptions) === null || _a === void 0 ? void 0 : _a.length) || (actionColumnDefinition === null || actionColumnDefinition === void 0 ? void 0 : actionColumnDefinition.forceCheckboxes);
     var modifiedColumnsDefinitions = useMemo(function () {
@@ -74,7 +74,17 @@ var useEditReadAsColumn = function (props) {
         else {
             return columnsDefinitions;
         }
-    }, [flexBasis, stickTo, canRowEdit, canRowRead, columnsDefinitions]);
+    }, [
+        flexBasis,
+        stickTo,
+        canRowEdit,
+        canRowRead,
+        columnsDefinitions,
+        withCheckboxes,
+        gridSelectors === null || gridSelectors === void 0 ? void 0 : gridSelectors.uxState,
+        actionColumnDefinition,
+        gridActions === null || gridActions === void 0 ? void 0 : gridActions.handleUxChange
+    ]);
     return {
         columnsDefinitions: modifiedColumnsDefinitions,
         actionColumnDefinition: actionColumnDefinition,

package/ui/Blocks/CommonGrid/storybook/stories/complexWithPaginationAndRedux.stories.js

@@ -10,7 +10,6 @@ import { ReduxGrid, createRandomData, enumValues, gridDummyActions } from '../ut
 import withRedux from '../utils/withRedux';
 var ActionColumnButtons = {
     flexBasis: 80,
-    stickTo: 'left',
     forceCheckboxes: true
 };
 var FilterSetter = function (_a) {