@carbon/ibm-products 2.0.0-rc.20 → 2.0.0-rc.22

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

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -39,20 +37,22 @@ var _icons = require("@carbon/react/icons");
 
 var _ActionSet = require("../../../../ActionSet");
 
-var _2 = require(".");
+var _ = require(".");
 
 var _hooks = require("./hooks");
 
-var _utils = require("./utils");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+/**
+ * Copyright IBM Corp. 2022, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
+/* eslint-disable react/jsx-key */
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var componentClass = "".concat(blockClass, "-filter-panel");
 var MotionActionSet = (0, _framerMotion.motion)(_ActionSet.ActionSet);
@@ -90,30 +90,31 @@ var FilterPanel = function FilterPanel(_ref) {
       searchPlaceholder = _ref$searchPlaceholde === void 0 ? 'Find filters' : _ref$searchPlaceholde;
 
   /** State */
-  var _useInitialStateFromF = (0, _hooks.useInitialStateFromFilters)(filterSections, _constants.PANEL),
-      _useInitialStateFromF2 = (0, _slicedToArray2.default)(_useInitialStateFromF, 2),
-      filtersState = _useInitialStateFromF2[0],
-      setFiltersState = _useInitialStateFromF2[1];
-
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      filtersObjectArray = _useState2[0],
-      setFiltersObjectArray = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      showDividerLine = _useState4[0],
-      setShowDividerLine = _useState4[1];
+      showDividerLine = _useState2[0],
+      setShowDividerLine = _useState2[1];
+
+  var _useFilters = (0, _hooks.useFilters)({
+    updateMethod: updateMethod,
+    filters: filterSections,
+    setAllFilters: setAllFilters,
+    variation: _constants.PANEL
+  }),
+      filtersState = _useFilters.filtersState,
+      prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
+      prevFiltersRef = _useFilters.prevFiltersRef,
+      revertToPreviousFilters = _useFilters.revertToPreviousFilters,
+      reset = _useFilters.reset,
+      renderFilter = _useFilters.renderFilter,
+      filtersObjectArray = _useFilters.filtersObjectArray;
   /** Refs */
 
 
   var filterPanelRef = (0, _react.useRef)();
   var filterHeadingRef = (0, _react.useRef)();
   var filterSearchRef = (0, _react.useRef)();
-  var actionSetRef = (0, _react.useRef)(); // When using batch actions we have to store the filters to then apply them later
-
-  var prevFiltersRef = (0, _react.useRef)(JSON.stringify(filtersState));
-  var prevFiltersObjectArrayRef = (0, _react.useRef)(JSON.stringify(filtersObjectArray));
+  var actionSetRef = (0, _react.useRef)();
   /** State from hooks */
 
   var _useShouldDisableButt = (0, _hooks.useShouldDisableButtons)({
@@ -132,21 +133,14 @@ var FilterPanel = function FilterPanel(_ref) {
   }, [updateMethod]);
   /** Context */
 
-  var _useContext = (0, _react.useContext)(_2.FilterContext),
-      leftPanelOpen = _useContext.leftPanelOpen,
-      setLeftPanelOpen = _useContext.setLeftPanelOpen;
+  var _useContext = (0, _react.useContext)(_.FilterContext),
+      panelOpen = _useContext.panelOpen,
+      setPanelOpen = _useContext.setPanelOpen;
   /** Methods */
 
 
   var closePanel = function closePanel() {
-    return setLeftPanelOpen(false);
-  }; // If the user decides to cancel or click outside the flyout, it reverts back to the filters that were
-  // there when they opened the flyout
-
-
-  var revertToPreviousFilters = function revertToPreviousFilters() {
-    setFiltersState(JSON.parse(prevFiltersRef.current));
-    setFiltersObjectArray(JSON.parse(prevFiltersObjectArrayRef.current));
+    return setPanelOpen(false);
   };
 
   var cancel = function cancel() {
@@ -157,19 +151,6 @@ var FilterPanel = function FilterPanel(_ref) {
     }
   };
 
-  var reset = function reset() {
-    // Get the initial values for the filters
-    var initialFiltersState = (0, _utils.getInitialStateFromFilters)(filterSections, _constants.PANEL);
-    var initialFiltersObjectArray = []; // Set the state to the initial values
-
-    setFiltersState(initialFiltersState);
-    setFiltersObjectArray(initialFiltersObjectArray);
-    setAllFilters([]); // Update their respective refs so everything is in sync
-
-    prevFiltersRef.current = JSON.stringify(initialFiltersState);
-    prevFiltersObjectArrayRef.current = JSON.stringify(initialFiltersObjectArray);
-  };
-
   var apply = function apply() {
     setAllFilters(filtersObjectArray); // From the user
 
@@ -181,224 +162,6 @@ var FilterPanel = function FilterPanel(_ref) {
     prevFiltersObjectArrayRef.current = JSON.stringify(filtersObjectArray);
   };
 
-  var applyFilters = function applyFilters(_ref2) {
-    var column = _ref2.column,
-        value = _ref2.value,
-        type = _ref2.type;
-
-    // If no end date is selected return because we need the end date to do computations
-    if (type === _constants.DATE && value.length > 0 && !value[1]) {
-      return;
-    }
-
-    var filtersObjectArrayCopy = (0, _toConsumableArray2.default)(filtersObjectArray); // // check if the filter already exists in the array
-
-    var filter = filtersObjectArrayCopy.find(function (item) {
-      return item.id === column;
-    }); // // if filter exists in array then update the filter's new value
-
-    if (filter) {
-      filter.value = value;
-    } else {
-      filtersObjectArrayCopy.push({
-        id: column,
-        value: value,
-        type: type
-      });
-    } // ATTENTION: this is where you would reset or remove individual filters from the filters array
-
-
-    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.DATE) {
-      if (value.length === 0) {
-        /**
-        Checks to see if the date value is an empty array, if it is that means the user wants
-        to reset the date filter
-        */
-        var _index = filtersObjectArrayCopy.findIndex(function (filter) {
-          return filter.id === column;
-        }); // Remove it from the filters array since there is nothing to filter
-
-
-        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 _index2 = filtersObjectArrayCopy.findIndex(function (filter) {
-          return filter.id === column;
-        }); // Remove it from the filters array
-
-
-        filtersObjectArrayCopy.splice(_index2, 1);
-      }
-    }
-
-    setFiltersObjectArray(filtersObjectArrayCopy); // // Automatically apply the filters if the updateMethod is instant
-
-    if (updateMethod === _constants.INSTANT) {
-      setAllFilters(filtersObjectArrayCopy);
-    }
-  };
-  /** Render the individual filter component */
-
-
-  var renderFilter = function renderFilter(_ref3) {
-    var _filtersState$column, _filtersState$column2, _filtersState$column3, _filtersState$column4;
-
-    var type = _ref3.type,
-        column = _ref3.column,
-        components = _ref3.props;
-
-    switch (type) {
-      case _constants.DATE:
-        return /*#__PURE__*/_react.default.createElement(_react2.Layer, null, /*#__PURE__*/_react.default.createElement(_react2.DatePicker, (0, _extends2.default)({}, components.DatePicker, {
-          onChange: function onChange(value) {
-            var _components$DatePicke, _components$DatePicke2;
-
-            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
-              value: value,
-              type: type
-            })));
-            applyFilters({
-              column: column,
-              value: value,
-              type: type
-            });
-            (_components$DatePicke = (_components$DatePicke2 = components.DatePicker).onChange) === null || _components$DatePicke === void 0 ? void 0 : _components$DatePicke.call(_components$DatePicke2, value);
-          },
-          value: filtersState[column].value,
-          datePickerType: "range"
-        }), /*#__PURE__*/_react.default.createElement(_react2.DatePickerInput, (0, _extends2.default)({
-          placeholder: "mm/dd/yyyy",
-          labelText: "Start date"
-        }, components.DatePickerInput.start)), /*#__PURE__*/_react.default.createElement(_react2.DatePickerInput, (0, _extends2.default)({
-          placeholder: "mm/dd/yyyy",
-          labelText: "End date"
-        }, components.DatePickerInput.end))));
-
-      case _constants.NUMBER:
-        return /*#__PURE__*/_react.default.createElement(_react2.Layer, null, /*#__PURE__*/_react.default.createElement(_react2.NumberInput, (0, _extends2.default)({
-          step: 1,
-          allowEmpty: true,
-          hideSteppers: true
-        }, components.NumberInput, {
-          onChange: function onChange(event) {
-            var _components$NumberInp, _components$NumberInp2;
-
-            setFiltersState(_objectSpread(_objectSpread({}, filtersState), {}, (0, _defineProperty2.default)({}, column, {
-              value: event.target.value,
-              type: type
-            })));
-            applyFilters({
-              column: column,
-              value: event.target.value,
-              type: type
-            });
-            (_components$NumberInp = (_components$NumberInp2 = components.NumberInput).onChange) === null || _components$NumberInp === void 0 ? void 0 : _components$NumberInp.call(_components$NumberInp2, event);
-          },
-          value: filtersState[column].value
-        })));
-
-      case _constants.CHECKBOX:
-        return /*#__PURE__*/_react.default.createElement(_react2.FormGroup, components.FormGroup, filtersState[column].value.map(function (option) {
-          return /*#__PURE__*/_react.default.createElement(_react2.Checkbox, (0, _extends2.default)({
-            key: option.labelText
-          }, option, {
-            onChange: function onChange(_, _ref4) {
-              var _option$onChange;
-
-              var isSelected = _ref4.checked;
-              var checkboxCopy = filtersState[column].value;
-              var foundCheckbox = checkboxCopy.find(function (checkbox) {
-                return checkbox.value === option.value;
-              });
-              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),
-                type: type
-              });
-              (_option$onChange = option.onChange) === null || _option$onChange === void 0 ? void 0 : _option$onChange.call(option, isSelected);
-            },
-            checked: option.selected
-          }));
-        }));
-
-      case _constants.RADIO:
-        return /*#__PURE__*/_react.default.createElement(_react2.FormGroup, components.FormGroup, /*#__PURE__*/_react.default.createElement(_react2.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, {
-              value: selected,
-              type: type
-            })));
-            applyFilters({
-              column: column,
-              value: selected,
-              type: type
-            });
-            (_components$RadioButt = (_components$RadioButt2 = components.RadioButtonGroup).onChange) === null || _components$RadioButt === void 0 ? void 0 : _components$RadioButt.call(_components$RadioButt2, selected);
-          }
-        }), /*#__PURE__*/_react.default.createElement(_react2.RadioButton, {
-          id: "any",
-          labelText: "Any",
-          value: "Any"
-        }), components.RadioButton.map(function (radio) {
-          var _ref5, _radio$id;
-
-          return /*#__PURE__*/_react.default.createElement(_react2.RadioButton, (0, _extends2.default)({
-            key: (_ref5 = (_radio$id = radio.id) !== null && _radio$id !== void 0 ? _radio$id : radio.labelText) !== null && _ref5 !== void 0 ? _ref5 : radio.value
-          }, radio));
-        })));
-
-      case _constants.DROPDOWN:
-        return /*#__PURE__*/_react.default.createElement(_react2.Layer, null, /*#__PURE__*/_react.default.createElement(_react2.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, {
-              value: selectedItem,
-              type: type
-            })));
-            applyFilters({
-              column: column,
-              value: selectedItem,
-              type: type
-            });
-            (_components$Dropdown$ = (_components$Dropdown = components.Dropdown).onChange) === null || _components$Dropdown$ === void 0 ? void 0 : _components$Dropdown$.call(_components$Dropdown, selectedItem);
-          }
-        })));
-    }
-  };
-
   var renderActionSet = function renderActionSet() {
     return showActionSet && /*#__PURE__*/_react.default.createElement(MotionActionSet, {
       actions: [{
@@ -431,12 +194,12 @@ var FilterPanel = function FilterPanel(_ref) {
 
 
   (0, _react.useEffect)(function liftOpenStateToParent() {
-    if (leftPanelOpen) {
-      onPanelOpen(leftPanelOpen);
+    if (panelOpen) {
+      onPanelOpen(panelOpen);
     } else {
-      onPanelClose(leftPanelOpen);
+      onPanelClose(panelOpen);
     }
-  }, [leftPanelOpen, onPanelClose, onPanelOpen]);
+  }, [panelOpen, onPanelClose, onPanelOpen]);
   (0, _react.useEffect)(function setPanelMinimumHeight() {
     var _filterPanelRef$curre;
 
@@ -456,9 +219,9 @@ var FilterPanel = function FilterPanel(_ref) {
 
   return /*#__PURE__*/_react.default.createElement(_framerMotion.motion.div, {
     ref: filterPanelRef,
-    className: (0, _classnames.default)(componentClass, "".concat(componentClass, "__container"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(componentClass, "--open"), leftPanelOpen), (0, _defineProperty2.default)(_cx, "".concat(componentClass, "--batch"), showActionSet), (0, _defineProperty2.default)(_cx, "".concat(componentClass, "--instant"), !showActionSet), _cx)),
+    className: (0, _classnames.default)(componentClass, "".concat(componentClass, "__container"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(componentClass, "--open"), panelOpen), (0, _defineProperty2.default)(_cx, "".concat(componentClass, "--batch"), showActionSet), (0, _defineProperty2.default)(_cx, "".concat(componentClass, "--instant"), !showActionSet), _cx)),
     initial: false,
-    animate: leftPanelOpen ? 'visible' : 'hidden',
+    animate: panelOpen ? 'visible' : 'hidden',
     variants: _variants.panelVariants
   }, /*#__PURE__*/_react.default.createElement(_framerMotion.motion.div, {
     variants: _variants.innerContainerVariants
@@ -492,25 +255,25 @@ var FilterPanel = function FilterPanel(_ref) {
       height: getScrollableContainerHeight()
     },
     onScroll: onInnerContainerScroll
-  }, filterSections.map(function (_ref7) {
-    var _ref7$categoryTitle = _ref7.categoryTitle,
-        categoryTitle = _ref7$categoryTitle === void 0 ? null : _ref7$categoryTitle,
-        _ref7$filters = _ref7.filters,
-        filters = _ref7$filters === void 0 ? [] : _ref7$filters,
-        hasAccordion = _ref7.hasAccordion;
+  }, filterSections.map(function (_ref2) {
+    var _ref2$categoryTitle = _ref2.categoryTitle,
+        categoryTitle = _ref2$categoryTitle === void 0 ? null : _ref2$categoryTitle,
+        _ref2$filters = _ref2.filters,
+        filters = _ref2$filters === void 0 ? [] : _ref2$filters,
+        hasAccordion = _ref2.hasAccordion;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(componentClass, "__category")
     }, categoryTitle && /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(componentClass, "__category-title")
-    }, categoryTitle), hasAccordion ? /*#__PURE__*/_react.default.createElement(_react2.Accordion, null, filters.map(function (_ref8) {
-      var filterLabel = _ref8.filterLabel,
-          filter = _ref8.filter;
+    }, categoryTitle), hasAccordion ? /*#__PURE__*/_react.default.createElement(_react2.Accordion, null, filters.map(function (_ref3) {
+      var filterLabel = _ref3.filterLabel,
+          filter = _ref3.filter;
       return /*#__PURE__*/_react.default.createElement(_react2.AccordionItem, {
         title: filterLabel,
         key: filterLabel
       }, renderFilter(filter));
-    })) : filters.map(function (_ref9) {
-      var filter = _ref9.filter;
+    })) : filters.map(function (_ref4) {
+      var filter = _ref4.filter;
       return renderFilter(filter);
     }));
   })), renderActionSet()));

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

@@ -91,14 +91,14 @@ var FilterProvider = function FilterProvider(_ref2) {
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      leftPanelOpen = _useState2[0],
-      setLeftPanelOpen = _useState2[1];
+      panelOpen = _useState2[0],
+      setPanelOpen = _useState2[1];
 
   var value = {
     filterTags: filterTags,
     EventEmitter: EventEmitter,
-    leftPanelOpen: leftPanelOpen,
-    setLeftPanelOpen: setLeftPanelOpen
+    panelOpen: panelOpen,
+    setPanelOpen: setPanelOpen
   };
   return /*#__PURE__*/_react.default.createElement(FilterContext.Provider, {
     value: value

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/index.js

@@ -5,6 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "useFilters", {
+  enumerable: true,
+  get: function get() {
+    return _useFilters.default;
+  }
+});
 Object.defineProperty(exports, "useInitialStateFromFilters", {
   enumerable: true,
   get: function get() {
@@ -28,4 +34,6 @@ var _useInitialStateFromFilters = _interopRequireDefault(require("./useInitialSt
 
 var _useSubscribeToEventEmitter = _interopRequireDefault(require("./useSubscribeToEventEmitter"));
 
+var _useFilters = _interopRequireDefault(require("./useFilters"));
+
 var _useShouldDisableButtons = _interopRequireDefault(require("./useShouldDisableButtons"));