Merge branch 'master' into v11_rc

Author: balzss

packages/ui-buttons/src/CondensedButton/index.tsx

@@ -53,7 +53,8 @@ class CondensedButton extends Component<CondensedButtonProps> {
     interaction: undefined,
     color: 'primary',
     margin: '0',
-    cursor: 'pointer'
+    cursor: 'pointer',
+    display: 'inline-block'
   }
 
   _baseButton: BaseButton | null = null
@@ -91,6 +92,7 @@ class CondensedButton extends Component<CondensedButtonProps> {
       cursor,
       href,
       renderIcon,
+      display,
       ...props
     } = this.props
 
@@ -100,6 +102,7 @@ class CondensedButton extends Component<CondensedButtonProps> {
       <BaseButton
         {...passthroughProps(props)}
         isCondensed
+        display={display}
         withBackground={false}
         withBorder={false}
         type={type}

packages/ui-buttons/src/CondensedButton/props.ts

@@ -98,6 +98,11 @@ type CondensedButtonOwnProps = {
   onClick?: (
     event: React.KeyboardEvent<ViewProps> | React.MouseEvent<ViewProps>
   ) => void
+
+  /**
+   * The CSS display property of the button, `inline-block` or `block`
+   */
+  display?: 'inline-block' | 'block'
 }
 
 type PropKeys = keyof CondensedButtonOwnProps
@@ -108,6 +113,7 @@ type CondensedButtonProps = CondensedButtonOwnProps &
   WithStyleProps<BaseButtonTheme, null> &
   OtherHTMLAttributes<CondensedButtonOwnProps> &
   ToProp
+
 const allowedProps: AllowedPropKeys = [
   'as',
   'children',
@@ -120,7 +126,8 @@ const allowedProps: AllowedPropKeys = [
   'renderIcon',
   'size',
   'type',
-  'onClick'
+  'onClick',
+  'display'
 ]
 
 export type { CondensedButtonProps }