fix(suite): Fix Card frame props (#14498)

trezor · Sep 24, 2024 · 7826b23 · 7826b23
1 parent 383ceb8
commit 7826b23
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/packages/components/src/components/Card/Card.tsx b/packages/components/src/components/Card/Card.tsx
@@ -106,19 +106,24 @@ const CardContainer = styled.div<
  ${withFrameProps}
 `;
 
-export type CardProps = AllowedFrameProps &
- AccessibilityProps & {
- paddingType?: PaddingType;
- onMouseEnter?: HTMLAttributes<HTMLDivElement>['onMouseEnter'];
- onMouseLeave?: HTMLAttributes<HTMLDivElement>['onMouseLeave'];
- onClick?: HTMLAttributes<HTMLDivElement>['onClick'];
- children?: ReactNode;
- className?: string;
- label?: ReactNode;
- forceElevation?: Elevation;
- };
+type CommonCardProps = AccessibilityProps & {
+ paddingType?: PaddingType;
+ onMouseEnter?: HTMLAttributes<HTMLDivElement>['onMouseEnter'];
+ onMouseLeave?: HTMLAttributes<HTMLDivElement>['onMouseLeave'];
+ onClick?: HTMLAttributes<HTMLDivElement>['onClick'];
+ children?: ReactNode;
+ className?: string;
+ label?: ReactNode;
+ forceElevation?: Elevation;
+};
 
-const CardComponent = forwardRef<HTMLDivElement, CardProps & { $paddingType: PaddingType }>(
+export type CardPropsWithTransientProps = CommonCardProps & TransientProps<AllowedFrameProps>;
+export type CardProps = CommonCardProps & AllowedFrameProps;
+
+const CardComponent = forwardRef<
+ HTMLDivElement,
+ CardPropsWithTransientProps & { $paddingType: PaddingType }
+>(
  (
  {
  children,
@@ -129,6 +134,7 @@ const CardComponent = forwardRef<HTMLDivElement, CardProps & { $paddingType: Pad
  onMouseLeave,
  className,
  tabIndex,
+ ...rest
  },
  ref,
  ) => {
@@ -145,6 +151,7 @@ const CardComponent = forwardRef<HTMLDivElement, CardProps & { $paddingType: Pad
  className={className}
  onMouseLeave={onMouseLeave}
  {...withAccessibilityProps({ tabIndex })}
+ {...rest}
  >
  <ElevationContext baseElevation={elevation}>{children}</ElevationContext>
  </CardContainer>