@pingux/astro 1.16.1-alpha.0 → 1.17.0-alpha.10

package/lib/components/CollapsiblePanel/CollapsiblePanel.stories.js

@@ -1,14 +1,32 @@
+import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
+import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
+import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
+import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
+import _Object$getOwnPropertyDescriptor from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor";
+import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
-import React, { useRef } from 'react';
+import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
+import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
+import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
+import _sortInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/sort";
+import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
+
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+import React, { useRef, useState, useMemo } from 'react';
 import AccountGroupIcon from 'mdi-react/AccountGroupIcon';
-import Clear from 'mdi-react/CloseIcon';
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon';
-import FilterIcon from 'mdi-react/FilterIcon';
+import CheckIcon from 'mdi-react/CheckIcon';
+import Clear from 'mdi-react/CloseIcon';
 import SearchIcon from 'mdi-react/SearchIcon';
 import AccountIcon from 'mdi-react/AccountIcon';
 import CollapsiblePanel from './CollapsiblePanel';
 import { useOverlayPanelState } from '../../hooks';
-import { Breadcrumbs, Box, Button, Chip, ListView, Item, Icon, IconButton, CollapsiblePanelItem, OverlayPanel, OverlayProvider, SearchField, Text } from '../../index';
+import { Breadcrumbs, Box, Button, CheckboxField, Chip, ListView, Item, Icon, IconButton, CollapsiblePanelItem, OverlayPanel, OverlayProvider, SearchField, Text } from '../../index';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export default {
   title: 'CollapsiblePanel',
@@ -34,13 +52,14 @@ export default {
     }
   }
 };
-var items = [{
+var data = [{
   id: '1',
   icon: 'Group',
   key: 'Avengers',
   name: 'Avengers',
   subtitle: 'Default',
-  chipValue: '25'
+  chipValue: '25',
+  isDefaultSelected: true
 }, {
   id: '2',
   icon: 'Group',
@@ -61,7 +80,8 @@ var items = [{
   key: 'Digital Investors',
   name: 'Digital Investors',
   subtitle: 'N America',
-  chipValue: '12'
+  chipValue: '12',
+  isDefaultSelected: true
 }, {
   id: '5',
   icon: 'Group',
@@ -98,33 +118,45 @@ var items = [{
   subtitle: '',
   chipValue: '29'
 }];
-var mockData = [{
-  id: '10',
-  key: 'Avengers',
-  name: 'Avengers'
-}, {
-  id: '11',
-  key: 'Digital Investors',
-  name: 'Digital Investors'
-}, {
-  id: '12',
-  key: 'A very long title as well',
-  name: 'A very long title as well'
-}];
-
-var changeSelection = function changeSelection(selected) {
-  console.log(selected);
-};
-
 export var Default = function Default(args) {
   return ___EmotionJSX(CollapsiblePanel, args);
 };
 export var CollapsiblePanelWithBadge = function CollapsiblePanelWithBadge(args) {
+  var _useState = useState(data),
+      _useState2 = _slicedToArray(_useState, 2),
+      items = _useState2[0],
+      setItems = _useState2[1];
+
   var _useOverlayPanelState = useOverlayPanelState(),
       state = _useOverlayPanelState.state,
       onClose = _useOverlayPanelState.onClose;
 
   var triggerRef = useRef();
+  var selectedItems = useMemo(function () {
+    var _context;
+
+    return _sortInstanceProperty(_context = _filterInstanceProperty(items).call(items, function (item) {
+      return item.isDefaultSelected || item.isSelected;
+    }) // sort elements to display "default selected" at first place
+    ).call(_context, function (a, b) {
+      return Number(!!b.isDefaultSelected) - Number(!!a.isDefaultSelected);
+    });
+  }, [items]);
+
+  var changeSelection = function changeSelection(key) {
+    setItems(function (prevItems) {
+      return _mapInstanceProperty(prevItems).call(prevItems, function (el) {
+        if (el.key === key) {
+          return _objectSpread(_objectSpread({}, el), {}, {
+            isSelected: !el.isSelected
+          });
+        }
+
+        return el;
+      });
+    });
+  };
+
   return ___EmotionJSX(OverlayProvider, null, ___EmotionJSX(Button, {
     ref: triggerRef,
     onPress: state.open
@@ -181,7 +213,10 @@ export var CollapsiblePanelWithBadge = function CollapsiblePanelWithBadge(args)
     pt: "25px"
   }, ___EmotionJSX(Box, {
     isRow: true,
-    justifyContent: "space-between"
+    justifyContent: "space-between",
+    sx: {
+      marginTop: '5px'
+    }
   }, ___EmotionJSX(Box, {
     width: "100%"
   }, ___EmotionJSX(SearchField, {
@@ -190,11 +225,13 @@ export var CollapsiblePanelWithBadge = function CollapsiblePanelWithBadge(args)
     placeholder: "Search",
     width: "100%",
     mt: "0px",
-    mr: "sm"
+    mr: "sm",
+    mb: "xs"
   }), ___EmotionJSX(ListView, {
     items: items,
     style: {
-      width: '108%'
+      width: '100%',
+      outline: 'none'
     }
   }, function (item) {
     return ___EmotionJSX(Item, {
@@ -202,8 +239,12 @@ export var CollapsiblePanelWithBadge = function CollapsiblePanelWithBadge(args)
       textValue: item.name,
       "data-id": item.key,
       listItemProps: {
+        isRow: true,
         sx: {
           bg: 'white',
+          width: '100%',
+          justifyContent: 'space-between',
+          alignItems: 'center',
           '&.is-hovered': {
             bg: 'accent.99'
           }
@@ -233,9 +274,46 @@ export var CollapsiblePanelWithBadge = function CollapsiblePanelWithBadge(args)
       }
     })), ___EmotionJSX(Text, {
       variant: "listSubtitle"
-    }, item.subtitle))));
+    }, item.subtitle))), item.isDefaultSelected ? ___EmotionJSX(Box, {
+      isRow: true,
+      sx: {
+        border: '1px solid',
+        borderColor: 'neutral.80',
+        borderRadius: 5,
+        minHeight: 22,
+        justifyContent: 'center',
+        alignItems: 'center',
+        p: 'xs',
+        maxWidth: '50%'
+      }
+    }, ___EmotionJSX(Icon, {
+      icon: CheckIcon,
+      color: "neutral.20",
+      size: 13,
+      sx: {
+        flexShrink: 0
+      }
+    }), ___EmotionJSX(Text, {
+      sx: {
+        fontSize: 'sm',
+        pl: 'xs',
+        maxHeight: 32,
+        overflow: 'hidden'
+      }
+    }, "Added by Filter")) : ___EmotionJSX(CheckboxField, {
+      controlProps: {
+        color: 'neutral.10',
+        'aria-label': 'Select'
+      },
+      onChange: function onChange() {
+        return changeSelection(item.key);
+      },
+      isSelected: _someInstanceProperty(selectedItems).call(selectedItems, function (el) {
+        return el.key === item.key;
+      })
+    }));
   })), ___EmotionJSX(CollapsiblePanel, _extends({
-    items: mockData,
+    items: selectedItems,
     onSelectionChange: changeSelection,
     selectedFilterCount: "1000+"
   }, args), function (item) {
@@ -245,7 +323,11 @@ export var CollapsiblePanelWithBadge = function CollapsiblePanelWithBadge(args)
       "data-id": item.key
     }, ___EmotionJSX(CollapsiblePanelItem, {
       text: item.name,
-      icon: FilterIcon
+      icon: item.isDefaultSelected ? CheckIcon : Clear,
+      onPress: function onPress() {
+        return changeSelection(item.key);
+      },
+      isDefaultSelected: item.isDefaultSelected
     }));
   })))));
 };

package/lib/components/CollapsiblePanelContainer/CollapsiblePanelContainer.js

@@ -1,20 +1,6 @@
-import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
-import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
-import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
-import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
-import _Object$getOwnPropertyDescriptor from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor";
-import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
-import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
-import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
 var _excluded = ["selectedFilterCount", "className", "children", "closeAriaLabel", "isDefaultOpen", "isOpen", "onOpenChange", "openAriaLabel"];
-
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon';
@@ -90,7 +76,7 @@ var CollapsiblePanelContainer = /*#__PURE__*/forwardRef(function (props, ref) {
     "data-testid": "collapsible-panel-badge",
     margin: "auto",
     selectedFilterCount: selectedFilterCount
-  })), state.isOpen && _objectSpread({}, children));
+  })), children);
 });
 CollapsiblePanelContainer.propTypes = {
   /** Amount of selected items indicator. */

package/lib/components/CollapsiblePanelContainer/CollapsiblePanelContainer.test.js

@@ -55,13 +55,13 @@ test('updates aria label when button is clicked', function () {
     state: state
   });
   var button = screen.getByTestId(collapsiblePanelButtonId);
+  var container = screen.getByTestId(testId);
   userEvent.click(button);
-  var collapsiblePanel = screen.queryByTestId(collapsiblePanelId);
   expect(button).toHaveAttribute('aria-label', 'Close filter menu?');
-  expect(collapsiblePanel).toBeInTheDocument();
+  expect(container).toHaveClass('is-open');
   userEvent.click(button);
   expect(button).toHaveAttribute('aria-label', 'Open filter menu?');
-  expect(collapsiblePanel).not.toBeInTheDocument();
+  expect(container).not.toHaveClass('is-open');
 });
 test('shows children when isOpen is true', function () {
   getComponent({
@@ -73,9 +73,9 @@ test('shows children when isOpen is true', function () {
 test('should hide children when pressing the escape key', function () {
   getComponent();
   var button = screen.getByTestId(collapsiblePanelButtonId);
+  var container = screen.getByTestId(testId);
   userEvent.click(button);
-  var collapsiblePanel = screen.queryByTestId(collapsiblePanelId);
-  expect(collapsiblePanel).toBeInTheDocument();
+  expect(container).toHaveClass('is-open');
   userEvent.type(button, '{esc}');
-  expect(collapsiblePanel).not.toBeInTheDocument();
+  expect(container).not.toHaveClass('is-open');
 });

package/lib/components/CollapsiblePanelItem/CollapsiblePanelItem.js

@@ -23,8 +23,8 @@ var CollapsiblePanelItem = /*#__PURE__*/forwardRef(function (props, ref) {
     variant: "collapsiblePanellItem"
   }, text), iconElement && (isDefaultSelected ? iconElement : ___EmotionJSX(IconButton, {
     sx: {
-      width: 13,
-      height: 13,
+      width: 20,
+      height: 20,
       alignSelf: 'auto',
       '& path': {
         fill: 'inherit'

package/lib/components/ComboBoxField/ComboBoxField.js

@@ -11,13 +11,14 @@ import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 var _excluded = ["shouldFocusOnHover", "shouldSelectOnPressUp"];
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import React, { useCallback, useRef, useState, forwardRef, useImperativeHandle } from 'react';
+import React, { useCallback, useRef, useState, forwardRef, useImperativeHandle, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { DismissButton, useOverlayPosition } from '@react-aria/overlays';
 import { useComboBox } from '@react-aria/combobox';
@@ -57,13 +58,14 @@ var ComboBoxField = /*#__PURE__*/forwardRef(function (props, ref) {
       onFocusChange = props.onFocusChange,
       onKeyDown = props.onKeyDown,
       onKeyUp = props.onKeyUp,
+      hasAddOption = props.hasAddOption,
       hasCustomValue = props.hasCustomValue,
       hasNoEmptySelection = props.hasNoEmptySelection,
       defaultSelectedKey = props.defaultSelectedKey,
       selectedKey = props.selectedKey,
       onSelectionChange = props.onSelectionChange,
-      defaultItems = props.defaultItems,
-      items = props.items,
+      initialDefaultItems = props.defaultItems,
+      initialItems = props.items,
       onOpenChange = props.onOpenChange,
       loadingState = props.loadingState,
       onLoadMore = props.onLoadMore,
@@ -91,13 +93,11 @@ var ComboBoxField = /*#__PURE__*/forwardRef(function (props, ref) {
     onFocusChange: onFocusChange,
     onKeyDown: onKeyDown,
     onKeyUp: onKeyUp,
-    allowsCustomValue: hasCustomValue,
+    allowsCustomValue: hasAddOption || hasCustomValue,
     disallowEmptySelection: hasNoEmptySelection,
     defaultSelectedKey: defaultSelectedKey,
     selectedKey: selectedKey,
     onSelectionChange: onSelectionChange,
-    defaultItems: defaultItems,
-    items: items,
     onOpenChange: onOpenChange,
     loadingState: loadingState,
     onLoadMore: onLoadMore,
@@ -123,18 +123,47 @@ var ComboBoxField = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var onSelectionChangeHandler = function onSelectionChangeHandler(key) {
     var newVal = key || selectedKey || '';
+
+    if (hasAddOption && selectedKey !== inputValue) {
+      newVal = inputValue;
+    }
+
     if (onSelectionChange) onSelectionChange(newVal);
   };
 
+  var shouldShowAddOption = hasAddOption && inputValue && selectedKey !== inputValue;
+  var addOption = "ADD: ".concat(inputValue);
+
+  var getItemsArr = function getItemsArr(initialArr) {
+    if (initialArr && shouldShowAddOption) {
+      var _context;
+
+      return _concatInstanceProperty(_context = []).call(_context, initialArr, [{
+        name: addOption,
+        key: addOption
+      }]);
+    }
+
+    return initialArr;
+  };
+
+  var defaultItems = getItemsArr(initialDefaultItems);
+  var items = getItemsArr(initialItems);
+
   var _useFilter = useFilter({
     sensitivity: 'base'
   }),
       contains = _useFilter.contains;
 
   var state = useComboBoxState(_objectSpread(_objectSpread({}, comboBoxOptions), {}, {
-    onSelectionChange: hasCustomValue ? onSelectionChangeHandler : onSelectionChange,
+    defaultItems: defaultItems,
+    items: items,
+    onSelectionChange: hasAddOption || hasCustomValue ? onSelectionChangeHandler : onSelectionChange,
     defaultFilter: typeof defaultFilter !== 'undefined' ? defaultFilter : contains
   }));
+  useEffect(function () {
+    if (shouldShowAddOption) state.selectionManager.setFocusedKey(addOption);
+  }, [shouldShowAddOption, state, addOption]);
 
   var _useComboBox = useComboBox(_objectSpread(_objectSpread({}, comboBoxOptions), {}, {
     buttonRef: buttonRef,
@@ -241,6 +270,9 @@ var ComboBoxField = /*#__PURE__*/forwardRef(function (props, ref) {
   }, listbox));
 });
 ComboBoxField.propTypes = {
+  /* Whether or not adding new options to the list is enabled. */
+  hasAddOption: PropTypes.bool,
+
   /** Whether the ComboBox allows a non-item matching input value to be set. */
   hasCustomValue: PropTypes.bool,
 

package/lib/components/ComboBoxField/ComboBoxField.stories.js

@@ -1,3 +1,5 @@
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
@@ -469,4 +471,53 @@ export var CustomDefaultFilter = function CustomDefaultFilter() {
       key: item.name
     }, item.name);
   }));
+};
+export var ControlledWithAddOption = function ControlledWithAddOption() {
+  var _useState11 = useState(items),
+      _useState12 = _slicedToArray(_useState11, 2),
+      options = _useState12[0],
+      setOptions = _useState12[1];
+
+  var _useState13 = useState(''),
+      _useState14 = _slicedToArray(_useState13, 2),
+      inputValue = _useState14[0],
+      setInputValue = _useState14[1];
+
+  var _useState15 = useState(''),
+      _useState16 = _slicedToArray(_useState15, 2),
+      selectedKey = _useState16[0],
+      setSelectedKey = _useState16[1];
+
+  var onSelectionChange = function onSelectionChange(key) {
+    // Add new option to options array
+    if (key && !_findInstanceProperty(options).call(options, function (_ref2) {
+      var name = _ref2.name;
+      return name === key;
+    })) {
+      var _context2;
+
+      setOptions(_concatInstanceProperty(_context2 = []).call(_context2, options, [{
+        key: key,
+        name: key
+      }]));
+    }
+
+    setInputValue(key);
+    setSelectedKey(key);
+  };
+
+  return ___EmotionJSX(OverlayProvider, null, ___EmotionJSX(ComboBoxField, _extends({
+    label: "Example label",
+    defaultItems: options
+  }, actions, {
+    inputValue: inputValue,
+    selectedKey: selectedKey,
+    onInputChange: setInputValue,
+    onSelectionChange: onSelectionChange,
+    hasAddOption: true
+  }), function (item) {
+    return ___EmotionJSX(Item, {
+      key: item.name
+    }, item.name);
+  }));
 };