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

package/dist/esm/Field/Field.js

@@ -87,6 +87,7 @@ var Field = /*#__PURE__*/function (_Component) {
       order: inline ? 0 : 1,
       grow: 1,
       marginTop: inline || !label ? undefined : 1,
+      maxWidth: "100%",
       spacing: spacing
     }, cloneChildren(children, function (child, _ref) {
       var firstChild = _ref.firstChild;

package/dist/esm/FieldSet/FieldSet.js

@@ -1,36 +1,48 @@
 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 from 'react';
 import Heading from '../Heading';
 import StackView from '../StackView';
 import TileView from '../TileView';
 import Toolbar from '../Toolbar';
+import { useThemeProps } from '../system';
 
 function FieldSet(_ref) {
   var children = _ref.children,
-      _ref$minCellWidth = _ref.minCellWidth,
-      minCellWidth = _ref$minCellWidth === void 0 ? 16 : _ref$minCellWidth,
-      _ref$spacing = _ref.spacing,
-      spacing = _ref$spacing === void 0 ? 1 : _ref$spacing,
       helpContent = _ref.helpContent,
       legend = _ref.legend,
-      restProps = _objectWithoutPropertiesLoose(_ref, ["children", "minCellWidth", "spacing", "helpContent", "legend"]);
+      restProps = _objectWithoutPropertiesLoose(_ref, ["children", "helpContent", "legend"]);
+
+  var _useThemeProps = useThemeProps('fieldset', _objectSpread({}, restProps)),
+      headingProps = _useThemeProps.headingProps,
+      tileViewProps = _useThemeProps.tileViewProps,
+      _useThemeProps$spacin = _useThemeProps.spacing,
+      spacing = _useThemeProps$spacin === void 0 ? 1 : _useThemeProps$spacin,
+      _useThemeProps$minCel = _useThemeProps.minCellWidth,
+      minCellWidth = _useThemeProps$minCel === void 0 ? 16 : _useThemeProps$minCel,
+      themeProps = _objectWithoutPropertiesLoose(_useThemeProps, ["headingProps", "tileViewProps", "spacing", "minCellWidth"]);
 
   return /*#__PURE__*/React.createElement(StackView, _extends({
     as: "fieldset",
     padding: 0,
     margin: 2
-  }, restProps), /*#__PURE__*/React.createElement(Toolbar, {
-    title: /*#__PURE__*/React.createElement(Heading, {
+  }, themeProps, restProps), /*#__PURE__*/React.createElement(Toolbar, {
+    title: /*#__PURE__*/React.createElement(Heading, _extends({
       as: "legend",
       level: 4
-    }, legend),
+    }, headingProps), legend),
     helpContent: helpContent,
     marginBottom: 1
-  }), /*#__PURE__*/React.createElement(TileView, {
+  }), /*#__PURE__*/React.createElement(TileView, _extends({
     minCellWidth: minCellWidth,
     spacing: spacing
-  }, children));
+  }, tileViewProps), children));
 }
 
 export default FieldSet;

package/dist/esm/FilterLayout/FilterLayout.js

@@ -57,7 +57,8 @@ export function FilterLayout(props) {
     title: "Filter",
     "aria-label": sidebarOpen ? 'close filter' : 'open filter',
     iconRight: {
-      name: sidebarOpen ? 'caret-left' : 'filter'
+      name: sidebarOpen ? 'general.leftChevron' : 'general.threeReducingHorizontalBars',
+      size: sidebarOpen ? 'xs' : 'md'
     },
     onClick: toggleSidebar
   }), /*#__PURE__*/React.createElement(Box, {

package/dist/esm/Form/Form.js

@@ -110,7 +110,7 @@ var Form = /*#__PURE__*/function (_React$Component) {
       editButtonProps: {
         disabled: isSubmitting,
         icon: isEditing ? undefined : {
-          name: 'pencil'
+          name: 'general.pencil'
         },
         onClick: function onClick() {
           // bail out if we've already triggered a submit in onBlur

package/dist/esm/GridView/GridView.js

@@ -12,6 +12,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { jsx } from '@emotion/core';
 import * as React from 'react';
 import splitStyles from '../system/split-styles';
+import { spacingValue } from '../system';
 import { useVariant } from '../VariantProvider';
 
 function getTemplateValue(value) {
@@ -64,15 +65,15 @@ var gridViewPlugin = {
     }
 
     if (columnSpacing !== undefined && styles.gridColumnGap === undefined) {
-      styles.gridColumnGap = columnSpacing * 8;
+      styles.gridColumnGap = spacingValue(columnSpacing);
     }
 
     if (rowSpacing !== undefined && styles.gridRowGap === undefined) {
-      styles.gridRowGap = rowSpacing * 8;
+      styles.gridRowGap = spacingValue(rowSpacing);
     }
 
-    if (spacing !== undefined && styles.gridGap === undefined) {
-      styles.gridGap = spacing * 8;
+    if (spacing !== undefined && styles.gap === undefined) {
+      styles.gap = spacingValue(spacing);
     }
 
     return styles;

package/dist/esm/Group/Group.js

@@ -16,21 +16,28 @@ export function Group(_ref) {
       childProps = _ref.childProps,
       children = _ref.children,
       radius = _ref.radius,
-      restProps = _objectWithoutPropertiesLoose(_ref, ["axis", "childProps", "children", "radius"]);
+      spacing = _ref.spacing,
+      restProps = _objectWithoutPropertiesLoose(_ref, ["axis", "childProps", "children", "radius", "spacing"]);
 
   var themeRadius = useThemeValue('group.radius');
   var radiusValue = radius != null ? radius : themeRadius;
   var isHorizontalLayout = axis === 'horizontal';
   var startRadius = isHorizontalLayout ? 'radiusLeft' : 'radiusTop';
   var endRadius = isHorizontalLayout ? 'radiusRight' : 'radiusBottom';
+  var marginBottom = isHorizontalLayout ? 0 : '-1px';
+  var marginRight = isHorizontalLayout ? '-1px' : 0;
   return /*#__PURE__*/React.createElement(StackView, _extends({
     axis: axis,
-    spacing: -0.125
+    spacing: spacing
   }, restProps), cloneChildren(children, function (child, _ref2) {
     var _objectSpread2;
 
     var firstChild = _ref2.firstChild,
         lastChild = _ref2.lastChild;
-    return _objectSpread(_objectSpread({}, childProps), {}, (_objectSpread2 = {}, _objectSpread2[startRadius] = firstChild ? radiusValue : 0, _objectSpread2[endRadius] = lastChild ? radiusValue : 0, _objectSpread2));
+    return _objectSpread(_objectSpread(_objectSpread({}, childProps), {}, (_objectSpread2 = {}, _objectSpread2[startRadius] = firstChild ? radiusValue : 0, _objectSpread2[endRadius] = lastChild ? radiusValue : 0, _objectSpread2), !spacing && !lastChild && {
+      marginBottom: marginBottom
+    }), !spacing && !lastChild && {
+      marginRight: marginRight
+    });
   }));
 }

package/dist/esm/HeadingUppercase/HeadingUppercase.js

@@ -2,13 +2,13 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React from 'react';
 import Text from '../Text';
-import { useThemeValue } from '../system';
+import { useThemeProps } from '../system';
 
 function HeadingUppercase(_ref) {
   var children = _ref.children,
       restProps = _objectWithoutPropertiesLoose(_ref, ["children"]);
 
-  var themedProps = useThemeValue('HeadingUppercase');
+  var themeProps = useThemeProps('HeadingUppercase', restProps);
   return /*#__PURE__*/React.createElement(Text, _extends({
     as: "span",
     uppercase: true,
@@ -18,7 +18,7 @@ function HeadingUppercase(_ref) {
     color: "foregroundSecondary",
     shrink: 0,
     margin: 0
-  }, themedProps, restProps), children);
+  }, themeProps), children);
 }
 
 export default HeadingUppercase;

package/dist/esm/HelperDrawer/HelperDrawer.js

@@ -25,7 +25,7 @@ function Toggle(_ref) {
   }, [drawerId]);
   return jsx(Button, _extends({
     icon: {
-      name: 'info'
+      name: 'general.outlinedInfoCircle'
     },
     tooltip: {
       title: 'More info'

package/dist/esm/Highlight/Highlight.js

@@ -2,23 +2,27 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React from 'react';
 import Text from '../Text';
+import { useThemeProps } from '../system';
 import { markFuzzyMatchSubstring, markStartsWithMatchSubstring } from './utils';
 
 /**
  * Highlight or mark letters in a string using a provided query.
  */
 function Highlight(_ref) {
-  var _ref$color = _ref.color,
-      color = _ref$color === void 0 ? 'primary' : _ref$color,
-      _ref$marker = _ref.marker,
+  var _ref$marker = _ref.marker,
       marker = _ref$marker === void 0 ? markStartsWithMatchSubstring : _ref$marker,
       query = _ref.query,
       text = _ref.text,
-      restProps = _objectWithoutPropertiesLoose(_ref, ["color", "marker", "query", "text"]);
+      restProps = _objectWithoutPropertiesLoose(_ref, ["marker", "query", "text"]);
+
+  var _useThemeProps = useThemeProps('highlight', restProps),
+      _useThemeProps$color = _useThemeProps.color,
+      color = _useThemeProps$color === void 0 ? 'primary' : _useThemeProps$color,
+      themeProps = _objectWithoutPropertiesLoose(_useThemeProps, ["color"]);
 
   return /*#__PURE__*/React.createElement(Text, _extends({
     as: "span"
-  }, restProps), marker(text, query).map(function (part, index) {
+  }, themeProps), marker(text, query).map(function (part, index) {
     return /*#__PURE__*/React.createElement(Text, {
       key: index,
       inline: true,

package/dist/esm/Icon/Status.js

@@ -4,9 +4,9 @@ import React from 'react';
 import Icon from './Icon';
 import Path from './Path';
 var STATUS_VARIANTS = {
-  confirmed: ['checkmark-circle', 'success'],
-  unconfirmed: ['question-circle', 'warning'],
-  declined: ['close-circle', 'error']
+  confirmed: ['general.outlinedCircleCheck', 'success'],
+  unconfirmed: ['general.outlinedQuestionCircle', 'warning'],
+  declined: ['general.outlinedXCircle', 'error']
 };
 
 function Status(props) {
@@ -31,7 +31,7 @@ function Status(props) {
     name: variantName,
     color: color || variantColor
   }, restProps), /*#__PURE__*/React.createElement(Path, {
-    name: "radio-0",
+    name: "tapestry.radio0",
     color: color
   }));
 }

package/dist/esm/Input/InputBox.js

@@ -313,7 +313,7 @@ var InputBox = /*#__PURE__*/function (_Component) {
       size: size
     }) : onClear ? /*#__PURE__*/React.createElement(Button, {
       icon: {
-        name: 'close'
+        name: 'general.x'
       },
       title: "clear input value",
       size: size,

package/dist/esm/List/ListItem.js

@@ -24,7 +24,7 @@ function ListItem(_ref) {
     backgroundColor: "surface"
   }, hoverProps, restProps), children, onRemoveRequest && /*#__PURE__*/React.createElement(Button, {
     icon: {
-      name: 'remove-circle-filled'
+      name: 'general.minusCircle'
     },
     title: removeTitle,
     size: "sm",

package/dist/esm/Menu/Heading.js

@@ -14,4 +14,5 @@ function Heading(_ref) {
   }, restProps), children);
 }
 
+Heading.displayName = 'Menu.Heading';
 export default Heading;

package/dist/esm/Modal/Modal.test.js

@@ -0,0 +1,122 @@
+import React, { useState } from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom/extend-expect';
+import Dropdown from '../Dropdown';
+import Select from '../Select';
+import { Button, Heading, Modal, ThemeProvider } from '../';
+import { noop } from 'lodash';
+
+var _ref = /*#__PURE__*/React.createElement(Heading, {
+  "data-testid": "modal-header"
+}, "Hello");
+
+describe('Modal', function () {
+  var TestModal = function TestModal() {
+    var _useState = useState(false),
+        open = _useState[0],
+        setOpen = _useState[1];
+
+    return /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+      "data-testid": "modal-toggle",
+      onClick: function onClick() {
+        return setOpen(!open);
+      },
+      title: "Toggle modal"
+    }), /*#__PURE__*/React.createElement(Modal, {
+      open: open,
+      onRequestClose: function onRequestClose() {
+        return setOpen(false);
+      }
+    }, _ref, /*#__PURE__*/React.createElement(Dropdown, null, [1, 2, 3].map(function (n) {
+      return /*#__PURE__*/React.createElement(Dropdown.Item, {
+        "data-testid": "dropdown-item-" + n,
+        key: n
+      }, n);
+    })), /*#__PURE__*/React.createElement(Select, {
+      onChange: noop
+    }, [1, 2, 3].map(function (n) {
+      return /*#__PURE__*/React.createElement(Select.Option, {
+        "data-testid": "select-option-" + n,
+        key: n,
+        value: n
+      }, n);
+    })))));
+  };
+
+  var _ref2 = /*#__PURE__*/React.createElement(TestModal, null);
+
+  var _ref3 = /*#__PURE__*/React.createElement(TestModal, null);
+
+  var _ref4 = /*#__PURE__*/React.createElement(TestModal, null);
+
+  var _ref5 = /*#__PURE__*/React.createElement(TestModal, null);
+
+  var _ref6 = /*#__PURE__*/React.createElement(TestModal, null);
+
+  var _ref7 = /*#__PURE__*/React.createElement(TestModal, null);
+
+  describe('Keyboard navigation', function () {
+    it('should close modal on escape keypress (dropdown button has focus)', function () {
+      render(_ref2);
+      expect(screen.queryByTestId('modal-header')).toBeNull();
+      userEvent.click(screen.getByTestId('modal-toggle'));
+      expect(screen.getByTestId('modal-header')).toBeInTheDocument();
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('modal-header')).toBeNull();
+    });
+    it('should not close modal when escape key closes a dropdown within modal', function () {
+      render(_ref3);
+      userEvent.click(screen.getByTestId('modal-toggle'));
+
+      var _screen$getAllByRole = screen.getAllByRole('button'),
+          dropdown = _screen$getAllByRole[1];
+
+      expect(dropdown).toHaveFocus();
+      userEvent.keyboard('{arrowdown}');
+      userEvent.keyboard("{esc}");
+      expect(screen.getByTestId('modal-header')).toBeInTheDocument();
+    });
+    it('should close dropdown on escape & close modal on subsequent escape', function () {
+      render(_ref4);
+      userEvent.click(screen.getByTestId('modal-toggle'));
+      userEvent.keyboard('{arrowdown}');
+      userEvent.keyboard("{esc}");
+      expect(screen.getByTestId('modal-header')).toBeInTheDocument();
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('modal-header')).toBeNull();
+    });
+    it('should hide select popover on escape, but select remains in dom', function () {
+      render(_ref5);
+      userEvent.click(screen.getByTestId('modal-toggle'));
+      userEvent.tab();
+      userEvent.keyboard('{arrowdown}');
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('select-option-1')).toBeInTheDocument();
+    });
+    it('should hide select popover on escape, close (unmount) select popover on subsequent escape, persist modal', function () {
+      render(_ref6);
+      userEvent.click(screen.getByTestId('modal-toggle'));
+      userEvent.tab();
+      userEvent.keyboard('{arrowdown}');
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('select-option-1')).toBeInTheDocument();
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('select-option-1')).toBeNull();
+      expect(screen.queryByTestId('modal-header')).toBeInTheDocument();
+    });
+    it('should hide select popover on escape, close (unmount) select popover on subsequent escape, close modal on subsequent escape', function () {
+      render(_ref7);
+      userEvent.click(screen.getByTestId('modal-toggle'));
+      userEvent.tab();
+      userEvent.keyboard('{arrowdown}');
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('select-option-1')).toBeInTheDocument();
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('select-option-1')).toBeNull();
+      expect(screen.queryByTestId('modal-header')).toBeInTheDocument();
+      userEvent.keyboard("{esc}");
+      expect(screen.queryByTestId('modal-header')).toBeNull();
+    });
+  });
+});

package/dist/esm/Pagination/Pagination.js

@@ -95,7 +95,8 @@ var Pagination = /*#__PURE__*/function (_Component) {
       onClick: onPageChange.bind(null, currentPage - 1),
       disabled: currentPage === 1,
       icon: {
-        name: 'caret-left'
+        name: 'general.leftChevron',
+        size: 'xs'
       },
       tooltip: {
         title: 'Previous Page'
@@ -106,7 +107,8 @@ var Pagination = /*#__PURE__*/function (_Component) {
       onClick: onPageChange.bind(null, currentPage + 1),
       disabled: currentPage === totalPages,
       icon: {
-        name: 'caret-right'
+        name: 'general.rightChevron',
+        size: 'xs'
       },
       tooltip: {
         title: 'Next Page'

package/dist/esm/Popover/Popover.js

@@ -103,6 +103,10 @@ export var Popover = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 
   var requestClose = function requestClose(event) {
     if (event.key === 'Escape' && onRequestClose) {
+      if (open) {
+        event.nativeEvent.stopImmediatePropagation();
+      }
+
       onRequestClose();
     }
 

package/dist/esm/Popover/Popover.test.js

@@ -0,0 +1,51 @@
+import React, { useState } from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom/extend-expect';
+import { Box, Text, Button, Popover } from '..';
+
+var PopBasic = function PopBasic(_ref) {
+  var children = _ref.children;
+
+  var _useState = useState(false),
+      open = _useState[0],
+      setOpen = _useState[1];
+
+  return /*#__PURE__*/React.createElement(Box, {
+    id: "container"
+  }, /*#__PURE__*/React.createElement(Popover, {
+    open: open,
+    offset: 1,
+    renderTo: "#container",
+    anchorElement: /*#__PURE__*/React.createElement(Button, {
+      title: "Toggle",
+      onClick: function onClick() {
+        return setOpen(!open);
+      },
+      id: "anchor-element"
+    })
+  }, children));
+};
+
+var _ref2 = /*#__PURE__*/React.createElement(PopBasic, null, /*#__PURE__*/React.createElement(Box, null));
+
+describe('Popover', function () {
+  it('should not render string in closed Popover', function () {
+    var string = 'Test Text';
+    render( /*#__PURE__*/React.createElement(PopBasic, null, /*#__PURE__*/React.createElement(Text, null, string)));
+    expect(screen.queryByText(string)).toBeNull();
+  });
+  it('should render string in open Popover', function () {
+    var string = 'Test Text';
+    render( /*#__PURE__*/React.createElement(PopBasic, null, /*#__PURE__*/React.createElement(Text, null, string)));
+    var openPopover = screen.getByRole('button');
+    userEvent.click(openPopover);
+    expect(screen.getByText(string)).toBeInTheDocument();
+  });
+  it('should focus open button on click', function () {
+    render(_ref2);
+    var openPopover = screen.getByRole('button');
+    userEvent.click(openPopover);
+    expect(openPopover).toHaveFocus();
+  });
+});

package/dist/esm/Popover/rewireTabOrder.js

@@ -32,43 +32,31 @@ var RewireTabOrder = /*#__PURE__*/function () {
 
     _defineProperty(this, "nextActiveElement", null);
 
-    _defineProperty(this, "focusOriginalActiveElement", function () {
-      _this.originalActiveElement.focus();
-    });
-
-    _defineProperty(this, "focusNextActiveElement", function () {
-      _this.nextActiveElement.focus();
-    });
-
     _defineProperty(this, "moveFocusToTargetFromTriggerElement", function (event) {
       if (!event.shiftKey && event.keyCode === TAB_KEY) {
         event.preventDefault();
 
-        _this.firstFocusableElement.focus();
+        if (_this.tabbables.includes(_this.nextActiveElement)) {
+          _this.nextActiveElement.focus();
+        } else {
+          _this.firstFocusableElement.focus();
+        }
       }
     });
 
-    _defineProperty(this, "moveFocusFromTargetToTriggerElement", function (event) {
+    _defineProperty(this, "moveFocusToTargetFromFirstElement", function (event) {
       if (event.target === _this.firstFocusableElement && event.shiftKey && event.keyCode === TAB_KEY) {
         event.preventDefault();
 
-        _this.originalActiveElement.focus();
-      }
-    });
-
-    _defineProperty(this, "moveFocusToTargetFromNextElement", function (event) {
-      if (event.shiftKey && event.keyCode === TAB_KEY) {
-        event.preventDefault();
-
         _this.lastFocusableElement.focus();
       }
     });
 
-    _defineProperty(this, "moveFocusFromTargetToNextElement", function (event) {
-      if (!event.shiftKey && event.keyCode === TAB_KEY) {
+    _defineProperty(this, "moveFocusToTargetFromLastElement", function (event) {
+      if (event.target === _this.lastFocusableElement && !event.shiftKey && event.keyCode === TAB_KEY) {
         event.preventDefault();
 
-        _this.nextActiveElement.focus();
+        _this.firstFocusableElement.focus();
       }
     });
 
@@ -89,12 +77,8 @@ var RewireTabOrder = /*#__PURE__*/function () {
     this.originalActiveElement = document.activeElement;
     this.nextActiveElement = getNextActiveElement(this.originalActiveElement);
     this.originalActiveElement.addEventListener('keydown', this.moveFocusToTargetFromTriggerElement);
-    this.firstFocusableElement.addEventListener('keydown', this.moveFocusFromTargetToTriggerElement);
-
-    if (this.nextActiveElement) {
-      this.nextActiveElement.addEventListener('keydown', this.moveFocusToTargetFromNextElement);
-      this.lastFocusableElement.addEventListener('keydown', this.moveFocusFromTargetToNextElement);
-    }
+    this.firstFocusableElement.addEventListener('keydown', this.moveFocusToTargetFromFirstElement);
+    this.lastFocusableElement.addEventListener('keydown', this.moveFocusToTargetFromLastElement);
   };
 
   _proto.destroy = function destroy() {
@@ -103,12 +87,8 @@ var RewireTabOrder = /*#__PURE__*/function () {
     }
 
     this.originalActiveElement.removeEventListener('keydown', this.moveFocusToTargetFromTriggerElement);
-    this.firstFocusableElement.removeEventListener('keydown', this.moveFocusFromTargetToTriggerElement);
-
-    if (this.nextActiveElement) {
-      this.nextActiveElement.removeEventListener('keydown', this.moveFocusToTargetFromNextElement);
-      this.lastFocusableElement.removeEventListener('keydown', this.moveFocusFromTargetToNextElement);
-    }
+    this.firstFocusableElement.removeEventListener('keydown', this.moveFocusToTargetFromFirstElement);
+    this.lastFocusableElement.removeEventListener('keydown', this.moveFocusToTargetFromLastElement);
   };
 
   return RewireTabOrder;

package/dist/esm/Progress/Progress.js

@@ -2,12 +2,16 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React from 'react';
 import Box from '../Box';
+import { useThemeProps } from '../system';
 
-function Progress(props) {
-  var value = props.value,
-      _props$activeColor = props.activeColor,
-      activeColor = _props$activeColor === void 0 ? 'primary' : _props$activeColor,
-      restProps = _objectWithoutPropertiesLoose(props, ["value", "activeColor"]);
+function Progress(_ref) {
+  var value = _ref.value,
+      restProps = _objectWithoutPropertiesLoose(_ref, ["value"]);
+
+  var _useThemeProps = useThemeProps('progress', restProps),
+      _useThemeProps$active = _useThemeProps.activeColor,
+      activeColor = _useThemeProps$active === void 0 ? 'primary' : _useThemeProps$active,
+      themeProps = _objectWithoutPropertiesLoose(_useThemeProps, ["activeColor"]);
 
   return /*#__PURE__*/React.createElement(Box, _extends({
     role: "progressbar",
@@ -18,7 +22,7 @@ function Progress(props) {
     position: "relative",
     overflow: "hidden",
     backgroundColor: "grey-3"
-  }, restProps), /*#__PURE__*/React.createElement(Box, {
+  }, themeProps), /*#__PURE__*/React.createElement(Box, {
     position: "absolute",
     top: 0,
     right: 0,

package/dist/esm/Radio/Radio.js

@@ -9,8 +9,8 @@ import Text from '../Text';
 import VariantProvider from '../VariantProvider';
 import { useThemeValue } from '../system';
 var iconPaths = {
-  fill: 'radio-0',
-  checked: 'radio-1'
+  fill: 'tapestry.radio0',
+  checked: 'tapestry.radio1'
 };
 var radioEmitter = mitt();
 

package/dist/esm/RangeSlider/RangeSlider.js

@@ -4,6 +4,7 @@ import React, { useRef, useState } from 'react';
 import { clamp, snap } from '@popmotion/popcorn';
 import Box from '../Box';
 import { useMeasure } from '../hooks';
+import { useThemeProps } from '../system';
 
 function RangeSlider(props) {
   var _props$min = props.min,
@@ -15,9 +16,12 @@ function RangeSlider(props) {
       disabled = props.disabled,
       value = props.value,
       onChange = props.onChange,
-      _props$variant = props.variant,
-      variant = _props$variant === void 0 ? {} : _props$variant,
-      restProps = _objectWithoutPropertiesLoose(props, ["min", "max", "step", "disabled", "value", "onChange", "variant"]);
+      restProps = _objectWithoutPropertiesLoose(props, ["min", "max", "step", "disabled", "value", "onChange"]);
+
+  var _useThemeProps = useThemeProps('rangeSlider', restProps),
+      _useThemeProps$varian = _useThemeProps.variant,
+      variant = _useThemeProps$varian === void 0 ? {} : _useThemeProps$varian,
+      themeProps = _objectWithoutPropertiesLoose(_useThemeProps, ["variant"]);
 
   var snapTo = snap(step);
   var sliderRef = useRef();
@@ -165,7 +169,7 @@ function RangeSlider(props) {
     opacity: disabled ? 0.65 : undefined,
     onMouseDown: disabled ? undefined : handleTrackPointerDown,
     onTouchStart: disabled ? undefined : handleTrackPointerDown
-  }, restProps), /*#__PURE__*/React.createElement(Box, _extends({
+  }, themeProps), /*#__PURE__*/React.createElement(Box, _extends({
     innerRef: trackRef,
     height: 0.5,
     radius: 6,

package/dist/esm/Scrim/Scrim.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import StackView from '../StackView';
-var Scrim = /*#__PURE__*/React.forwardRef(function (props, ref) {
+var Scrim = /*#__PURE__*/React.forwardRef(function (props) {
   React.useLayoutEffect(function () {
     document.body.style.overflow = 'hidden';
     return function () {
@@ -9,7 +9,7 @@ var Scrim = /*#__PURE__*/React.forwardRef(function (props, ref) {
     };
   }, []);
   return /*#__PURE__*/React.createElement(StackView, _extends({
-    innerRef: ref,
+    innerRef: props.ref,
     position: "fixed",
     top: 0,
     right: 0,