Skip to content

Commit 406ec7f

Browse files
authored
chore: Fixes permutation pages with 0-height blocks (#4251)
1 parent 38a9eb8 commit 406ec7f

File tree

4 files changed

+43
-51
lines changed

4 files changed

+43
-51
lines changed

pages/box/float-align.page.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ export default function BoxPermutations() {
2727
<PermutationsView
2828
permutations={permutations}
2929
render={permutation => (
30-
<Box {...permutation} className={styles['permutation-box']}>
31-
{permutation.textAlign && `textAlign:${permutation.textAlign}`}
32-
{permutation.float && `float:${permutation.float}`}
33-
</Box>
30+
// The flow-root is necessary for the float permutations so that the permutation wrapper height is computed correctly.
31+
<div style={{ display: 'flow-root' }}>
32+
<Box {...permutation} className={styles['permutation-box']}>
33+
{permutation.textAlign && `textAlign:${permutation.textAlign}`}
34+
{permutation.float && `float:${permutation.float}`}
35+
</Box>
36+
</div>
3437
)}
3538
/>
3639
</ScreenshotArea>

pages/date-range-picker/month-calendar-permutations.page.tsx

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,33 +83,29 @@ const permutations = createPermutations<DateRangePickerCalendarProps>([
8383
]);
8484

8585
export default function DateRangePickerCalendarPage() {
86-
let i = -1;
8786
return (
8887
<PermutationsPage title="Date range picker permutations: month calendar" i18n={{}}>
8988
<div style={{ blockSize: `${(1 + permutations.length) * 400}px` }}>
9089
<PermutationsView
9190
permutations={permutations}
92-
render={permutation => {
93-
i++;
94-
return (
95-
<div style={{ insetBlockStart: `${i * 400}px`, position: 'relative' }}>
96-
<Dropdown
97-
stretchWidth={true}
98-
stretchHeight={true}
99-
stretchToTriggerWidth={false}
100-
open={true}
101-
onDropdownClose={() => {}}
102-
onMouseDown={() => {}}
103-
trigger={null}
104-
content={
105-
<Box padding="m">
106-
<Calendar {...permutation} />
107-
</Box>
108-
}
109-
/>
110-
</div>
111-
);
112-
}}
91+
render={permutation => (
92+
<div style={{ blockSize: '400px' }}>
93+
<Dropdown
94+
stretchWidth={true}
95+
stretchHeight={true}
96+
stretchToTriggerWidth={false}
97+
open={true}
98+
onDropdownClose={() => {}}
99+
onMouseDown={() => {}}
100+
trigger={null}
101+
content={
102+
<Box padding="m">
103+
<Calendar {...permutation} />
104+
</Box>
105+
}
106+
/>
107+
</div>
108+
)}
113109
/>
114110
</div>
115111
</PermutationsPage>

pages/date-range-picker/year-calendar-permutations.page.tsx

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,33 +63,29 @@ const permutations = createPermutations<DateRangePickerCalendarProps>([
6363
]);
6464

6565
export default function DateRangePickerCalendarPage() {
66-
let i = -1;
6766
return (
6867
<PermutationsPage title="Date range picker permutations: year calendar" i18n={{}}>
6968
<div style={{ blockSize: `${(1 + permutations.length) * 300}px` }}>
7069
<PermutationsView
7170
permutations={permutations}
72-
render={permutation => {
73-
i++;
74-
return (
75-
<div style={{ insetBlockStart: `${i * 300}px`, position: 'relative' }}>
76-
<Dropdown
77-
stretchWidth={true}
78-
stretchHeight={true}
79-
stretchToTriggerWidth={false}
80-
open={true}
81-
onDropdownClose={() => {}}
82-
onMouseDown={() => {}}
83-
trigger={null}
84-
content={
85-
<Box padding="m">
86-
<Calendar {...permutation} granularity="month" />
87-
</Box>
88-
}
89-
/>
90-
</div>
91-
);
92-
}}
71+
render={permutation => (
72+
<div style={{ blockSize: '300px' }}>
73+
<Dropdown
74+
stretchWidth={true}
75+
stretchHeight={true}
76+
stretchToTriggerWidth={false}
77+
open={true}
78+
onDropdownClose={() => {}}
79+
onMouseDown={() => {}}
80+
trigger={null}
81+
content={
82+
<Box padding="m">
83+
<Calendar {...permutation} granularity="month" />
84+
</Box>
85+
}
86+
/>
87+
</div>
88+
)}
9389
/>
9490
</div>
9591
</PermutationsPage>

pages/steps/permutations-utils.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,6 @@ const allStatusesSteps: ReadonlyArray<StepsProps.Step> = [
303303
},
304304
];
305305

306-
const emptySteps: ReadonlyArray<StepsProps.Step> = [];
307-
308306
export const initialStepsInteractive: ReadonlyArray<StepsProps.Step> = [
309307
{
310308
status: 'loading',
@@ -754,7 +752,6 @@ export const stepsPermutations = createPermutations<StepsProps>([
754752
successfulSteps,
755753
blockedSteps,
756754
failedSteps,
757-
emptySteps,
758755
allStatusesSteps,
759756
initialStepsInteractive,
760757
loadingStepsInteractive,

0 commit comments

Comments
 (0)