@carbon/ibm-products 2.0.0-rc.17 → 2.0.0-rc.19

package/lib/components/Datagrid/Datagrid/DraggableElement.js

@@ -57,6 +57,7 @@ var DraggableElement = function DraggableElement(_ref) {
       onGrab = _ref.onGrab,
       onArrowKeyDown = _ref.onArrowKeyDown,
       isFocused = _ref.isFocused,
+      isSticky = _ref.isSticky,
       moveElement = _ref.moveElement,
       selected = _ref.selected,
       _ref$positionLabel = _ref.positionLabel,
@@ -143,11 +144,13 @@ var DraggableElement = function DraggableElement(_ref) {
     className: (0, _classnames.default)({
       disabled: disabled
     }, "".concat(blockClass, "__draggable-handleStyle"))
-  }, /*#__PURE__*/React.createElement(_icons.Draggable, {
+  }, isSticky ? /*#__PURE__*/React.createElement(_icons.Locked, {
+    size: 16
+  }) : /*#__PURE__*/React.createElement(_icons.Draggable, {
     size: 16
   })), children);
   return /*#__PURE__*/React.createElement("li", {
-    className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-isOver"), isOver && !disabled), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-grabbed"), isGrabbed), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-selected"), selected), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder"), !selected), _cx)),
+    className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-isOver"), isOver && !disabled), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-grabbed"), isGrabbed), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-selected"), selected), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder--sticky"), isSticky), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder"), !selected), _cx)),
     ref: ref,
     "aria-selected": isFocused,
     role: "option",
@@ -196,6 +199,7 @@ DraggableElement.propTypes = {
   id: _propTypes.default.string.isRequired,
   index: _propTypes.default.number.isRequired,
   isFocused: _propTypes.default.bool.isRequired,
+  isSticky: _propTypes.default.bool,
   listData: _propTypes.default.array.isRequired,
   moveElement: _propTypes.default.func.isRequired,
   onArrowKeyDown: _propTypes.default.func.isRequired,

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/Columns.js

@@ -124,10 +124,12 @@ var Columns = function Columns(_ref) {
     var res = filterString.length ? colDef.Header.props.title.toLowerCase().split(searchString) : null;
     var firstWord = res !== null ? res[0] === '' ? res[1].charAt(0).toUpperCase() + res[1].substring(1) : res[0].charAt(0).toUpperCase() + res[0].substring(1) : null;
     var highlightedText = res !== null ? res[0] === '' ? "<strong>".concat(firstWord, "</strong>") + res[2] : firstWord + "<strong>".concat(res[1], "</strong>") + res[2] : colDef.Header.props.title;
+    var isFrozenColumn = !!colDef.sticky;
 
     var listContents = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_react2.Checkbox, {
       className: (0, _classnames.default)("".concat(blockClass, "__customize-columns-checkbox-wrapper"), "".concat(blockClass, "__customize-columns-checkbox")),
       checked: (0, _common.isColumnVisible)(colDef),
+      disabled: isFrozenColumn,
       onChange: function onChange(_, _ref2) {
         var checked = _ref2.checked;
         return onSelectColumn(colDef, checked);
@@ -149,18 +151,21 @@ var Columns = function Columns(_ref) {
       setListData: setColumnsObject,
       id: "dnd-datagrid-columns-".concat(colDef.id),
       type: "column-customization",
-      disabled: filterString.length > 0,
+      disabled: filterString.length > 0 || isFrozenColumn,
       ariaLabel: colDef.Header.props.title,
       onGrab: setAriaRegionText,
       isFocused: focusIndex === i,
+      isSticky: isFrozenColumn,
       moveElement: moveElement,
       onArrowKeyDown: function onArrowKeyDown(e, isGrabbed, currentIndex) {
         if (isGrabbed) {
+          var _columns$nextIndex;
+
           var nextIndex = getNextIndex(columns, currentIndex, e.key);
           e.preventDefault();
           e.stopPropagation();
 
-          if (nextIndex >= 0) {
+          if (nextIndex >= 0 && !((_columns$nextIndex = columns[nextIndex]) !== null && _columns$nextIndex !== void 0 && _columns$nextIndex.sticky)) {
             setFocusIndex(nextIndex);
             moveElement(currentIndex, nextIndex);
             e.target.scrollIntoView({

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js

@@ -79,7 +79,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
 
   var _useState7 = (0, _react.useState)(columnDefinitions // hide the columns without Header, e.g the sticky actions, spacer
   .filter(function (colDef) {
-    return !!colDef.Header.props;
+    return !!colDef.Header.props && !colDef.isAction;
   }) // only sort the hidden column to the end when modal reopen
   .sort(function (defA, defB) {
     var isVisibleA = (0, _common.isColumnVisible)(defA);

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js

@@ -35,9 +35,7 @@ var _ActionSet = require("../../../../ActionSet");
 
 var _constants = require("./constants");
 
-var _FilterProvider = require("./FilterProvider");
-
-var _useInitialStateFromFilters = _interopRequireDefault(require("./hooks/useInitialStateFromFilters"));
+var _hooks2 = require("./hooks");
 
 var _utils = require("./utils");
 
@@ -75,20 +73,17 @@ var FilterFlyout = function FilterFlyout(_ref) {
       onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
       _ref$secondaryActionL = _ref.secondaryActionLabel,
       secondaryActionLabel = _ref$secondaryActionL === void 0 ? 'Cancel' : _ref$secondaryActionL,
-      setAllFilters = _ref.setAllFilters;
+      setAllFilters = _ref.setAllFilters,
+      _ref$data = _ref.data,
+      data = _ref$data === void 0 ? [] : _ref$data;
 
-  /** Context state and methods */
-  var _useContext = (0, _react2.useContext)(_FilterProvider.FilterContext),
-      EventEmitter = _useContext.EventEmitter;
   /** State */
-
-
   var _useState = (0, _react2.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       open = _useState2[0],
       setOpen = _useState2[1];
 
-  var _useInitialStateFromF = (0, _useInitialStateFromFilters.default)(filters),
+  var _useInitialStateFromF = (0, _hooks2.useInitialStateFromFilters)(filters, _constants.FLYOUT),
       _useInitialStateFromF2 = (0, _slicedToArray2.default)(_useInitialStateFromF, 2),
       filtersState = _useInitialStateFromF2[0],
       setFiltersState = _useInitialStateFromF2[1];
@@ -104,9 +99,21 @@ var FilterFlyout = function FilterFlyout(_ref) {
 
   var prevFiltersRef = (0, _react2.useRef)(JSON.stringify(filtersState));
   var prevFiltersObjectArrayRef = (0, _react2.useRef)(JSON.stringify(filtersObjectArray));
+  /** State from hooks */
+
+  var _useShouldDisableButt = (0, _hooks2.useShouldDisableButtons)({
+    initialValue: true,
+    filtersState: filtersState,
+    prevFiltersRef: prevFiltersRef
+  }),
+      _useShouldDisableButt2 = (0, _slicedToArray2.default)(_useShouldDisableButt, 2),
+      shouldDisableButtons = _useShouldDisableButt2[0],
+      setShouldDisableButtons = _useShouldDisableButt2[1];
   /** Memos */
 
+
   var showActionSet = updateMethod === _constants.BATCH;
+  var carbonPrefix = (0, _react.usePrefix)();
   /** Methods */
 
   var openFlyout = function openFlyout() {
@@ -121,8 +128,11 @@ var FilterFlyout = function FilterFlyout(_ref) {
 
   var apply = function apply() {
     setAllFilters(filtersObjectArray);
-    closeFlyout();
-    onApply(); // updates the ref so next time the flyout opens we have records of the previous filters
+    closeFlyout(); // From the user
+
+    onApply(); // When the user clicks apply, the action set buttons should be disabled again
+
+    setShouldDisableButtons(true); // updates the ref so next time the flyout opens we have records of the previous filters
 
     prevFiltersRef.current = JSON.stringify(filtersState);
     prevFiltersObjectArrayRef.current = JSON.stringify(filtersObjectArray);
@@ -140,7 +150,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
 
   var reset = function reset() {
     // Get the initial values for the filters
-    var initialFiltersState = (0, _utils.getInitialStateFromFilters)(filters);
+    var initialFiltersState = (0, _utils.getInitialStateFromFilters)(filters, _constants.FLYOUT);
     var initialFiltersObjectArray = []; // Set the state to the initial values
 
     setFiltersState(initialFiltersState);
@@ -184,6 +194,37 @@ var FilterFlyout = function FilterFlyout(_ref) {
       });
     }
 
+    if (type === _constants.CHECKBOX) {
+      /**
+      When all checkboxes of a group are all unselected the value still exists in the filtersObjectArray
+      This checks if all the checkboxes are selected = false and removes it from the array
+      */
+      var index = filtersObjectArrayCopy.findIndex(function (filter) {
+        return filter.id === column;
+      }); // If all the selected state is false remove from array
+
+      var shouldRemoveFromArray = filtersObjectArrayCopy[index].value.every(function (val) {
+        return val.selected === false;
+      });
+
+      if (shouldRemoveFromArray) {
+        filtersObjectArrayCopy.splice(index, 1);
+      }
+    } else if (type === _constants.DROPDOWN || type === _constants.RADIO) {
+      if (value === 'Any') {
+        /**
+        Checks to see if the selected value is 'Any', that means the user wants
+        to reset specific filter
+        */
+        var _index = filtersObjectArrayCopy.findIndex(function (filter) {
+          return filter.id === column;
+        }); // Remove it from the filters array
+
+
+        filtersObjectArrayCopy.splice(_index, 1);
+      }
+    }
+
     setFiltersObjectArray(filtersObjectArrayCopy); // Automatically apply the filters if the updateMethod is instant
 
     if (updateMethod === _constants.INSTANT) {
@@ -194,33 +235,31 @@ var FilterFlyout = function FilterFlyout(_ref) {
 
   (0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
     var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
+    var hasClickedOnDropdown = target.className === "".concat(carbonPrefix, "--list-box__menu-item__option");
 
-    if (!open || hasClickedOnDatePicker) {
+    if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
       return;
     }
 
     cancel();
   });
-  (0, _react2.useEffect)(function subscribeToEmitter() {
-    // This event is emitted from the DatagridToolbar component when clearFilters is clicked in FilterSummary
-    EventEmitter.subscribe(_constants.CLEAR_FILTERS, reset);
-  });
+  (0, _hooks2.useSubscribeToEventEmitter)(_constants.CLEAR_FILTERS, reset);
   /** Render the individual filter component */
 
-  var renderFilter = (0, _react2.useCallback)(function (_ref3) {
+  var renderFilter = function renderFilter(_ref3) {
     var type = _ref3.type,
         column = _ref3.column,
         components = _ref3.props;
-    var key = "".concat(type, "-").concat(column, "-").concat(Math.random());
 
     if (type === _constants.DATE) {
-      return /*#__PURE__*/_react2.default.createElement(_react.DatePicker, (0, _extends2.default)({
-        key: key
-      }, components.DatePicker, {
+      return /*#__PURE__*/_react2.default.createElement(_react.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
         onChange: function onChange(value) {
           var _components$DatePicke, _components$DatePicke2;
 
-          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, value)));
+          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+            value: value,
+            type: type
+          })));
           applyFilters({
             column: column,
             value: value,
@@ -228,7 +267,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
           });
           (_components$DatePicke = (_components$DatePicke2 = components.DatePicker).onChange) === null || _components$DatePicke === void 0 ? void 0 : _components$DatePicke.call(_components$DatePicke2, value);
         },
-        value: filtersState[column],
+        value: filtersState[column].value,
         datePickerType: "range"
       }), /*#__PURE__*/_react2.default.createElement(_react.DatePickerInput, (0, _extends2.default)({
         placeholder: "mm/dd/yyyy",
@@ -239,7 +278,6 @@ var FilterFlyout = function FilterFlyout(_ref) {
       }, components.DatePickerInput.end)));
     } else if (type === _constants.NUMBER) {
       return /*#__PURE__*/_react2.default.createElement(_react.NumberInput, (0, _extends2.default)({
-        key: key,
         step: 1,
         allowEmpty: true,
         hideSteppers: true
@@ -247,7 +285,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
         onChange: function onChange(event) {
           var _components$NumberInp, _components$NumberInp2;
 
-          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, event.target.value)));
+          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+            value: event.target.value,
+            type: type
+          })));
           applyFilters({
             column: column,
             value: event.target.value,
@@ -255,44 +296,48 @@ var FilterFlyout = function FilterFlyout(_ref) {
           });
           (_components$NumberInp = (_components$NumberInp2 = components.NumberInput).onChange) === null || _components$NumberInp === void 0 ? void 0 : _components$NumberInp.call(_components$NumberInp2, event);
         },
-        value: filtersState[column]
+        value: filtersState[column].value
       }));
     } else if (type === _constants.CHECKBOX) {
-      return /*#__PURE__*/_react2.default.createElement(_react.FormGroup, (0, _extends2.default)({
-        key: key
-      }, components.FormGroup), filtersState[column].map(function (option) {
+      return /*#__PURE__*/_react2.default.createElement(_react.FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
         return /*#__PURE__*/_react2.default.createElement(_react.Checkbox, (0, _extends2.default)({
           key: option.labelText
         }, option, {
           onChange: function onChange(_, _ref4) {
             var _option$onChange;
 
-            var checked = _ref4.checked;
-            var checkboxCopy = filtersState[column];
+            var isSelected = _ref4.checked;
+            var checkboxCopy = filtersState[column].value;
             var foundCheckbox = checkboxCopy.find(function (checkbox) {
               return checkbox.value === option.value;
             });
-            foundCheckbox.selected = checked;
-            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, checkboxCopy)));
+            foundCheckbox.selected = isSelected;
+            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+              value: checkboxCopy,
+              type: type
+            })));
             applyFilters({
               column: column,
-              value: (0, _toConsumableArray2.default)(filtersState[column]),
+              value: (0, _toConsumableArray2.default)(filtersState[column].value),
               type: type
             });
-            (_option$onChange = option.onChange) === null || _option$onChange === void 0 ? void 0 : _option$onChange.call(option, checked);
+            (_option$onChange = option.onChange) === null || _option$onChange === void 0 ? void 0 : _option$onChange.call(option, isSelected);
           },
           checked: option.selected
         }));
       }));
     } else if (type === _constants.RADIO) {
-      return /*#__PURE__*/_react2.default.createElement(_react.FormGroup, (0, _extends2.default)({
-        key: key
-      }, components.FormGroup), /*#__PURE__*/_react2.default.createElement(_react.RadioButtonGroup, (0, _extends2.default)({}, components.RadioButtonGroup, {
-        valueSelected: filtersState[column],
+      var _filtersState$column, _filtersState$column2;
+
+      return /*#__PURE__*/_react2.default.createElement(_react.FormGroup, components.FormGroup, /*#__PURE__*/_react2.default.createElement(_react.RadioButtonGroup, (0, _extends2.default)({}, components.RadioButtonGroup, {
+        valueSelected: ((_filtersState$column = filtersState[column]) === null || _filtersState$column === void 0 ? void 0 : _filtersState$column.value) === '' ? 'Any' : (_filtersState$column2 = filtersState[column]) === null || _filtersState$column2 === void 0 ? void 0 : _filtersState$column2.value,
         onChange: function onChange(selected) {
           var _components$RadioButt, _components$RadioButt2;
 
-          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, selected)));
+          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+            value: selected,
+            type: type
+          })));
           applyFilters({
             column: column,
             value: selected,
@@ -300,6 +345,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
           });
           (_components$RadioButt = (_components$RadioButt2 = components.RadioButtonGroup).onChange) === null || _components$RadioButt === void 0 ? void 0 : _components$RadioButt.call(_components$RadioButt2, selected);
         }
+      }), /*#__PURE__*/_react2.default.createElement(_react.RadioButton, {
+        id: "any",
+        labelText: "Any",
+        value: "Any"
       }), components.RadioButton.map(function (radio) {
         var _ref5, _radio$id;
 
@@ -308,15 +357,19 @@ var FilterFlyout = function FilterFlyout(_ref) {
         }, radio));
       })));
     } else if (type === _constants.DROPDOWN) {
-      return /*#__PURE__*/_react2.default.createElement(_react.Dropdown, (0, _extends2.default)({
-        key: key
-      }, components.Dropdown, {
-        selectedItem: filtersState[column],
+      var _filtersState$column3, _filtersState$column4;
+
+      return /*#__PURE__*/_react2.default.createElement(_react.Dropdown, (0, _extends2.default)({}, components.Dropdown, {
+        selectedItem: ((_filtersState$column3 = filtersState[column]) === null || _filtersState$column3 === void 0 ? void 0 : _filtersState$column3.value) === '' ? 'Any' : (_filtersState$column4 = filtersState[column]) === null || _filtersState$column4 === void 0 ? void 0 : _filtersState$column4.value,
+        items: ['Any'].concat((0, _toConsumableArray2.default)(components.Dropdown.items)),
         onChange: function onChange(_ref6) {
           var _components$Dropdown$, _components$Dropdown;
 
           var selectedItem = _ref6.selectedItem;
-          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, selectedItem)));
+          setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
+            value: selectedItem,
+            type: type
+          })));
           applyFilters({
             column: column,
             value: selectedItem,
@@ -326,9 +379,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
         }
       }));
     }
-  }, [filtersState, applyFilters, setFiltersState]);
+  };
   /** Renders all filters */
 
+
   var renderFilters = function renderFilters() {
     return filters.map(renderFilter);
   };
@@ -340,13 +394,15 @@ var FilterFlyout = function FilterFlyout(_ref) {
         kind: 'primary',
         label: primaryActionLabel,
         onClick: apply,
-        isExpressive: false
+        isExpressive: false,
+        disabled: shouldDisableButtons
       }, {
         key: 3,
         kind: 'secondary',
         label: secondaryActionLabel,
         onClick: cancel,
-        isExpressive: false
+        isExpressive: false,
+        disabled: shouldDisableButtons
       }],
       size: "md",
       buttonSize: "md"
@@ -366,7 +422,8 @@ var FilterFlyout = function FilterFlyout(_ref) {
     },
     iconDescription: flyoutIconDescription,
     onClick: open ? closeFlyout : openFlyout,
-    className: (0, _classnames.default)("".concat(componentClass, "__trigger"), (0, _defineProperty2.default)({}, "".concat(componentClass, "__trigger--open"), open))
+    className: (0, _classnames.default)("".concat(componentClass, "__trigger"), (0, _defineProperty2.default)({}, "".concat(componentClass, "__trigger--open"), open)),
+    disabled: data.length === 0
   }), /*#__PURE__*/_react2.default.createElement("div", {
     ref: filterFlyoutRef,
     className: (0, _classnames.default)(componentClass, (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--open"), open), (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--batch"), showActionSet), (0, _defineProperty2.default)(_cx2, "".concat(componentClass, "--instant"), !showActionSet), _cx2))
@@ -380,6 +437,11 @@ var FilterFlyout = function FilterFlyout(_ref) {
 };
 
 FilterFlyout.propTypes = {
+  /**
+   * All data rows in the table
+   */
+  data: _propTypes.default.array.isRequired,
+
   /**
    * Array of filters to render
    */