diff --git a/packages/grafana-ui/src/components/Layout/Box/Box.tsx b/packages/grafana-ui/src/components/Layout/Box/Box.tsx index 32bc6ce8ec9..97a9f54abda 100644 --- a/packages/grafana-ui/src/components/Layout/Box/Box.tsx +++ b/packages/grafana-ui/src/components/Layout/Box/Box.tsx @@ -14,7 +14,7 @@ export type BorderColor = keyof GrafanaTheme2['colors']['border'] | 'error' | 's export type BorderRadius = keyof ThemeShape['radius']; export type BoxShadow = keyof ThemeShadows; -interface BoxProps { +interface BoxProps extends Omit, 'className' | 'style'> { // Margin props /** Sets the property `margin` */ margin?: ResponsiveProp; @@ -96,6 +96,7 @@ export const Box = forwardRef>((props, alignItems, boxShadow, element, + ...rest } = props; const styles = useStyles2( getStyles, @@ -127,7 +128,7 @@ export const Box = forwardRef>((props, const Element = element ?? 'div'; return ( - + {children} ); diff --git a/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx b/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx index 11cf9208205..b54bce575b4 100644 --- a/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx +++ b/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx @@ -33,7 +33,7 @@ export type Direction = 'row' | 'row-reverse' | 'column' | 'column-reverse'; export type Wrap = 'nowrap' | 'wrap' | 'wrap-reverse'; -interface FlexProps { +interface FlexProps extends Omit, 'className' | 'style'> { gap?: ResponsiveProp; alignItems?: ResponsiveProp; justifyContent?: ResponsiveProp; @@ -43,11 +43,11 @@ interface FlexProps { } export const Flex = React.forwardRef( - ({ gap = 1, alignItems, justifyContent, direction, wrap, children }, ref) => { + ({ gap = 1, alignItems, justifyContent, direction, wrap, children, ...rest }, ref) => { const styles = useStyles2(getStyles, gap, alignItems, justifyContent, direction, wrap); return ( -
+
{children}
); diff --git a/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx b/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx index 00be87bda87..2ed66247af6 100644 --- a/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx +++ b/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx @@ -5,7 +5,7 @@ import { GrafanaTheme2, ThemeSpacingTokens } from '@grafana/data'; import { useStyles2 } from '../../../themes'; -interface GridProps extends Omit, 'className'> { +interface GridProps extends Omit, 'className' | 'style'> { children: NonNullable; /** Specifies the gutters between columns and rows. It is overwritten when a column or row gap has a value */ diff --git a/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx b/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx index cfeb9cb729d..57944ad2946 100644 --- a/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx +++ b/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx @@ -6,12 +6,15 @@ import { ResponsiveProp } from '../utils/responsiveness'; import { Stack } from './Stack'; -export const HorizontalStack = React.forwardRef< - HTMLDivElement, - React.PropsWithChildren<{ gap?: ResponsiveProp }> ->(({ children, gap = 1 }, ref) => ( - - {children} - -)); +interface HorizontalStackProps extends Omit, 'className' | 'style'> { + gap?: ResponsiveProp; +} + +export const HorizontalStack = React.forwardRef>( + ({ children, gap = 1, ...rest }, ref) => ( + + {children} + + ) +); HorizontalStack.displayName = 'HorizontalStack'; diff --git a/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx b/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx index 2395610b3a1..848ff8bd01a 100644 --- a/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx +++ b/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx @@ -4,15 +4,15 @@ import { ThemeSpacingTokens } from '@grafana/data'; import { Flex } from '../Flex/Flex'; import { ResponsiveProp } from '../utils/responsiveness'; -interface StackProps { +interface StackProps extends Omit, 'className' | 'style'> { direction?: ResponsiveProp<'column' | 'row'>; gap?: ResponsiveProp; } export const Stack = React.forwardRef>( - ({ gap = 1, direction = 'column', children }, ref) => { + ({ gap = 1, direction = 'column', children, ...rest }, ref) => { return ( - + {React.Children.map(children, (child) => (
{child}
))}