@planningcenter/tapestry-react 2.9.0-rc.3 → 2.9.0-rc.4

package/dist/cjs/Button/Button.js

@@ -198,9 +198,9 @@ function Button(_ref) {
     buttonProps.hover = undefined;
     buttonProps.active = undefined;
   } else {
-    buttonProps.focus = {
+    buttonProps.focus = _objectSpread(_objectSpread({}, buttonProps.focus), {}, {
       zIndex: 5
-    };
+    });
     buttonProps.cursor = 'pointer';
     buttonProps.touchAction = 'manipulation';
     buttonProps.onClick = onClick;
@@ -250,7 +250,7 @@ function Button(_ref) {
   if (restProps.as) {
     buttonProps.to = to; // remove type if it is not a button
 
-    if (restProps.as !== "button") {
+    if (restProps.as !== 'button') {
       buttonProps = _objectSpread(_objectSpread({}, buttonProps), {}, {
         type: null
       });
@@ -275,7 +275,7 @@ function Button(_ref) {
       restProps = (0, _utils.mergeProps)(restProps, wrapperProps);
     }
 
-    if (buttonProps.type && restProps.as && restProps.as !== "button") {
+    if (buttonProps.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/Button/Button.js

@@ -191,9 +191,9 @@ export function Button(_ref) {
     buttonProps.hover = undefined;
     buttonProps.active = undefined;
   } else {
-    buttonProps.focus = {
+    buttonProps.focus = _objectSpread(_objectSpread({}, buttonProps.focus), {}, {
       zIndex: 5
-    };
+    });
     buttonProps.cursor = 'pointer';
     buttonProps.touchAction = 'manipulation';
     buttonProps.onClick = onClick;
@@ -243,7 +243,7 @@ export function Button(_ref) {
   if (restProps.as) {
     buttonProps.to = to; // remove type if it is not a button
 
-    if (restProps.as !== "button") {
+    if (restProps.as !== 'button') {
       buttonProps = _objectSpread(_objectSpread({}, buttonProps), {}, {
         type: null
       });
@@ -260,7 +260,7 @@ export function Button(_ref) {
       restProps = mergeProps(restProps, wrapperProps);
     }
 
-    if (buttonProps.type && restProps.as && restProps.as !== "button") {
+    if (buttonProps.type && restProps.as && restProps.as !== 'button') {
       console.log("Tapestry-React: <Button/> type prop is only supported by <button> and not <" + restProps.as + ">.");
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-react",
-  "version": "2.9.0-rc.3",
+  "version": "2.9.0-rc.4",
   "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

@@ -258,7 +258,7 @@ export function Button({
     buttonProps.opacity = 0.65
     buttonProps['aria-disabled'] = true
     buttonProps.cursor = 'not-allowed'
-    buttonProps.onClick = (event) =>  event.preventDefault()
+    buttonProps.onClick = (event) => event.preventDefault()
     buttonProps.onKeyDown = (event) => {
       if (event.key === 'Enter' || event.key === ' ') {
         event.preventDefault()
@@ -271,7 +271,7 @@ export function Button({
     buttonProps.hover = undefined
     buttonProps.active = undefined
   } else {
-    buttonProps.focus = { zIndex: 5 }
+    buttonProps.focus = { ...buttonProps.focus, zIndex: 5 }
     buttonProps.cursor = 'pointer'
     buttonProps.touchAction = 'manipulation'
     buttonProps.onClick = onClick
@@ -323,7 +323,7 @@ export function Button({
     buttonProps.to = to
 
     // remove type if it is not a button
-    if ((restProps as any).as !== "button") {
+    if ((restProps as any).as !== 'button') {
       buttonProps = {
         ...buttonProps,
         type: null,
@@ -362,10 +362,12 @@ export function Button({
     if (
       buttonProps.type &&
       (restProps as any).as &&
-      (restProps as any).as !== "button"
+      (restProps as any).as !== 'button'
     ) {
       console.log(
-        `Tapestry-React: <Button/> type prop is only supported by <button> and not <${(restProps as any).as}>.`
+        `Tapestry-React: <Button/> type prop is only supported by <button> and not <${
+          (restProps as any).as
+        }>.`
       )
     }
   }