@carbon/ibm-products 1.38.0 → 1.40.0

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FilterProvider = exports.FilterContext = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _constants = require("./constants");
@@ -22,6 +21,24 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var FilterContext = /*#__PURE__*/(0, _react.createContext)();
 exports.FilterContext = FilterContext;
+var EventEmitter = {
+  events: {},
+  dispatch: function dispatch(event, data) {
+    if (!this.events[event]) {
+      return;
+    }
+    this.events[event].forEach(function (callback) {
+      return callback(data);
+    });
+  },
+  subscribe: function subscribe(event, callback) {
+    if (!this.events[event]) {
+      this.events[event] = [];
+    } else {
+      this.events[event].push(callback);
+    }
+  }
+};
 var prepareFiltersForTags = function prepareFiltersForTags(filters) {
   var tags = [];
   filters.forEach(function (_ref) {
@@ -29,15 +46,26 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters) {
       type = _ref.type,
       value = _ref.value;
     if (type === _constants.DROPDOWN || type === _constants.RADIO || type === _constants.NUMBER) {
-      tags.push((0, _defineProperty2.default)({}, id, value));
+      tags.push({
+        key: id,
+        value: value
+      });
     } else if (type === _constants.DATE) {
       var _value = (0, _slicedToArray2.default)(value, 2),
         startDate = _value[0],
         endDate = _value[1];
-      tags.push((0, _defineProperty2.default)({}, id, "".concat(startDate.toLocaleString(), " - ").concat(endDate.toLocaleString())));
+      tags.push({
+        key: id,
+        value: "".concat(startDate.toLocaleDateString(), " - ").concat(endDate.toLocaleDateString())
+      });
     } else if (type === _constants.CHECKBOX) {
       value.forEach(function (checkbox) {
-        tags.push((0, _defineProperty2.default)({}, id, checkbox.value));
+        if (checkbox.selected) {
+          tags.push({
+            key: id,
+            value: checkbox.value
+          });
+        }
       });
     }
   });
@@ -46,13 +74,10 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters) {
 var FilterProvider = function FilterProvider(_ref2) {
   var children = _ref2.children,
     filters = _ref2.filters;
-  console.log(filters);
   var filterTags = prepareFiltersForTags(filters);
-  console.log({
-    filterTags: filterTags
-  });
   var value = {
-    filterTags: filterTags
+    filterTags: filterTags,
+    EventEmitter: EventEmitter
   };
   return /*#__PURE__*/_react.default.createElement(FilterContext.Provider, {
     value: value
@@ -62,40 +87,4 @@ exports.FilterProvider = FilterProvider;
 FilterProvider.propTypes = {
   children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]).isRequired,
   filters: _propTypes.default.arrayOf(_propTypes.default.object).isRequired
-};
-[{
-  id: 'joined',
-  value: ['2022-10-02T04:00:00.000Z', '2022-10-26T04:00:00.000Z'],
-  type: 'date'
-}, {
-  id: 'visits',
-  value: '1',
-  type: 'number'
-}, {
-  id: 'passwordStrength',
-  value: [{
-    id: 'normal',
-    labelText: 'Normal',
-    value: 'normal',
-    selected: true
-  }, {
-    id: 'minor-warning',
-    labelText: 'Minor warning',
-    value: 'minor-warning',
-    selected: true
-  }, {
-    id: 'critical',
-    labelText: 'Critical',
-    value: 'critical',
-    selected: false
-  }],
-  type: 'checkbox'
-}, {
-  id: 'role',
-  value: 'developer',
-  type: 'radio'
-}, {
-  id: 'status',
-  value: 'complicated',
-  type: 'dropdown'
-}];
+};

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

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RADIO = exports.NUMBER = exports.INSTANT = exports.DROPDOWN = exports.DATE = exports.CLEAR_FILTERS = exports.CHECKBOX = exports.BATCH = void 0;
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/** Constants for update methods can either be batch or instant */
+var BATCH = 'batch';
+exports.BATCH = BATCH;
+var INSTANT = 'instant';
+
+/** Constants for filter type */
+exports.INSTANT = INSTANT;
+var DATE = 'date';
+exports.DATE = DATE;
+var NUMBER = 'number';
+exports.NUMBER = NUMBER;
+var CHECKBOX = 'checkbox';
+exports.CHECKBOX = CHECKBOX;
+var RADIO = 'radio';
+exports.RADIO = RADIO;
+var DROPDOWN = 'dropdown';
+
+/** Constants for event emitters */
+exports.DROPDOWN = DROPDOWN;
+var CLEAR_FILTERS = 'clearFilters';
+exports.CLEAR_FILTERS = CLEAR_FILTERS;

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

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _utils = require("../utils");
+/*
+ * Licensed Materials - Property of IBM
+ * 5724-Q36
+ * (c) Copyright IBM Corp. 2022
+ * US Government Users Restricted Rights - Use, duplication or disclosure
+ * restricted by GSA ADP Schedule Contract with IBM Corp.
+ */
+
+var useInitialStateFromFilters = function useInitialStateFromFilters(filters) {
+  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters)),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  return [state, setState];
+};
+var _default = useInitialStateFromFilters;
+exports.default = _default;

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

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "FilterFlyout", {
+  enumerable: true,
+  get: function get() {
+    return _FilterFlyout.default;
+  }
+});
+var _FilterFlyout = _interopRequireDefault(require("./FilterFlyout"));

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

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInitialStateFromFilters = void 0;
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// This functions takes the filters passed in and makes an object to track it's state
+var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
+  var initialFilterState = {};
+  filters.forEach(function (_ref) {
+    var type = _ref.type,
+      column = _ref.column,
+      props = _ref.props;
+    if (type === 'checkbox') {
+      initialFilterState[column] = props.Checkbox.map(function (_ref2) {
+        var id = _ref2.id,
+          labelText = _ref2.labelText,
+          value = _ref2.value;
+        return {
+          id: id,
+          labelText: labelText,
+          value: value,
+          selected: false
+        };
+      });
+    } else if (type === 'date') {
+      initialFilterState[column] = [undefined, undefined];
+    } else if (type === 'number') {
+      initialFilterState[column] = '';
+    } else if (type === 'radio') {
+      initialFilterState[column] = '';
+    } else if (type === 'dropdown') {
+      initialFilterState[column] = '';
+    }
+  });
+  return initialFilterState;
+};
+exports.getInitialStateFromFilters = getInitialStateFromFilters;

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -1,12 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InlineEditCell = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -20,12 +21,12 @@ var _InlineEditContext = require("../InlineEditContext");
 var _hooks = require("../../../../../../global/js/hooks");
 var _propsHelper = require("../../../../../../global/js/utils/props-helper");
 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 _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var InlineEditCell = function InlineEditCell(_ref) {
-  var _config$validator, _cx3;
+  var _config$validator, _cx3, _value$text;
   var cell = _ref.cell,
     config = _ref.config,
     instance = _ref.instance,
@@ -251,6 +252,11 @@ var InlineEditCell = function InlineEditCell(_ref) {
       className: (0, _classnames.default)("".concat(blockClass, "__inline-edit--select-item"))
     }, item === null || item === void 0 ? void 0 : item.text)) : item === null || item === void 0 ? void 0 : item.text;
   };
+  var handleTransformedItem = function handleTransformedItem(items) {
+    return items !== null && items !== void 0 && items.length && (0, _typeof2.default)(items[0]) === 'object' ? function (item) {
+      return renderDropdownItem(item);
+    } : null;
+  };
   var renderSelectCell = function renderSelectCell() {
     var _ref5 = config || {},
       inputProps = _ref5.inputProps;
@@ -266,12 +272,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
       className: (0, _classnames.default)("".concat(blockClass, "__inline-edit--select"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__inline-edit--select-").concat(rowSize), rowSize)),
       items: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.items) || [],
       initialSelectedItem: cell.value,
-      itemToElement: function itemToElement(item) {
-        return renderDropdownItem(item);
-      },
-      renderSelectedItem: function renderSelectedItem(item) {
-        return renderDropdownItem(item);
-      },
+      itemToElement: handleTransformedItem(inputProps === null || inputProps === void 0 ? void 0 : inputProps.items),
+      renderSelectedItem: handleTransformedItem(inputProps === null || inputProps === void 0 ? void 0 : inputProps.items),
       onChange: function onChange(item) {
         var _inputProps$onChange;
         var newCellId = getNewCellId('Enter');
@@ -435,7 +437,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
     }, !inEditMode && /*#__PURE__*/_react.default.createElement(_InlineEditButton.InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
-      label: type === 'selection' ? value.text : type === 'date' ? buildDate(value) : value,
+      label: type === 'selection' ? (_value$text = value === null || value === void 0 ? void 0 : value.text) !== null && _value$text !== void 0 ? _value$text : value : type === 'date' ? buildDate(value) : value,
       labelIcon: (value === null || value === void 0 ? void 0 : value.icon) || null,
       placeholder: placeholder,
       tabIndex: tabIndex,

package/lib/components/Datagrid/index.js

@@ -58,6 +58,12 @@ Object.defineProperty(exports, "useExpandedRow", {
     return _useExpandedRow.default;
   }
 });
+Object.defineProperty(exports, "useFiltering", {
+  enumerable: true,
+  get: function get() {
+    return _useFiltering.default;
+  }
+});
 Object.defineProperty(exports, "useInfiniteScroll", {
   enumerable: true,
   get: function get() {
@@ -129,4 +135,5 @@ var _useCustomizeColumns = _interopRequireDefault(require("./useCustomizeColumns
 var _useSelectAllToggle = _interopRequireDefault(require("./useSelectAllToggle"));
 var _useColumnCenterAlign = _interopRequireDefault(require("./useColumnCenterAlign"));
 var _useColumnOrder = _interopRequireDefault(require("./useColumnOrder"));
-var _useInlineEdit = _interopRequireDefault(require("./useInlineEdit"));
+var _useInlineEdit = _interopRequireDefault(require("./useInlineEdit"));
+var _useFiltering = _interopRequireDefault(require("./useFiltering"));

package/lib/components/Datagrid/useFiltering.js

@@ -0,0 +1,83 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+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; }
+var useFiltering = function useFiltering(hooks) {
+  var filterTypes = (0, _react.useMemo)(function () {
+    return {
+      date: function date(rows, id, _ref) {
+        var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+          startDate = _ref2[0],
+          endDate = _ref2[1];
+        return rows.filter(function (row) {
+          var rowValue = row.values[id];
+          if (rowValue.getTime() <= endDate.getTime() && rowValue.getTime() >= startDate.getTime()) {
+            // In date range
+            return true;
+          } else {
+            // Not in date range
+            return false;
+          }
+        });
+      },
+      number: function number(rows, id, value) {
+        if (value === '') {
+          return rows;
+        }
+        var parsedValue = parseInt(value);
+        return rows.filter(function (row) {
+          var rowValue = row.values[id];
+          return rowValue === parsedValue;
+        });
+      },
+      checkbox: function checkbox(rows, id, value) {
+        // gets all the items that are selected and returns their value
+        var selectedItems = value.filter(function (item) {
+          return item.selected;
+        }).map(function (item) {
+          return item.value;
+        });
+
+        // if the user removed all checkboxes then display all rows
+        if (selectedItems.length === 0) {
+          return rows;
+        }
+        return rows.filter(function (row) {
+          var rowValue = row.values[id];
+          return selectedItems.includes(rowValue);
+        });
+      }
+    };
+  }, []);
+  hooks.useInstance.push(function (instance) {
+    var filterProps = instance.filterProps,
+      setAllFilters = instance.setAllFilters,
+      setFilter = instance.setFilter,
+      headers = instance.headers;
+    var defaultProps = {
+      variation: 'flyout'
+    };
+    var getFilterFlyoutProps = function getFilterFlyoutProps() {
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultProps), filterProps), {}, {
+        setAllFilters: setAllFilters,
+        setFilter: setFilter,
+        headers: headers
+      });
+    };
+    Object.assign(instance, {
+      filterProps: _objectSpread(_objectSpread({}, defaultProps), instance.filterProps),
+      filterTypes: filterTypes,
+      getFilterFlyoutProps: getFilterFlyoutProps
+    });
+  });
+};
+var _default = useFiltering;
+exports.default = _default;

package/lib/components/Datagrid/useNestedRows.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _settings = require("../../settings");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _useNestedRowExpander = _interopRequireDefault(require("./useNestedRowExpander"));
 /*
  * Licensed Materials - Property of IBM
@@ -20,9 +22,10 @@ var useNestedRows = function useNestedRows(hooks) {
   (0, _useNestedRowExpander.default)(hooks);
   var marginLeft = 24;
   var getRowProps = function getRowProps(props, _ref) {
+    var _cx;
     var row = _ref.row;
     return [props, {
-      className: row.depth > 0 ? "".concat(blockClass, "__carbon-nested-row") : ''
+      className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), _cx))
     }];
   };
   var getRowStyles = function getRowStyles(props, _ref2) {
@@ -30,7 +33,7 @@ var useNestedRows = function useNestedRows(hooks) {
     return [props, {
       style: {
         marginLeft: "".concat(row.depth > 0 ? marginLeft : 0, "px"),
-        paddingLeft: "".concat(row.depth > 1 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft : 0, "px"),
+        paddingLeft: "".concat(row.depth === 2 ? marginLeft * (row.depth - 1) + marginLeft - 8 : row.depth > 2 ? marginLeft * (row.depth - 1) + marginLeft : row.depth === 1 ? marginLeft - 16 : 0, "px"),
         maxWidth: "calc(100% - ".concat(marginLeft * row.depth, "px)")
       }
     }];
@@ -48,9 +51,15 @@ var useNestedRows = function useNestedRows(hooks) {
       }
     }];
   };
+  var useInstance = function useInstance(instance) {
+    Object.assign(instance, {
+      withNestedRows: true
+    });
+  };
   hooks.getRowProps.push(getRowProps);
   hooks.getRowProps.push(getRowStyles);
   hooks.getCellProps.push(getCellProps);
+  hooks.useInstance.push(useInstance);
 };
 var _default = useNestedRows;
 exports.default = _default;