Skip to content

Commit 3dd5856

Browse files
committed
refactor(collapsible-panel): add min-height
1 parent 53f58e6 commit 3dd5856

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/components/panels/collapsible-panel/collapsible-panel.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ export default class CollapsiblePanel extends React.PureComponent {
106106
<Spacings.InsetSquish scale={scale}>
107107
<div
108108
{...dataProps}
109-
css={getHeaderStyles({ isDisabled: this.props.isDisabled })}
109+
css={getHeaderStyles({
110+
isCondensed: this.props.condensed,
111+
isDisabled: this.props.isDisabled,
112+
})}
110113
>
111114
<div
112115
css={css`

src/components/panels/collapsible-panel/collapsible-panel.styles.js

+11-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const getHeaderContainerStyles = ({ isDisabled, isOpen, isSticky, theme }) => {
6161
];
6262
};
6363

64-
const getHeaderStyles = ({ isDisabled }) => {
64+
const getHeaderStyles = ({ isDisabled, isCondensed }) => {
6565
const baseStyles = css`
6666
display: flex;
6767
flex: 1;
@@ -96,7 +96,16 @@ const getHeaderStyles = ({ isDisabled }) => {
9696
`,
9797
];
9898
}
99-
return baseStyles;
99+
return [
100+
baseStyles,
101+
!isCondensed &&
102+
css`
103+
/**
104+
We set a min-height of 32px to anticipate use-cases where SecondaryButton or PrimaryButton
105+
are rendered in the headerControl */
106+
min-height: ${vars.spacing32};
107+
`,
108+
];
100109
};
101110

102111
const getContentStyles = () => css`

0 commit comments

Comments
 (0)