@planningcenter/tapestry-react 1.3.0 → 2.0.0-rc.1

package/dist/esm/Badge/Badge.js

@@ -1,31 +1,51 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 import React, { cloneElement } from 'react';
 import Box from '../Box';
-import { getForegroundColor, useBoxSize } from '../system';
+import { getForegroundColor, useBoxSize, useThemeProps } from '../system';
 import StackView from '../StackView';
 import Text from '../Text';
 import { stopPropagationClick } from '../utils';
 
 function Badge(_ref) {
   var children = _ref.children,
-      _ref$color = _ref.color,
-      color = _ref$color === void 0 ? {
-    foreground: 'foreground',
-    background: 'surfaceTertiary'
-  } : _ref$color,
       renderLeft = _ref.renderLeft,
       renderRight = _ref.renderRight,
       onClick = _ref.onClick,
-      _ref$radius = _ref.radius,
-      radius = _ref$radius === void 0 ? 3 : _ref$radius,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? 'md' : _ref$size,
-      square = _ref.square,
       title = _ref.title,
-      restProps = _objectWithoutPropertiesLoose(_ref, ["children", "color", "renderLeft", "renderRight", "onClick", "radius", "size", "square", "title"]);
+      restProps = _objectWithoutPropertiesLoose(_ref, ["children", "renderLeft", "renderRight", "onClick", "title"]);
+
+  var _useThemeProps = useThemeProps('badge', restProps),
+      _useThemeProps$color = _useThemeProps.color,
+      color = _useThemeProps$color === void 0 ? {
+    foreground: 'foreground',
+    background: 'surfaceTertiary'
+  } : _useThemeProps$color,
+      _useThemeProps$radius = _useThemeProps.radius,
+      radius = _useThemeProps$radius === void 0 ? 3 : _useThemeProps$radius,
+      _useThemeProps$size = _useThemeProps.size,
+      size = _useThemeProps$size === void 0 ? 'md' : _useThemeProps$size,
+      _useThemeProps$square = _useThemeProps.square,
+      square = _useThemeProps$square === void 0 ? false : _useThemeProps$square,
+      themeProps = _objectWithoutPropertiesLoose(_useThemeProps, ["color", "radius", "size", "square"]);
+
+  var badgeProps = _objectSpread({
+    color: color,
+    radius: radius,
+    size: size,
+    square: square
+  }, themeProps);
+
+  badgeProps.backgroundColor = color.background || color;
+  badgeProps.color = color.foreground || getForegroundColor(color);
 
-  var _useBoxSize = useBoxSize(size),
+  var _useBoxSize = useBoxSize(badgeProps.size),
       boxSize = _useBoxSize.boxSize,
       fontSize = _useBoxSize.fontSize,
       lineHeight = _useBoxSize.lineHeight,
@@ -40,34 +60,29 @@ function Badge(_ref) {
     color: 'inherit'
   };
 
-  if (square || radius === 'circle') {
-    restProps.width = boxSize;
-    restProps.height = boxSize;
+  if (badgeProps.square || badgeProps.radius === 'circle') {
+    badgeProps.width = boxSize;
+    badgeProps.height = boxSize;
   }
 
-  if (radius === 'circle') {
+  if (badgeProps.radius === 'circle') {
     textStyle.position = 'absolute';
     textStyle.top = '50%';
     textStyle.left = '50%';
     textStyle.transform = 'translate(-50%, -50%)';
   }
 
-  var spacingLeft = renderLeft ? boxSize + 0.5 : radius === 'pill' ? paddingHorizontal : paddingHorizontalDense;
-  var spacingRight = renderRight ? boxSize + 0.5 : radius === 'pill' ? paddingHorizontal : paddingHorizontalDense;
+  badgeProps.paddingLeft = renderLeft ? boxSize + 0.5 : badgeProps.radius === 'pill' ? paddingHorizontal : paddingHorizontalDense;
+  badgeProps.paddingRight = renderRight ? boxSize + 0.5 : badgeProps.radius === 'pill' ? paddingHorizontal : paddingHorizontalDense;
   return /*#__PURE__*/React.createElement(StackView, _extends({
     inline: true,
     axis: "horizontal",
     alignment: "center",
     distribution: "center",
-    radius: radius,
     fontSize: fontSize,
     lineHeight: lineHeight,
     minHeight: boxSize,
-    paddingLeft: spacingLeft,
-    paddingRight: spacingRight,
     paddingVertical: paddingVertical,
-    backgroundColor: color.background || color,
-    color: color.foreground || getForegroundColor(color),
     fill: "currentColor",
     textAlign: "center",
     position: "relative",
@@ -77,7 +92,7 @@ function Badge(_ref) {
       backgroundColor: 'highlightSecondary'
     },
     onClick: stopPropagationClick(onClick)
-  }, restProps), renderLeft && /*#__PURE__*/React.createElement(Box, {
+  }, badgeProps), renderLeft && /*#__PURE__*/React.createElement(Box, {
     display: "flex",
     alignItems: "center",
     justifyContent: "center",
@@ -87,7 +102,7 @@ function Badge(_ref) {
     top: 0,
     left: 0
   }, typeof renderLeft === 'string' ? renderLeft : /*#__PURE__*/cloneElement(renderLeft, {
-    size: renderLeft.props && renderLeft.props.size || size
+    size: renderLeft.props && renderLeft.props.size || badgeProps.size
   })), typeof title === 'undefined' ? children : /*#__PURE__*/React.createElement(Text, textStyle, title), renderRight && /*#__PURE__*/React.createElement(Box, {
     display: "flex",
     alignItems: "center",
@@ -98,7 +113,7 @@ function Badge(_ref) {
     top: 0,
     right: 0
   }, typeof renderRight === 'string' ? renderRight : /*#__PURE__*/cloneElement(renderRight, {
-    size: renderRight.props && renderRight.props.size || size
+    size: renderRight.props && renderRight.props.size || badgeProps.size
   })));
 }
 

package/dist/esm/Badge/Status.js

@@ -10,11 +10,11 @@ import Badge from './Badge';
 var statuses = {
   error: {
     color: 'error',
-    icon: 'close'
+    icon: 'general.x'
   },
   success: {
     color: 'success',
-    icon: 'checkmark'
+    icon: 'general.check'
   }
 };
 

package/dist/esm/Calendar/Calendar.js

@@ -179,7 +179,8 @@ var Calendar = /*#__PURE__*/forwardRef(function (_ref, calendarRef) {
   }, /*#__PURE__*/React.createElement(Button, {
     title: "Previous month",
     icon: {
-      name: 'caret-left'
+      name: 'general.leftChevron',
+      size: "xxs"
     },
     disabled: isYearsView ? currentYear <= minYear : isSameMonth(currentDate, minDate),
     onClick: function onClick() {
@@ -190,7 +191,7 @@ var Calendar = /*#__PURE__*/forwardRef(function (_ref, calendarRef) {
       title: 'Today'
     },
     icon: {
-      name: 'radio-1'
+      name: 'tapestry.radio1'
     },
     onClick: function onClick() {
       return setDate(TODAY, true);
@@ -198,7 +199,8 @@ var Calendar = /*#__PURE__*/forwardRef(function (_ref, calendarRef) {
   }), /*#__PURE__*/React.createElement(Button, {
     title: "Next month",
     icon: {
-      name: 'caret-right'
+      name: 'general.rightChevron',
+      size: "xxs"
     },
     disabled: isYearsView ? currentYear >= maxYear : isSameMonth(currentDate, maxDate),
     onClick: function onClick() {

package/dist/esm/Card/Card.js

@@ -4,8 +4,7 @@ import * as React from 'react';
 import { useThemeValue } from '../system';
 import { StackView } from '../StackView';
 import { cloneChildren } from '../utils';
-
-function Section(_ref) {
+export function Section(_ref) {
   var subdued = _ref.subdued,
       restProps = _objectWithoutPropertiesLoose(_ref, ["subdued"]);
 
@@ -15,7 +14,6 @@ function Section(_ref) {
     backgroundColor: subdued ? 'surfaceSecondary' : undefined
   }, restProps));
 }
-
 export function Card(_ref2) {
   var children = _ref2.children,
       subdued = _ref2.subdued,
@@ -41,4 +39,5 @@ export function Card(_ref2) {
     return child.props.radius === undefined ? firstChild ? (_ref4 = {}, _ref4["radius" + (restProps.axis === 'horizontal' ? 'Left' : 'Top')] = radius - 1, _ref4) : lastChild ? (_ref5 = {}, _ref5["radius" + (restProps.axis === 'horizontal' ? 'Right' : 'Bottom')] = radius - 1, _ref5) : {} : {};
   }) : children);
 }
+Section.displayName = 'Card.Section';
 Card.Section = Section;

package/dist/esm/Checkbox/Checkbox.js

@@ -13,9 +13,9 @@ import { useThemeValue } from '../system';
 import { useAccessibilityViolation } from '../hooks/use-accessibility-violation';
 import { mergeProps } from '../utils';
 var iconPaths = {
-  fill: 'checkbox-0',
-  minus: 'checkbox-1',
-  checked: 'checkbox-2'
+  fill: 'tapestry.checkbox0',
+  minus: 'tapestry.checkbox1',
+  checked: 'tapestry.checkbox2'
 };
 
 var _ref2 = /*#__PURE__*/React.createElement(Link, {

package/dist/esm/ChurchCenterStatus/ChurchCenterStatus.js

@@ -68,10 +68,10 @@ export function ChurchCenterStatus(_ref) {
   var hasLinks = showSettingsLink || ccEnabled && ccPublishingEnabled || !!renderPopoverFooter();
 
   var icon = _objectSpread({
-    check: 'checkmark',
-    exclamationTriangle: 'exclamation-triangle-filled',
-    external: 'external',
-    x: 'close'
+    check: 'general.check',
+    exclamationTriangle: 'general.exclamationTriangle',
+    external: 'general.newWindow',
+    x: 'general.x'
   }, icons);
 
   return /*#__PURE__*/React.createElement(StackView, _extends({

package/dist/esm/ColumnView/ColumnView.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { Children } from 'react';
 import StackView from '../StackView';
+import { spacingValue } from '../system';
 
 function Column() {
   return null;
@@ -14,6 +15,7 @@ function ColumnView(props) {
       spacing = props.spacing,
       restProps = _objectWithoutPropertiesLoose(props, ["children", "sizes", "spacing"]);
 
+  var parsedSpacing = spacingValue(spacing);
   var sortedColumns = Children.toArray(children).sort(function (a, b) {
     return (a.props.order || 0) - (b.props.order || 0);
   }).reduce(function (columns, cell, index) {
@@ -37,8 +39,8 @@ function ColumnView(props) {
       basis: size === 'auto' ? '100%' : size.basis || size,
       shrink: size === 'auto' ? 1 : size.shrink || 0,
       grow: size === 'auto' ? 1 : size.grow || 0,
-      marginLeft: index === 0 ? null : spacing,
-      spacing: spacing
+      marginLeft: index === 0 ? null : parsedSpacing,
+      spacing: parsedSpacing
     }, column.map(function (cell) {
       return cell.props.children;
     }));

package/dist/esm/Combobox/ComboboxPopover.js

@@ -201,14 +201,14 @@ var ComboboxPopover = /*#__PURE__*/function (_Component) {
               renderRight: closeButton ? /*#__PURE__*/React.createElement(Button, _extends({
                 disabled: disabled,
                 icon: {
-                  name: 'close'
+                  name: 'general.x'
                 },
                 title: "close options",
                 theme: false
               }, closeButton)) : dropdownButton ? /*#__PURE__*/React.createElement(Button, {
                 disabled: disabled,
                 icon: {
-                  name: isPopoverOpen ? 'close' : 'arrow-down'
+                  name: isPopoverOpen ? 'general.x' : 'general.downCaret'
                 },
                 title: isPopoverOpen ? 'close options' : 'open options',
                 theme: false,

package/dist/esm/DataTable/components/CheckboxCell.js

@@ -1,10 +1,10 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback } from 'react';
-import Icon from './Icon';
+import Icon from '../../Icon';
 var iconPaths = {
-  fill: 'checkbox-0',
-  minus: 'checkbox-1',
-  checked: 'checkbox-2'
+  fill: 'tapestry.checkbox0',
+  minus: 'tapestry.checkbox1',
+  checked: 'tapestry.checkbox2'
 };
 var scaleStyles = {
   visibility: 'visible',

package/dist/esm/DataTable/components/ColumnPicker.js

@@ -1,10 +1,9 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React from 'react'; // import Checkbox from '../../Checkbox'
-
+import React from 'react';
 import Dropdown from '../../Dropdown';
 import Text from '../../Text';
-import Checkbox from './CheckboxCell';
+import Checkbox from '../../Checkbox';
 
 var noop = function noop() {
   return null;
@@ -22,7 +21,7 @@ function ColumnPicker(_ref) {
   return /*#__PURE__*/React.createElement(Dropdown, _extends({
     variant: "outline",
     icon: {
-      name: 'columns'
+      name: 'general.threeVerticalBars'
     },
     tooltip: {
       title: 'Filter Columns'
@@ -52,7 +51,9 @@ function ColumnPicker(_ref) {
       value: column.id
     }, /*#__PURE__*/React.createElement(Checkbox, {
       checked: hiddenColumnIds.indexOf(column.id) === -1,
-      onChange: noop
+      onChange: noop,
+      label: null,
+      size: "md"
     }), /*#__PURE__*/React.createElement(Text, {
       marginLeft: 1
     }, column.label || column.header));

package/dist/esm/DataTable/hooks/useColumnSort.js

@@ -8,7 +8,7 @@ import { useCallback, useState } from 'react';
 export var SORT_ASC = 'ASC';
 export var SORT_DESC = 'DESC';
 export function getIconDirection(direction) {
-  return direction === SORT_ASC ? 'arrow-up' : 'arrow-down';
+  return direction === SORT_ASC ? 'general.upCaret' : 'general.downCaret';
 }
 export function getOppositeSortDirection(direction) {
   return direction === SORT_ASC ? SORT_DESC : SORT_ASC;

package/dist/esm/DataTable/utils/getParsedColumns.js

@@ -3,7 +3,7 @@ import React from 'react';
 import Box from '../../Box';
 import Tooltip from '../../Tooltip';
 import { useCollapsibleRowsStore, useSubRowOpen, useAnySubRowsOpen } from '../hooks/useCollapsibleRows';
-import Icon from '../components/Icon';
+import Icon from '../../Icon';
 var buttonStyles = {
   appearance: 'none',
   display: 'flex',
@@ -45,7 +45,7 @@ function CollapseHeader(_ref) {
       callbacks.toggleAllSubRows();
     }
   }, /*#__PURE__*/React.createElement(Icon, {
-    name: "arrow-down",
+    name: "general.downCaret",
     size: "sm",
     style: {
       transform: anySubRowsOpen ? undefined : 'rotate(-90deg)',
@@ -68,7 +68,7 @@ function CollapseCell(_ref2) {
       callbacks.toggleSubRowAtIndex(rowIndex);
     }
   }, /*#__PURE__*/React.createElement(Icon, {
-    name: "arrow-down",
+    name: "general.downCaret",
     size: "sm",
     style: {
       transform: isSubRowOpen ? undefined : 'rotate(-90deg)',
@@ -119,7 +119,7 @@ function getParsedColumns(_ref3) {
             return event.preventDefault();
           }
         }, _dragHandleProps), /*#__PURE__*/React.createElement(Icon, {
-          name: "drag-handle",
+          name: "general.dragHandle",
           size: "sm",
           color: "foregroundTertiary",
           style: {

package/dist/esm/DateField/DateField.js

@@ -14,7 +14,7 @@ import Popover from '../Popover';
 import { generateId } from '../utils';
 
 var _ref2 = /*#__PURE__*/React.createElement(Icon, {
-  name: "calendar",
+  name: "general.calendar",
   color: "foregroundTertiary"
 });
 

package/dist/esm/Drawer/Drawer.js

@@ -2,12 +2,14 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import StackView from '../StackView';
+import { useThemeValue } from '../system';
 
 function DrawerContents(_ref) {
   var shouldClose = _ref.shouldClose,
       onClose = _ref.onClose,
       restProps = _objectWithoutPropertiesLoose(_ref, ["shouldClose", "onClose"]);
 
+  var themeProps = useThemeValue('drawer');
   var ref = useRef(null);
 
   var _useState = useState(false),
@@ -51,7 +53,7 @@ function DrawerContents(_ref) {
     boxShadow: "-6px 0px 6px -4px rgba(150,150,150,0.25)",
     backgroundColor: "surfaceTertiary",
     transition: "transform 240ms ease-out"
-  }, restProps));
+  }, themeProps, restProps));
 }
 
 function Drawer(props) {

package/dist/esm/Dropdown/Dropdown.js

@@ -177,7 +177,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
                 'aria-haspopup': true,
                 'aria-expanded': isPopoverOpen
               }, _objectSpread2[arrowIconOnly ? 'icon' : 'iconRight'] = {
-                name: isPopoverOpen ? 'arrow-up' : 'arrow-down',
+                name: isPopoverOpen ? 'general.upCaret' : 'general.downCaret',
                 size: 'sm'
               }, _objectSpread2.title = arrowIconOnly ? 'arrow down' : restProps.title, _objectSpread2.tabIndex = 0, _objectSpread2.cursor = 'pointer', _objectSpread2.onBlur = requestBlur, _objectSpread2.onClick = function onClick() {
                 _this2.togglePopover();

package/dist/esm/Dropdown/Dropdown.test.js

@@ -1,26 +1,167 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom/extend-expect';
+import { noop } from 'lodash';
+import { Box, Button, Text, ThemeProvider } from '..';
 import Dropdown from './Dropdown';
-import ThemeProvider from '../ThemeProvider';
 
 var _ref = /*#__PURE__*/React.createElement(Dropdown, {
   title: "A menu"
 });
 
-it("should render title", function () {
-  render(_ref);
-  screen.getByText('A menu');
-});
-it("calls passed onSearch function when receiving keyboard input", function () {
-  var customTextSearch = jest.fn();
-  render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(Dropdown, {
-    title: "A menu",
-    onSearch: customTextSearch
-  })));
-  var dropdown = screen.getByText('A menu');
-  fireEvent.keyDown(dropdown, {
-    key: 'A',
-    code: 'KeyA'
+describe('Dropdown', function () {
+  describe('Text search', function () {
+    it("should render title", function () {
+      render(_ref);
+      screen.getByText('A menu');
+    });
+    it("calls passed onSearch function when receiving keyboard input", function () {
+      var customTextSearch = jest.fn();
+      render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(Dropdown, {
+        title: "A menu",
+        onSearch: customTextSearch
+      })));
+      var dropdown = screen.getByText('A menu');
+      fireEvent.keyDown(dropdown, {
+        key: 'A',
+        code: 'KeyA'
+      });
+      expect(customTextSearch).toHaveBeenCalled();
+    });
+  });
+  describe('Keyboard navigation', function () {
+    var StatefulDropdown = function StatefulDropdown() {
+      var _useState = useState(0),
+          count = _useState[0],
+          setCount = _useState[1];
+
+      return /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(Dropdown, null, /*#__PURE__*/React.createElement(Dropdown.Item, null, /*#__PURE__*/React.createElement(Button, {
+        title: "One",
+        onClick: function onClick() {
+          return noop();
+        }
+      })), /*#__PURE__*/React.createElement(Dropdown.Item, null, /*#__PURE__*/React.createElement(Button, {
+        title: "Two",
+        onClick: function onClick() {
+          return setCount(function (c) {
+            return c + 1;
+          });
+        }
+      }), /*#__PURE__*/React.createElement(Text, {
+        "data-testid": "count-text"
+      }, count)), /*#__PURE__*/React.createElement(Dropdown.Item, null, /*#__PURE__*/React.createElement(Button, {
+        title: "Three",
+        onClick: function onClick() {
+          return noop();
+        }
+      })))));
+    };
+
+    var _ref2 = /*#__PURE__*/React.createElement(StatefulDropdown, null);
+
+    it('should trap focus, tab forward through all elements', function () {
+      render(_ref2);
+      userEvent.tab();
+      userEvent.keyboard('{enter}');
+
+      var _screen$getAllByRole = screen.getAllByRole('button'),
+          openPopover = _screen$getAllByRole[0],
+          buttonOne = _screen$getAllByRole[1],
+          buttonTwo = _screen$getAllByRole[2],
+          buttonThree = _screen$getAllByRole[3];
+
+      expect(openPopover).toHaveFocus();
+      userEvent.tab();
+      expect(buttonOne).toHaveFocus();
+      userEvent.tab();
+      expect(buttonTwo).toHaveFocus();
+      userEvent.tab();
+      expect(buttonThree).toHaveFocus();
+      userEvent.tab();
+      expect(buttonOne).toHaveFocus();
+    });
+
+    var _ref3 = /*#__PURE__*/React.createElement(StatefulDropdown, null);
+
+    it('should trap focus, tab backwards from first element to last', function () {
+      render(_ref3);
+      userEvent.tab();
+      userEvent.keyboard('{enter}');
+
+      var _screen$getAllByRole2 = screen.getAllByRole('button'),
+          openPopover = _screen$getAllByRole2[0],
+          buttonOne = _screen$getAllByRole2[1],
+          _buttonTwo = _screen$getAllByRole2[2],
+          buttonThree = _screen$getAllByRole2[3];
+
+      expect(openPopover).toHaveFocus();
+      userEvent.tab();
+      expect(buttonOne).toHaveFocus();
+      userEvent.tab({
+        shift: true
+      });
+      expect(buttonThree).toHaveFocus();
+    });
+
+    var _ref4 = /*#__PURE__*/React.createElement(StatefulDropdown, null);
+
+    it('should retain tab order after rerender', function () {
+      render(_ref4);
+      userEvent.tab();
+      userEvent.keyboard('{enter}');
+
+      var _screen$getAllByRole3 = screen.getAllByRole('button'),
+          buttonOne = _screen$getAllByRole3[1],
+          buttonTwo = _screen$getAllByRole3[2],
+          buttonThree = _screen$getAllByRole3[3];
+
+      userEvent.tab();
+      userEvent.tab();
+      expect(screen.getByTestId('count-text')).toHaveTextContent('0');
+      userEvent.keyboard('{enter}');
+      expect(screen.getByTestId('count-text')).toHaveTextContent('1');
+      expect(buttonTwo).toHaveFocus();
+      userEvent.tab();
+      expect(buttonThree).toHaveFocus();
+      userEvent.tab({
+        shift: true
+      });
+      userEvent.tab({
+        shift: true
+      });
+      expect(buttonOne).toHaveFocus();
+      userEvent.tab();
+      userEvent.tab();
+      userEvent.tab();
+      expect(buttonOne).toHaveFocus();
+      userEvent.tab({
+        shift: true
+      });
+      userEvent.tab({
+        shift: true
+      });
+      userEvent.tab({
+        shift: true
+      });
+      expect(buttonOne).toHaveFocus();
+    });
+
+    var _ref5 = /*#__PURE__*/React.createElement(StatefulDropdown, null);
+
+    it('should focus dropdown toggle when a user presses escape key', function () {
+      render(_ref5);
+      userEvent.tab();
+      userEvent.keyboard('{enter}');
+
+      var _screen$getAllByRole4 = screen.getAllByRole('button'),
+          openPopover = _screen$getAllByRole4[0],
+          buttonOne = _screen$getAllByRole4[1];
+
+      userEvent.tab();
+      expect(buttonOne).toHaveFocus();
+      userEvent.keyboard("{esc}");
+      expect(openPopover).toHaveFocus();
+    });
   });
-  expect(customTextSearch).toHaveBeenCalled();
 });

package/dist/esm/Dropdown/Link.js

@@ -17,6 +17,8 @@ var Link = /*#__PURE__*/function (_Component) {
 
   var _proto = Link.prototype;
 
+  // Graphql wasn't picking up the correct displayName when this was
+  // assigned to LINK_DISPLAY_NAME, but using a string works
   _proto.render = function render() {
     var _this$props = this.props,
         disabled = _this$props.disabled,
@@ -62,6 +64,6 @@ var Link = /*#__PURE__*/function (_Component) {
   return Link;
 }(Component);
 
-_defineProperty(Link, "displayName", LINK_DISPLAY_NAME);
+_defineProperty(Link, "displayName", 'Dropdown.Link');
 
 export default Link;

package/dist/esm/EditActions/EditActions.js

@@ -4,6 +4,7 @@ import React, { Children, useEffect, useState } from 'react';
 import Button from '../Button';
 import StackView from '../StackView';
 import { useDocumentEvent, useFocus, useHover } from '../hooks';
+import { useThemeProps } from '../system';
 
 function EditActions(_ref) {
   var display = _ref.display,
@@ -33,6 +34,10 @@ function EditActions(_ref) {
     });
   };
 
+  var _useThemeProps = useThemeProps('editActions', restProps),
+      buttonProps = _useThemeProps.buttonProps,
+      themeProps = _objectWithoutPropertiesLoose(_useThemeProps, ["buttonProps"]);
+
   useEffect(function () {
     if (loading === false) {
       setShowCheck(true);
@@ -54,11 +59,11 @@ function EditActions(_ref) {
     onClick: on ? undefined : function () {
       return setOn(true);
     }
-  }, focusProps, hoverProps, restProps), Children.toArray(on ? edit : display), /*#__PURE__*/React.createElement(Button, {
+  }, focusProps, hoverProps, themeProps), Children.toArray(on ? edit : display), /*#__PURE__*/React.createElement(Button, _extends({
     grow: 0,
     title: on ? 'Close' : 'Edit',
     icon: {
-      name: showCheck ? 'checkmark' : on ? 'close' : 'pencil',
+      name: showCheck ? 'general.check' : on ? 'general.x' : 'general.pencil',
       color: showCheck ? 'green' : undefined
     },
     tooltip: {
@@ -73,7 +78,7 @@ function EditActions(_ref) {
     spinner: on && loading ? {
       color: 'primary'
     } : undefined
-  }));
+  }, buttonProps)));
 }
 
 export default EditActions;