@planningcenter/tapestry-react 2.4.0 → 2.5.1

package/dist/cjs/Button/Button.js

@@ -54,8 +54,10 @@ function Button(_ref) {
       title = _ref.title,
       to = _ref.to,
       tooltip = _ref.tooltip,
+      _ref$type = _ref.type,
+      type = _ref$type === void 0 ? 'button' : _ref$type,
       variant = _ref.variant,
-      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_ref, ["children", "disabled", "external", "icon", "iconLeft", "iconRight", "onClick", "onKeyDown", "size", "spinner", "square", "theme", "title", "to", "tooltip", "variant"]);
+      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_ref, ["children", "disabled", "external", "icon", "iconLeft", "iconRight", "onClick", "onKeyDown", "size", "spinner", "square", "theme", "title", "to", "tooltip", "type", "variant"]);
   var buttonThemes = (0, _system.useThemeValue)('button.themes');
 
   var _useBoxSize = (0, _system.useBoxSize)(size),
@@ -80,7 +82,8 @@ function Button(_ref) {
     strokeAlign: 'inside',
     strokeWeight: 1,
     userSelect: 'none',
-    zIndex: 1
+    zIndex: 1,
+    type: type
   };
   var spinnerColor;
 
@@ -229,12 +232,13 @@ function Button(_ref) {
 
 
   if (restProps.as) {
-    buttonProps.to = to;
-  } // set button type to prevent nested buttons from unintentionally submiting forms 
+    buttonProps.to = to; // remove type if it is not a button
 
-
-  if (buttonProps.as === "button") {
-    buttonProps.type = "button";
+    if (restProps.as !== "button") {
+      buttonProps = _objectSpread(_objectSpread({}, buttonProps), {}, {
+        type: null
+      });
+    }
   }
 
   if (process.env.NODE_ENV !== 'production') {
@@ -255,8 +259,8 @@ function Button(_ref) {
       restProps = (0, _utils.mergeProps)(restProps, wrapperProps);
     }
 
-    if (restProps['type'] === 'submit') {
-      throw Error("Tapestry-React: <Button/> does not support type=\"submit\" please add an explicit onClick handler.");
+    if (type && restProps.as && restProps.as !== "button") {
+      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/esm/Button/Button.js

@@ -46,8 +46,10 @@ export function Button(_ref) {
       title = _ref.title,
       to = _ref.to,
       tooltip = _ref.tooltip,
+      _ref$type = _ref.type,
+      type = _ref$type === void 0 ? 'button' : _ref$type,
       variant = _ref.variant,
-      restProps = _objectWithoutPropertiesLoose(_ref, ["children", "disabled", "external", "icon", "iconLeft", "iconRight", "onClick", "onKeyDown", "size", "spinner", "square", "theme", "title", "to", "tooltip", "variant"]);
+      restProps = _objectWithoutPropertiesLoose(_ref, ["children", "disabled", "external", "icon", "iconLeft", "iconRight", "onClick", "onKeyDown", "size", "spinner", "square", "theme", "title", "to", "tooltip", "type", "variant"]);
 
   var buttonThemes = useThemeValue('button.themes');
 
@@ -73,7 +75,8 @@ export function Button(_ref) {
     strokeAlign: 'inside',
     strokeWeight: 1,
     userSelect: 'none',
-    zIndex: 1
+    zIndex: 1,
+    type: type
   };
   var spinnerColor;
 
@@ -222,12 +225,13 @@ export function Button(_ref) {
 
 
   if (restProps.as) {
-    buttonProps.to = to;
-  } // set button type to prevent nested buttons from unintentionally submiting forms 
+    buttonProps.to = to; // remove type if it is not a button
 
-
-  if (buttonProps.as === "button") {
-    buttonProps.type = "button";
+    if (restProps.as !== "button") {
+      buttonProps = _objectSpread(_objectSpread({}, buttonProps), {}, {
+        type: null
+      });
+    }
   }
 
   if (process.env.NODE_ENV !== 'production') {
@@ -240,8 +244,8 @@ export function Button(_ref) {
       restProps = mergeProps(restProps, wrapperProps);
     }
 
-    if (restProps['type'] === 'submit') {
-      throw Error("Tapestry-React: <Button/> does not support type=\"submit\" please add an explicit onClick handler.");
+    if (type && restProps.as && restProps.as !== "button") {
+      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/types/Button/Button.d.ts

@@ -64,6 +64,10 @@ declare type ButtonProps = {
      * Wraps button in a [`<Tooltip />`](./tooltip). Accepts any valid Tooltip props.
      */
     tooltip?: string | Object;
+    /**
+     * Sets the button type to `button`, `submit`, or `reset`. Default is `button`. Type is only valid for `<button>`s.
+     */
+    type?: 'button' | 'submit' | 'reset';
     /**
      * Determines the modified style of the button.
      */
@@ -74,7 +78,7 @@ declare type ButtonProps = {
     mediaQueries?: object;
 } & StackViewProps;
 declare type Props = React.RefAttributes<any> & React.HTMLAttributes<any> & ButtonProps & MediaQueries<ButtonProps>;
-export declare function Button({ children, disabled, external, icon, iconLeft, iconRight, onClick, onKeyDown, size, spinner, square, theme, title, to, tooltip, variant, ...restProps }: Props): JSX.Element;
+export declare function Button({ children, disabled, external, icon, iconLeft, iconRight, onClick, onKeyDown, size, spinner, square, theme, title, to, tooltip, type, variant, ...restProps }: Props): JSX.Element;
 export declare namespace Button {
     var Input: React.ForwardRefExoticComponent<Pick<React.RefAttributes<any> & React.HTMLAttributes<any> & {
         children: React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any>) | (new (props: any) => React.Component<any, any, any>)> | ((inputProps: {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-react",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "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

@@ -91,6 +91,11 @@ type ButtonProps = {
    */
   tooltip?: string | Object
 
+  /**
+   * Sets the button type to `button`, `submit`, or `reset`. Default is `button`. Type is only valid for `<button>`s.
+   */
+  type?: 'button' | 'submit' | 'reset'
+
   /**
    * Determines the modified style of the button.
    */
@@ -125,6 +130,7 @@ export function Button({
   title,
   to,
   tooltip,
+  type = 'button',
   variant,
   ...restProps
 }: Props) {
@@ -153,6 +159,7 @@ export function Button({
     strokeWeight: 1,
     userSelect: 'none',
     zIndex: 1,
+    type,
   }
 
   let spinnerColor
@@ -296,11 +303,14 @@ export function Button({
   // pass to if as is defined
   if ((restProps as any).as) {
     buttonProps.to = to
-  }
 
-  // set button type to prevent nested buttons from unintentionally submiting forms 
-  if (buttonProps.as === "button") {
-    buttonProps.type = "button"
+    // remove type if it is not a button
+    if ((restProps as any).as !== "button") {
+      buttonProps = {
+        ...buttonProps,
+        type: null,
+      }
+    }
   }
 
   if (process.env.NODE_ENV !== 'production') {
@@ -330,9 +340,14 @@ export function Button({
       tooltip = tooltipProps
       restProps = mergeProps(restProps, wrapperProps)
     }
-    if (restProps['type'] === 'submit') {
-      throw Error(
-        `Tapestry-React: <Button/> does not support type="submit" please add an explicit onClick handler.`
+
+    if (
+      type &&
+      (restProps as any).as &&
+      (restProps as any).as !== "button"
+    ) {
+      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()}