@planningcenter/tapestry-react 2.5.0 → 2.6.0-rc.0

package/dist/cjs/Button/Button.js

@@ -260,7 +260,7 @@ function Button(_ref) {
     }
 
     if (type && restProps.as && restProps.as !== "button") {
-      throw Error("Tapestry-React: <Button/> type prop is only supported by <button> and not <" + restProps.as + ">.");
+      console.log("Tapestry-React: <Button/> type prop is only supported by <button> and not <" + restProps.as + ">.");
     }
   }
 

package/dist/cjs/Checkbox/Checkbox.js

@@ -85,24 +85,8 @@ function Checkbox(_ref) {
         wrapperProps = _useAccessibilityViol.wrapperProps;
 
     (0, _react.useLayoutEffect)(function () {
-      function findParent(node, findMatch) {
-        if (node && node !== document.documentElement) {
-          var matchFound = findMatch(node.parentNode);
-
-          if (matchFound) {
-            return node.parentNode;
-          } else {
-            return findParent(node.parentNode, findMatch);
-          }
-        } else {
-          return null;
-        }
-      }
-
       if (label === undefined) {
-        var labelParent = findParent(ref.current, function (parentNode) {
-          return parentNode.tagName === 'LABEL';
-        });
+        var labelParent = ref.current.closest('label') !== null;
 
         if (!labelParent) {
           setNeedsParentLabel(true);

package/dist/cjs/Pagination/Pagination.js

@@ -75,9 +75,7 @@ var NavButton = function NavButton(_ref) {
 };
 
 function Pagination(_ref2) {
-  var _ref2$activeColor = _ref2.activeColor,
-      activeColor = _ref2$activeColor === void 0 ? '#5b8bf7' : _ref2$activeColor,
-      currentPage = _ref2.currentPage,
+  var currentPage = _ref2.currentPage,
       _ref2$onPageChange = _ref2.onPageChange,
       onPageChange = _ref2$onPageChange === void 0 ? function () {
     return null;
@@ -85,11 +83,19 @@ function Pagination(_ref2) {
       visiblePages = _ref2.visiblePages,
       _ref2$totalPages = _ref2.totalPages,
       totalPages = _ref2$totalPages === void 0 ? 0 : _ref2$totalPages,
-      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_ref2, ["activeColor", "currentPage", "onPageChange", "visiblePages", "totalPages"]);
+      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_ref2, ["currentPage", "onPageChange", "visiblePages", "totalPages"]);
 
   var _useThemeValue = (0, _system.useThemeValue)('breakpoints'),
       xsBreakpoint = _useThemeValue.xs;
 
+  var _useThemeProps = (0, _system.useThemeProps)('pagination', _objectSpread({}, restProps)),
+      _useThemeProps$active = _useThemeProps.activeColor,
+      activeColor = _useThemeProps$active === void 0 ? '#5b8bf7' : _useThemeProps$active,
+      navButtonProps = _useThemeProps.navButtonProps,
+      pageLinkProps = _useThemeProps.pageLinkProps,
+      activePageLinkProps = _useThemeProps.activePageLinkProps,
+      themeProps = (0, _objectWithoutPropertiesLoose2["default"])(_useThemeProps, ["activeColor", "navButtonProps", "pageLinkProps", "activePageLinkProps"]);
+
   var currentWidth = (0, _windowSize.useWindowWidth)();
 
   function renderGap(key) {
@@ -125,10 +131,10 @@ function Pagination(_ref2) {
       square: true,
       title: number,
       variant: isCurrentPage ? 'fill' : 'naked'
-    }, isCurrentPage && {
+    }, pageLinkProps, isCurrentPage && _objectSpread({
       backgroundColor: activeColor,
       color: '#fff'
-    }));
+    }, activePageLinkProps)));
   }
 
   function renderPageLinks() {
@@ -151,22 +157,22 @@ function Pagination(_ref2) {
       shrink: 0,
       spacing: 0.5,
       width: "100%"
-    }, restProps), /*#__PURE__*/_react["default"].createElement(_Group["default"], {
+    }, themeProps), /*#__PURE__*/_react["default"].createElement(_Group["default"], {
       spacing: 0.5
-    }, /*#__PURE__*/_react["default"].createElement(NavButton, {
+    }, /*#__PURE__*/_react["default"].createElement(NavButton, (0, _extends2["default"])({
       disabled: currentPage === 1,
       iconName: "general.leftChevron",
       onClick: onPageChange.bind(null, currentPage - 1),
       tooltip: {
         title: 'Previous Page'
       }
-    }), /*#__PURE__*/_react["default"].createElement(NavButton, {
+    }, navButtonProps)), /*#__PURE__*/_react["default"].createElement(NavButton, (0, _extends2["default"])({
       disabled: currentPage === totalPages,
       iconName: "general.rightChevron",
       onClick: onPageChange.bind(null, currentPage + 1),
       tooltip: {
         title: 'Next Page'
       }
-    })), renderPageLinks());
+    }, navButtonProps))), renderPageLinks());
   }
 }

package/dist/cjs/ThemeProvider/ThemeProvider.js

@@ -75,6 +75,8 @@ function mergeThemes(a, b) {
 }
 
 function ThemeProvider(_ref) {
+  var _ref2;
+
   var _ref$theme = _ref.theme,
       theme = _ref$theme === void 0 ? emptyTheme : _ref$theme,
       children = _ref.children;
@@ -87,7 +89,7 @@ function ThemeProvider(_ref) {
 
   (0, _react.useLayoutEffect)(function () {
     var nextTheme = mergeThemes(_defaultTheme["default"], theme);
-    (0, _styles.setRootStyles)((0, _utils.objectToCSSProperties)('colors', nextTheme.colors));
+    (0, _styles.setRootStyles)(nextTheme.id, (0, _utils.objectToCSSProperties)('colors', nextTheme.colors));
 
     if (!(0, _utils.shallowEqual)(mergedTheme, nextTheme)) {
       setMergedTheme(nextTheme);
@@ -97,7 +99,7 @@ function ThemeProvider(_ref) {
     value: cache
   }, /*#__PURE__*/_react["default"].createElement(_react2.ThemeProvider, {
     theme: mergedTheme
-  }, children));
+  }, /*#__PURE__*/_react["default"].createElement("div", (_ref2 = {}, _ref2["" + (0, _styles.getThemeDataAttribute)(mergedTheme.id)] = true, _ref2), children)));
 }
 
 ThemeProvider.cache = cache;

package/dist/cjs/ThemeProvider/styles.js

@@ -1,23 +1,33 @@
 "use strict";
 
 exports.__esModule = true;
+exports.getThemeDataAttribute = getThemeDataAttribute;
 exports.styleReset = exports.defaultColorProperties = exports.setRootStyles = void 0;
 
 var _system = require("../system");
 
 var _utils = require("../utils");
 
-var getRootStyles = function getRootStyles(styles) {
+function getThemeDataAttribute(themeId) {
+  if (themeId) {
+    return "data-tapestry-react-theme-provider-" + themeId;
+  } else {
+    return 'data-tapestry-react-theme-provider';
+  }
+}
+
+var getRootStyles = function getRootStyles(id, styles) {
   var styleString = Object.keys(styles).map(function (key) {
     return key + ": " + styles[key];
   }).join('; ');
-  return ":root { " + styleString + " }";
+  return "[" + getThemeDataAttribute(id) + "] { " + styleString + " }";
 };
 
-var setRootStyles = function setRootStyles(styles) {
-  var styleElement = document.getElementById('tapestry-react-style');
+var setRootStyles = function setRootStyles(themeId, styles) {
+  ensureStyleElement(themeId);
+  var styleElement = document.getElementById("tapestry-react-style-" + themeId);
   var sheet = styleElement.sheet;
-  var styleString = getRootStyles(styles);
+  var styleString = getRootStyles(themeId, styles);
   sheet.deleteRule(0);
   sheet.insertRule(styleString, 0);
 };
@@ -25,16 +35,21 @@ var setRootStyles = function setRootStyles(styles) {
 exports.setRootStyles = setRootStyles;
 var defaultColorProperties = (0, _utils.objectToCSSProperties)('colors', (0, _system.flattenPalette)(_system.defaultTheme.colors));
 exports.defaultColorProperties = defaultColorProperties;
-var styleReset = ("\n" + getRootStyles(defaultColorProperties) + "\n\n.tapestry-react-reset {\n  appearance: none;\n  box-sizing: border-box;\n  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';\n  font-weight: 400;\n  text-decoration: none;\n  flex: 0 0 auto;\n  min-width: 0px;\n  min-height: 0px;\n  padding: 0px;\n  margin: 0px;\n  border: 0px solid transparent;\n  background-color: transparent;\n  color: inherit;\n}\n\n.tapestry-react-reset::-moz-focus-inner {\n  padding: 0px;\n  border: 0px;\n}\n\n.tapestry-react-reset:focus:not(.focus-visible) {\n  outline: 0px;\n}\n" // minify string
+var styleReset = ("\n" + getRootStyles(null, defaultColorProperties) + "\n\n.tapestry-react-reset {\n  appearance: none;\n  box-sizing: border-box;\n  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';\n  font-weight: 400;\n  text-decoration: none;\n  flex: 0 0 auto;\n  min-width: 0px;\n  min-height: 0px;\n  padding: 0px;\n  margin: 0px;\n  border: 0px solid transparent;\n  background-color: transparent;\n  color: inherit;\n}\n\n.tapestry-react-reset::-moz-focus-inner {\n  padding: 0px;\n  border: 0px;\n}\n\n.tapestry-react-reset:focus:not(.focus-visible) {\n  outline: 0px;\n}\n" // minify string
 ).replace(/\n/g, '').replace(/\s\s+/g, ' '); // we use our own global style implementation in place of Emotion Global
 // so we can have more control over when styles are injected since multiple
 // Providers can be used on a page
 
 exports.styleReset = styleReset;
 
-if (typeof window !== 'undefined' && !document.getElementById('tapestry-react-style')) {
-  var styleElement = document.createElement('style');
-  styleElement.id = 'tapestry-react-style';
-  styleElement.innerHTML = styleReset;
-  document.head.insertAdjacentElement('afterbegin', styleElement);
+function ensureStyleElement(themeId) {
+  // we use our own global style implementation in place of Emotion Global
+  // so we can have more control over when styles are injected since multiple
+  // Providers can be used on a page
+  if (typeof window !== 'undefined' && !document.getElementById("tapestry-react-style-" + themeId)) {
+    var styleElement = document.createElement('style');
+    styleElement.id = "tapestry-react-style-" + themeId;
+    styleElement.innerHTML = styleReset;
+    document.head.insertAdjacentElement('afterbegin', styleElement);
+  }
 }

package/dist/cjs/system/default-theme.js

@@ -23,6 +23,7 @@ var controlStyles = {
   checkedStroke: 'primary'
 };
 var defaultTheme = {
+  id: 'default',
   boxSizes: _boxSizes.boxSizes,
   colors: _colors.colors,
   icons: {

package/dist/esm/Button/Button.js

@@ -245,7 +245,7 @@ export function Button(_ref) {
     }
 
     if (type && restProps.as && restProps.as !== "button") {
-      throw Error("Tapestry-React: <Button/> type prop is only supported by <button> and not <" + restProps.as + ">.");
+      console.log("Tapestry-React: <Button/> type prop is only supported by <button> and not <" + restProps.as + ">.");
     }
   }
 

package/dist/esm/Checkbox/Checkbox.js

@@ -65,24 +65,8 @@ function Checkbox(_ref) {
         wrapperProps = _useAccessibilityViol.wrapperProps;
 
     useLayoutEffect(function () {
-      function findParent(node, findMatch) {
-        if (node && node !== document.documentElement) {
-          var matchFound = findMatch(node.parentNode);
-
-          if (matchFound) {
-            return node.parentNode;
-          } else {
-            return findParent(node.parentNode, findMatch);
-          }
-        } else {
-          return null;
-        }
-      }
-
       if (label === undefined) {
-        var labelParent = findParent(ref.current, function (parentNode) {
-          return parentNode.tagName === 'LABEL';
-        });
+        var labelParent = ref.current.closest('label') !== null;
 
         if (!labelParent) {
           setNeedsParentLabel(true);

package/dist/esm/Pagination/Pagination.js

@@ -14,7 +14,7 @@ import StackView from '../StackView';
 import { range } from '../utils';
 import { parseColor } from '../system/utils';
 import { useWindowWidth } from '@react-hook/window-size';
-import { useThemeValue } from '../system';
+import { useThemeValue, useThemeProps } from '../system';
 
 function getVisiblePages(currentPage, totalPages, visiblePages) {
   var start = Math.max(1, Math.min(totalPages - visiblePages + 1, Math.floor(currentPage - visiblePages / 2 + 1)));
@@ -59,9 +59,7 @@ var NavButton = function NavButton(_ref) {
 };
 
 export default function Pagination(_ref2) {
-  var _ref2$activeColor = _ref2.activeColor,
-      activeColor = _ref2$activeColor === void 0 ? '#5b8bf7' : _ref2$activeColor,
-      currentPage = _ref2.currentPage,
+  var currentPage = _ref2.currentPage,
       _ref2$onPageChange = _ref2.onPageChange,
       onPageChange = _ref2$onPageChange === void 0 ? function () {
     return null;
@@ -69,11 +67,19 @@ export default function Pagination(_ref2) {
       visiblePages = _ref2.visiblePages,
       _ref2$totalPages = _ref2.totalPages,
       totalPages = _ref2$totalPages === void 0 ? 0 : _ref2$totalPages,
-      restProps = _objectWithoutPropertiesLoose(_ref2, ["activeColor", "currentPage", "onPageChange", "visiblePages", "totalPages"]);
+      restProps = _objectWithoutPropertiesLoose(_ref2, ["currentPage", "onPageChange", "visiblePages", "totalPages"]);
 
   var _useThemeValue = useThemeValue('breakpoints'),
       xsBreakpoint = _useThemeValue.xs;
 
+  var _useThemeProps = useThemeProps('pagination', _objectSpread({}, restProps)),
+      _useThemeProps$active = _useThemeProps.activeColor,
+      activeColor = _useThemeProps$active === void 0 ? '#5b8bf7' : _useThemeProps$active,
+      navButtonProps = _useThemeProps.navButtonProps,
+      pageLinkProps = _useThemeProps.pageLinkProps,
+      activePageLinkProps = _useThemeProps.activePageLinkProps,
+      themeProps = _objectWithoutPropertiesLoose(_useThemeProps, ["activeColor", "navButtonProps", "pageLinkProps", "activePageLinkProps"]);
+
   var currentWidth = useWindowWidth();
 
   function renderGap(key) {
@@ -109,10 +115,10 @@ export default function Pagination(_ref2) {
       square: true,
       title: number,
       variant: isCurrentPage ? 'fill' : 'naked'
-    }, isCurrentPage && {
+    }, pageLinkProps, isCurrentPage && _objectSpread({
       backgroundColor: activeColor,
       color: '#fff'
-    }));
+    }, activePageLinkProps)));
   }
 
   function renderPageLinks() {
@@ -135,22 +141,22 @@ export default function Pagination(_ref2) {
       shrink: 0,
       spacing: 0.5,
       width: "100%"
-    }, restProps), /*#__PURE__*/React.createElement(Group, {
+    }, themeProps), /*#__PURE__*/React.createElement(Group, {
       spacing: 0.5
-    }, /*#__PURE__*/React.createElement(NavButton, {
+    }, /*#__PURE__*/React.createElement(NavButton, _extends({
       disabled: currentPage === 1,
       iconName: "general.leftChevron",
       onClick: onPageChange.bind(null, currentPage - 1),
       tooltip: {
         title: 'Previous Page'
       }
-    }), /*#__PURE__*/React.createElement(NavButton, {
+    }, navButtonProps)), /*#__PURE__*/React.createElement(NavButton, _extends({
       disabled: currentPage === totalPages,
       iconName: "general.rightChevron",
       onClick: onPageChange.bind(null, currentPage + 1),
       tooltip: {
         title: 'Next Page'
       }
-    })), renderPageLinks());
+    }, navButtonProps))), renderPageLinks());
   }
 }

package/dist/esm/ThemeProvider/ThemeProvider.js

@@ -12,7 +12,7 @@ import { merge } from 'lodash';
 import defaultTheme from '../system/default-theme';
 import { flattenPalette } from '../system';
 import { objectToCSSProperties, shallowEqual } from '../utils';
-import { setRootStyles, styleReset } from './styles';
+import { getThemeDataAttribute, setRootStyles, styleReset } from './styles';
 var STORAGE_KEY = 'tapestry-react-theme';
 export var cache = createCache({
   key: 'tapestry-react'
@@ -52,6 +52,8 @@ function mergeThemes(a, b) {
 }
 
 export function ThemeProvider(_ref) {
+  var _ref2;
+
   var _ref$theme = _ref.theme,
       theme = _ref$theme === void 0 ? emptyTheme : _ref$theme,
       children = _ref.children;
@@ -64,7 +66,7 @@ export function ThemeProvider(_ref) {
 
   useLayoutEffect(function () {
     var nextTheme = mergeThemes(defaultTheme, theme);
-    setRootStyles(objectToCSSProperties('colors', nextTheme.colors));
+    setRootStyles(nextTheme.id, objectToCSSProperties('colors', nextTheme.colors));
 
     if (!shallowEqual(mergedTheme, nextTheme)) {
       setMergedTheme(nextTheme);
@@ -74,7 +76,7 @@ export function ThemeProvider(_ref) {
     value: cache
   }, /*#__PURE__*/React.createElement(EmotionThemeProvider, {
     theme: mergedTheme
-  }, children));
+  }, /*#__PURE__*/React.createElement("div", (_ref2 = {}, _ref2["" + getThemeDataAttribute(mergedTheme.id)] = true, _ref2), children)));
 }
 ThemeProvider.cache = cache;
 ThemeProvider.setRootStyles = setRootStyles;

package/dist/esm/ThemeProvider/styles.js

@@ -1,29 +1,42 @@
 import { defaultTheme, flattenPalette } from '../system';
 import { objectToCSSProperties } from '../utils';
+export function getThemeDataAttribute(themeId) {
+  if (themeId) {
+    return "data-tapestry-react-theme-provider-" + themeId;
+  } else {
+    return 'data-tapestry-react-theme-provider';
+  }
+}
 
-var getRootStyles = function getRootStyles(styles) {
+var getRootStyles = function getRootStyles(id, styles) {
   var styleString = Object.keys(styles).map(function (key) {
     return key + ": " + styles[key];
   }).join('; ');
-  return ":root { " + styleString + " }";
+  return "[" + getThemeDataAttribute(id) + "] { " + styleString + " }";
 };
 
-export var setRootStyles = function setRootStyles(styles) {
-  var styleElement = document.getElementById('tapestry-react-style');
+export var setRootStyles = function setRootStyles(themeId, styles) {
+  ensureStyleElement(themeId);
+  var styleElement = document.getElementById("tapestry-react-style-" + themeId);
   var sheet = styleElement.sheet;
-  var styleString = getRootStyles(styles);
+  var styleString = getRootStyles(themeId, styles);
   sheet.deleteRule(0);
   sheet.insertRule(styleString, 0);
 };
 export var defaultColorProperties = objectToCSSProperties('colors', flattenPalette(defaultTheme.colors));
-export var styleReset = ("\n" + getRootStyles(defaultColorProperties) + "\n\n.tapestry-react-reset {\n  appearance: none;\n  box-sizing: border-box;\n  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';\n  font-weight: 400;\n  text-decoration: none;\n  flex: 0 0 auto;\n  min-width: 0px;\n  min-height: 0px;\n  padding: 0px;\n  margin: 0px;\n  border: 0px solid transparent;\n  background-color: transparent;\n  color: inherit;\n}\n\n.tapestry-react-reset::-moz-focus-inner {\n  padding: 0px;\n  border: 0px;\n}\n\n.tapestry-react-reset:focus:not(.focus-visible) {\n  outline: 0px;\n}\n" // minify string
+export var styleReset = ("\n" + getRootStyles(null, defaultColorProperties) + "\n\n.tapestry-react-reset {\n  appearance: none;\n  box-sizing: border-box;\n  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';\n  font-weight: 400;\n  text-decoration: none;\n  flex: 0 0 auto;\n  min-width: 0px;\n  min-height: 0px;\n  padding: 0px;\n  margin: 0px;\n  border: 0px solid transparent;\n  background-color: transparent;\n  color: inherit;\n}\n\n.tapestry-react-reset::-moz-focus-inner {\n  padding: 0px;\n  border: 0px;\n}\n\n.tapestry-react-reset:focus:not(.focus-visible) {\n  outline: 0px;\n}\n" // minify string
 ).replace(/\n/g, '').replace(/\s\s+/g, ' '); // we use our own global style implementation in place of Emotion Global
 // so we can have more control over when styles are injected since multiple
 // Providers can be used on a page
 
-if (typeof window !== 'undefined' && !document.getElementById('tapestry-react-style')) {
-  var styleElement = document.createElement('style');
-  styleElement.id = 'tapestry-react-style';
-  styleElement.innerHTML = styleReset;
-  document.head.insertAdjacentElement('afterbegin', styleElement);
+function ensureStyleElement(themeId) {
+  // we use our own global style implementation in place of Emotion Global
+  // so we can have more control over when styles are injected since multiple
+  // Providers can be used on a page
+  if (typeof window !== 'undefined' && !document.getElementById("tapestry-react-style-" + themeId)) {
+    var styleElement = document.createElement('style');
+    styleElement.id = "tapestry-react-style-" + themeId;
+    styleElement.innerHTML = styleReset;
+    document.head.insertAdjacentElement('afterbegin', styleElement);
+  }
 }

package/dist/esm/system/default-theme.js

@@ -1,5 +1,5 @@
-import * as general from "@planningcenter/icons/paths/general";
-import * as tapestry from "@planningcenter/icons/paths/tapestry";
+import * as general from '@planningcenter/icons/paths/general';
+import * as tapestry from '@planningcenter/icons/paths/tapestry';
 import { boxSizes } from './box-sizes';
 import { buttonThemes } from './button-themes';
 import { colors } from './colors';
@@ -11,6 +11,7 @@ var controlStyles = {
   checkedStroke: 'primary'
 };
 var defaultTheme = {
+  id: 'default',
   boxSizes: boxSizes,
   colors: colors,
   icons: {

package/dist/types/Pagination/Pagination.d.ts

@@ -2,15 +2,27 @@ export declare type PaginationProps = {
     /**
      * Change the color of the active page
      */
-    activeColor: string;
+    activeColor?: string;
+    /**
+     * Accepts any valid [Button](/button) props.
+     */
+    activePageLinkProps?: object;
     /**
      * Current visible page number
      */
     currentPage: number;
+    /**
+     * Accepts any valid [Button](/button) props.
+     */
+    navButtonProps?: object;
     /**
      * Callback when new page is requested
      */
     onPageChange: (nextPage: number) => undefined;
+    /**
+     * Accepts any valid [Button](/button) props.
+     */
+    pageLinkProps?: object;
     /**
      * Total available pages
      */
@@ -20,4 +32,4 @@ export declare type PaginationProps = {
      */
     visiblePages?: number;
 };
-export default function Pagination({ activeColor, currentPage, onPageChange, visiblePages, totalPages, ...restProps }: PaginationProps): JSX.Element;
+export default function Pagination({ currentPage, onPageChange, visiblePages, totalPages, ...restProps }: PaginationProps): JSX.Element;

package/dist/types/ThemeProvider/ThemeProvider.d.ts

@@ -13,7 +13,7 @@ export declare function ThemeProvider({ theme, children, }: {
 }): JSX.Element;
 export declare namespace ThemeProvider {
     var cache: import("@emotion/utils").EmotionCache;
-    var setRootStyles: (styles: any) => void;
+    var setRootStyles: (themeId: any, styles: any) => void;
     var styleReset: string;
     var themeInitializerScript: string;
     var themeStorage: {

package/dist/types/ThemeProvider/styles.d.ts

@@ -1,3 +1,4 @@
-export declare const setRootStyles: (styles: any) => void;
+export declare function getThemeDataAttribute(themeId: any): string;
+export declare const setRootStyles: (themeId: any, styles: any) => void;
 export declare const defaultColorProperties: any;
 export declare const styleReset: string;

package/dist/types/index.d.ts

@@ -184,6 +184,7 @@ export interface ButtonTheme {
 }
 
 export interface Theme {
+  id?: string
   boxSizes?: Record<keyof BoxSizes, BoxProps>
   breakpoints?: Partial<Breakpoints>
   button?: { themes?: { [key: string]: ButtonTheme } }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-react",
-  "version": "2.5.0",
+  "version": "2.6.0-rc.0",
   "description": "A collection of flexible React components to help you build resilient, accessible user interfaces quickly and effectively.",
   "author": "Front End Systems Engineering <frontend@pco.bz>",
   "main": "dist/cjs/index.js",

package/src/Button/Button.tsx

@@ -346,7 +346,7 @@ export function Button({
       (restProps as any).as &&
       (restProps as any).as !== "button"
     ) {
-      throw Error(
+      console.log(
         `Tapestry-React: <Button/> type prop is only supported by <button> and not <${(restProps as any).as}>.`
       )
     }

package/src/Checkbox/Checkbox.js

@@ -120,23 +120,9 @@ function Checkbox({
       `Tapestry-React: <Checkbox/> must define a "label" prop or have a parent that renders a label for proper accessibility.`
     )
     useLayoutEffect(() => {
-      function findParent(node, findMatch) {
-        if (node && node !== document.documentElement) {
-          const matchFound = findMatch(node.parentNode)
-          if (matchFound) {
-            return node.parentNode
-          } else {
-            return findParent(node.parentNode, findMatch)
-          }
-        } else {
-          return null
-        }
-      }
       if (label === undefined) {
-        const labelParent = findParent(
-          ref.current,
-          (parentNode) => parentNode.tagName === 'LABEL'
-        )
+        const labelParent = ref.current.closest('label') !== null
+
         if (!labelParent) {
           setNeedsParentLabel(true)
         }

package/src/Pagination/Pagination.mdx

@@ -2,6 +2,7 @@
 title: Pagination
 category: General
 propsSummary: Accepts [StackView](/stackview) props.
+themeKey: pagination
 ---
 
 ```jsx live

package/src/Pagination/Pagination.tsx

@@ -7,7 +7,7 @@ import StackView from '../StackView'
 import { range } from '../utils'
 import { parseColor } from '../system/utils'
 import { useWindowWidth } from '@react-hook/window-size'
-import { useThemeValue } from '../system'
+import { useThemeValue, useThemeProps } from '../system'
 
 function getVisiblePages(currentPage, totalPages, visiblePages) {
   const start = Math.max(
@@ -40,18 +40,33 @@ export type PaginationProps = {
   /**
    * Change the color of the active page
    */
-  activeColor: string
+  activeColor?: string
+
+  /**
+   * Accepts any valid [Button](/button) props.
+   */
+  activePageLinkProps?: object
 
   /**
    * Current visible page number
    */
   currentPage: number
 
+  /**
+   * Accepts any valid [Button](/button) props.
+   */
+  navButtonProps?: object
+
   /**
    * Callback when new page is requested
    */
   onPageChange: (nextPage: number) => undefined
 
+  /**
+   * Accepts any valid [Button](/button) props.
+   */
+  pageLinkProps?: object
+
   /**
    * Total available pages
    */
@@ -83,7 +98,6 @@ const NavButton = ({ disabled, iconName, ...props }) => {
 }
 
 export default function Pagination({
-  activeColor = '#5b8bf7',
   currentPage,
   onPageChange = () => null,
   visiblePages,
@@ -91,6 +105,13 @@ export default function Pagination({
   ...restProps
 }: PaginationProps) {
   const { xs: xsBreakpoint } = useThemeValue('breakpoints')
+  const {
+    activeColor = '#5b8bf7',
+    navButtonProps,
+    pageLinkProps,
+    activePageLinkProps,
+    ...themeProps
+  } = useThemeProps('pagination', { ...restProps })
 
   const currentWidth = useWindowWidth()
 
@@ -123,7 +144,12 @@ export default function Pagination({
         square
         title={number}
         variant={isCurrentPage ? 'fill' : 'naked'}
-        {...(isCurrentPage && { backgroundColor: activeColor, color: '#fff' })}
+        {...pageLinkProps}
+        {...(isCurrentPage && {
+          backgroundColor: activeColor,
+          color: '#fff',
+          ...activePageLinkProps,
+        })}
       />
     )
   }
@@ -150,7 +176,7 @@ export default function Pagination({
         shrink={0}
         spacing={0.5}
         width="100%"
-        {...restProps}
+        {...themeProps}
       >
         <Group spacing={0.5}>
           <NavButton
@@ -158,12 +184,14 @@ export default function Pagination({
             iconName="general.leftChevron"
             onClick={onPageChange.bind(null, currentPage - 1)}
             tooltip={{ title: 'Previous Page' }}
+            {...navButtonProps}
           />
           <NavButton
             disabled={currentPage === totalPages}
             iconName="general.rightChevron"
             onClick={onPageChange.bind(null, currentPage + 1)}
             tooltip={{ title: 'Next Page' }}
+            {...navButtonProps}
           />
         </Group>
         {renderPageLinks()}

package/src/ThemeProvider/ThemeProvider.tsx

@@ -8,7 +8,7 @@ import defaultTheme from '../system/default-theme'
 import { flattenPalette } from '../system'
 import { Theme } from '../index'
 import { objectToCSSProperties, shallowEqual } from '../utils'
-import { setRootStyles, styleReset } from './styles'
+import { getThemeDataAttribute, setRootStyles, styleReset } from './styles'
 
 const STORAGE_KEY = 'tapestry-react-theme'
 
@@ -65,7 +65,10 @@ export function ThemeProvider({
   )
   useLayoutEffect(() => {
     const nextTheme = mergeThemes(defaultTheme, theme)
-    setRootStyles(objectToCSSProperties('colors', nextTheme.colors))
+    setRootStyles(
+      nextTheme.id,
+      objectToCSSProperties('colors', nextTheme.colors)
+    )
     if (!shallowEqual(mergedTheme, nextTheme)) {
       setMergedTheme(nextTheme)
     }
@@ -73,7 +76,9 @@ export function ThemeProvider({
   return (
     <CacheProvider value={cache}>
       <EmotionThemeProvider theme={mergedTheme}>
-        {children}
+        <div {...{ [`${getThemeDataAttribute(mergedTheme.id)}`]: true }}>
+          {children}
+        </div>
       </EmotionThemeProvider>
     </CacheProvider>
   )

package/src/ThemeProvider/styles.ts

@@ -1,17 +1,30 @@
 import { defaultTheme, flattenPalette } from '../system'
 import { objectToCSSProperties } from '../utils'
 
-const getRootStyles = (styles) => {
+export function getThemeDataAttribute(themeId) {
+  if (themeId) {
+    return `data-tapestry-react-theme-provider-${themeId}`
+  } else {
+    return 'data-tapestry-react-theme-provider'
+  }
+}
+
+const getRootStyles = (id, styles) => {
   const styleString = Object.keys(styles)
     .map((key) => `${key}: ${styles[key]}`)
     .join('; ')
-  return `:root { ${styleString} }`
+
+  return `[${getThemeDataAttribute(id)}] { ${styleString} }`
 }
 
-export const setRootStyles = (styles) => {
-  const styleElement = <HTMLStyleElement>document.getElementById('tapestry-react-style')
+export const setRootStyles = (themeId, styles) => {
+  ensureStyleElement(themeId)
+  const styleElement = <HTMLStyleElement>(
+    document.getElementById(`tapestry-react-style-${themeId}`)
+  )
+
   const sheet = <CSSStyleSheet>styleElement.sheet
-  const styleString = getRootStyles(styles)
+  const styleString = getRootStyles(themeId, styles)
   sheet.deleteRule(0)
   sheet.insertRule(styleString, 0)
 }
@@ -22,7 +35,7 @@ export const defaultColorProperties = objectToCSSProperties(
 )
 
 export const styleReset = `
-${getRootStyles(defaultColorProperties)}
+${getRootStyles(null, defaultColorProperties)}
 
 .tapestry-react-reset {
   appearance: none;
@@ -56,9 +69,17 @@ ${getRootStyles(defaultColorProperties)}
 // we use our own global style implementation in place of Emotion Global
 // so we can have more control over when styles are injected since multiple
 // Providers can be used on a page
-if (typeof window !== 'undefined' && !document.getElementById('tapestry-react-style')) {
-  const styleElement = document.createElement('style')
-  styleElement.id = 'tapestry-react-style'
-  styleElement.innerHTML = styleReset
-  document.head.insertAdjacentElement('afterbegin', styleElement)
+function ensureStyleElement(themeId) {
+  // we use our own global style implementation in place of Emotion Global
+  // so we can have more control over when styles are injected since multiple
+  // Providers can be used on a page
+  if (
+    typeof window !== 'undefined' &&
+    !document.getElementById(`tapestry-react-style-${themeId}`)
+  ) {
+    const styleElement = document.createElement('style')
+    styleElement.id = `tapestry-react-style-${themeId}`
+    styleElement.innerHTML = styleReset
+    document.head.insertAdjacentElement('afterbegin', styleElement)
+  }
 }

package/src/index.d.ts

@@ -184,6 +184,7 @@ export interface ButtonTheme {
 }
 
 export interface Theme {
+  id?: string
   boxSizes?: Record<keyof BoxSizes, BoxProps>
   breakpoints?: Partial<Breakpoints>
   button?: { themes?: { [key: string]: ButtonTheme } }

package/src/system/default-theme.ts

@@ -1,5 +1,5 @@
-import * as general from "@planningcenter/icons/paths/general"
-import * as tapestry from "@planningcenter/icons/paths/tapestry"
+import * as general from '@planningcenter/icons/paths/general'
+import * as tapestry from '@planningcenter/icons/paths/tapestry'
 
 import { Theme } from '../index'
 
@@ -16,6 +16,7 @@ const controlStyles = {
 }
 
 const defaultTheme: Theme = {
+  id: 'default',
   boxSizes,
   colors,
   icons: {