Merge branch 'main' into combobox/fix-disable-select

twilio-labs · Jun 5, 2023 · 30c21cc · 30c21cc
2 parents 7ee3189 + 9e5b3b7
commit 30c21cc
Show file tree

Hide file tree

Showing 38 changed files with 1,364 additions and 128 deletions.
diff --git a/.changeset/forty-insects-eat.md b/.changeset/forty-insects-eat.md
@@ -0,0 +1,6 @@
+---
+'@twilio-paste/button': patch
+'@twilio-paste/core': patch
+---
+
+[Button] allow passing all style props to Button with variant="reset", effectively making it a Button primitive.
diff --git a/.changeset/fresh-grapes-drop.md b/.changeset/fresh-grapes-drop.md
@@ -0,0 +1,6 @@
+---
+'@twilio-paste/sidebar': minor
+'@twilio-paste/core': minor
+---
+
+[Sidebar] add SidebarNavigation and all relevant sub-components
diff --git a/.changeset/moody-deers-obey.md b/.changeset/moody-deers-obey.md
@@ -0,0 +1,6 @@
+---
+'@twilio-paste/core': patch
+'@twilio-paste/design-tokens': patch
+---
+
+[Design tokens] update the `shadowFocusInverseInset` token in the `twilio` and `twilio-dark` themes
diff --git a/.changeset/new-wolves-crash.md b/.changeset/new-wolves-crash.md
@@ -0,0 +1,6 @@
+---
+'@twilio-paste/codemods': patch
+'@twilio-paste/core': patch
+---
+
+[Codemods] add SidebarNavigation components
diff --git a/.changeset/tiny-poems-smash.md b/.changeset/tiny-poems-smash.md
@@ -0,0 +1,5 @@
+---
+'@twilio-paste/icons': patch
+---
+
+[Icons] apply `flex-shrink: 0` to IconWrapper by default, as we never want icons to be compressed unexpectedly
diff --git a/packages/paste-codemods/tools/.cache/mappings.json b/packages/paste-codemods/tools/.cache/mappings.json
@@ -226,8 +226,15 @@
   "SidebarHeader": "@twilio-paste/core/sidebar",
   "SidebarHeaderIconButton": "@twilio-paste/core/sidebar",
   "SidebarHeaderLabel": "@twilio-paste/core/sidebar",
+  "SidebarNavigation": "@twilio-paste/core/sidebar",
+  "SidebarNavigationDisclosure": "@twilio-paste/core/sidebar",
+  "SidebarNavigationDisclosureContent": "@twilio-paste/core/sidebar",
+  "SidebarNavigationDisclosureHeading": "@twilio-paste/core/sidebar",
+  "SidebarNavigationDisclosureHeadingWrapper": "@twilio-paste/core/sidebar",
+  "SidebarNavigationItem": "@twilio-paste/core/sidebar",
   "SidebarOverlayContentWrapper": "@twilio-paste/core/sidebar",
   "SidebarPushContentWrapper": "@twilio-paste/core/sidebar",
+  "useSidebarNavigationDisclosureState": "@twilio-paste/core/sidebar",
   "SkeletonLoader": "@twilio-paste/core/skeleton-loader",
   "Spinner": "@twilio-paste/core/spinner",
   "StatusBadge": "@twilio-paste/core/status",

diff --git a/packages/paste-core/components/button/src/ResetButton.tsx b/packages/paste-core/components/button/src/ResetButton.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type {BoxStyleProps} from '@twilio-paste/box';
-import {Box, safelySpreadBoxProps} from '@twilio-paste/box';
+import {Box} from '@twilio-paste/box';
 import merge from 'deepmerge';
 
 import {SizeStyles, BaseStyles} from './styles';
@@ -29,9 +29,9 @@ const ResetButton = React.forwardRef<HTMLButtonElement, DirectButtonProps>(
       <Box
         ref={ref}
         width={fullWidth ? '100%' : 'auto'}
-        {...safelySpreadBoxProps(props)}
         {...ButtonStyleMapping[buttonState]}
         {...SizeStyles[size]}
+        {...(props as any)}
       />
     );
   }

diff --git a/packages/paste-core/components/button/src/index.tsx b/packages/paste-core/components/button/src/index.tsx
@@ -153,6 +153,7 @@ const ButtonContents: React.FC<React.PropsWithChildren<ButtonContentsProps>> = (
         justifyContent={buttonVariantHasBoundingBox ? null : 'center'}
         columnGap="space20"
         alignItems="center"
+        width="100%"
       >
         {children}
       </Box>