Omitting compact Button prop when passing through props

mongodb · Nov 1, 2024 · 7a8b60c · 7a8b60c
1 parent 51f85c2
commit 7a8b60c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/.changeset/mean-gorillas-dance.md b/.changeset/mean-gorillas-dance.md
@@ -0,0 +1,10 @@
+---
+'@leafygreen-ui/confirmation-modal': patch
+'@lg-chat/message-feedback': patch
+'@leafygreen-ui/number-input': patch
+'@leafygreen-ui/split-button': patch
+'@leafygreen-ui/form-footer': patch
+'@leafygreen-ui/code': patch
+---
+
+Omitting `compact` Button prop when passing through props
diff --git a/chat/message-feedback/src/InlineMessageFeedback/InlineMessageFeedback.types.ts b/chat/message-feedback/src/InlineMessageFeedback/InlineMessageFeedback.types.ts
@@ -23,7 +23,7 @@ export type InlineMessageFeedbackProps = Required<
     /**
      * Override props for the cancel Button
      */
-    cancelButtonProps?: ButtonProps;
+    cancelButtonProps?: Omit<ButtonProps, 'compact'>;
 
     /**
      * Text displayed inside the submit Button
@@ -35,7 +35,7 @@ export type InlineMessageFeedbackProps = Required<
     /**
      * Override props for the submit Button
      */
-    submitButtonProps?: ButtonProps;
+    submitButtonProps?: Omit<ButtonProps, 'compact'>;
 
     /**
      * Event handler called when the form is submitted

diff --git a/packages/code/src/CustomSelectMenuButton/CustomSelectMenuButton.tsx b/packages/code/src/CustomSelectMenuButton/CustomSelectMenuButton.tsx
@@ -9,10 +9,8 @@ import Button, { ButtonProps } from '@leafygreen-ui/button';
  * @internal
  */
 export const CustomSelectMenuButton = React.forwardRef(
-  ({ children, ...props }: ButtonProps, ref) => (
-    <Button {...props} ref={ref}>
-      {children}
-    </Button>
+  (props: ButtonProps, ref) => (
+    <Button {...props} ref={ref} />
   ),
 );
 

diff --git a/packages/confirmation-modal/src/ConfirmationModal/ConfirmationModal.types.ts b/packages/confirmation-modal/src/ConfirmationModal/ConfirmationModal.types.ts
@@ -11,9 +11,9 @@ export type Variant = (typeof Variant)[keyof typeof Variant];
 interface CustomButtonOnClick {
   onClick?: () => void;
 }
-type CustomConfirmButtonProps = Omit<ButtonProps, 'variant' | 'onClick'> &
+type CustomConfirmButtonProps = Omit<ButtonProps, 'variant' | 'onClick' | 'compact'> &
   CustomButtonOnClick;
-type CustomCancelButtonProps = Omit<ButtonProps, 'onClick' | 'children'> &
+type CustomCancelButtonProps = Omit<ButtonProps, 'onClick' | 'children' | 'compact'> &
   CustomButtonOnClick;
 
 export interface ConfirmationModalProps extends Omit<ModalProps, 'size'> {

diff --git a/packages/form-footer/src/FormFooter.types.ts b/packages/form-footer/src/FormFooter.types.ts
@@ -3,14 +3,14 @@ import { DarkModeProps, HTMLElementProps } from '@leafygreen-ui/lib';
 
 import { PrimaryButtonProps } from './PrimaryButton';
 
-type ButtonPropsOmittingVariant = Omit<ButtonProps, 'variant'>;
+type ButtonPropsOmittingVariantAndCompact = Omit<ButtonProps, 'variant' | 'compact'>;
 type ButtonPropsWithRequiredChildren = Required<Pick<ButtonProps, 'children'>>;
 
-export type CustomCancelButtonProps = ButtonPropsOmittingVariant;
-export type CustomBackButtonProps = ButtonPropsOmittingVariant & {
+export type CustomCancelButtonProps = ButtonPropsOmittingVariantAndCompact;
+export type CustomBackButtonProps = ButtonPropsOmittingVariantAndCompact & {
   variant?: Extract<Variant, 'default' | 'dangerOutline'>;
 };
-export type CustomPrimaryButtonProps = ButtonPropsOmittingVariant &
+export type CustomPrimaryButtonProps = ButtonPropsOmittingVariantAndCompact &
   ButtonPropsWithRequiredChildren & {
     variant?: Extract<Variant, 'primary' | 'danger'>;
   };

diff --git a/packages/number-input/src/UnitSelectButton/UnitSelectButton.types.ts b/packages/number-input/src/UnitSelectButton/UnitSelectButton.types.ts
@@ -12,5 +12,5 @@ export type UnitSelectButtonProps = {
    * The select option that is shown in the select menu button.
    */
   displayName?: string;
-} & ButtonProps &
+} & Omit<ButtonProps, 'compact'> &
   PopoverProps;
diff --git a/packages/split-button/src/SplitButton/SplitButton.types.ts b/packages/split-button/src/SplitButton/SplitButton.types.ts
@@ -117,7 +117,7 @@ export interface MenuProps extends SelectedMenuProps {
 
 export interface SplitButtonProps
   extends DarkModeProps,
-    ButtonProps,
+    Omit<ButtonProps, 'compact'>,
     MenuProps {
   /**
    * Sets the variant for both Buttons.