Skip to content

Commit 65b1f02

Browse files
committed
Closes #7936
- Fixed previous change that broke grid layout of Stacked Plots in Time Strip. - Re-enabled code that sets min-height for Stacked Plots in Time Strip based on the number of children.
1 parent 8c72e4a commit 65b1f02

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/plugins/timeline/TimelineViewLayout.vue

+3-4
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ const unknownObjectType = {
7575
};
7676

7777
const AXES_PADDING = 20;
78+
const PLOT_ITEM_H_PX = 100;
7879

7980
export default {
8081
components: {
@@ -156,14 +157,12 @@ export default {
156157
rowCount = getValidatedGroups(domainObject, planData).length;
157158
} else if (domainObject.type === 'gantt-chart') {
158159
rowCount = Object.keys(domainObject.configuration.swimlaneVisibility).length;
159-
} else if (domainObject.type === 'telemetry.plot.stacked') {
160-
rowCount = domainObject.composition.length;
161160
}
162161

163162
let height =
164163
domainObject.type === 'telemetry.plot.stacked'
165-
? `${domainObject.composition.length * 100}px`
166-
: '100px';
164+
? `${domainObject.composition.length * PLOT_ITEM_H_PX}px`
165+
: 'auto';
167166
let item = {
168167
domainObject,
169168
objectPath,

src/ui/components/swim-lane/SwimLane.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@
5656
/>
5757
</div>
5858
</div>
59-
<div class="c-swimlane__lane-object" :class="{ 'u-contents': showUcontents }">
59+
<div
60+
class="c-swimlane__lane-object"
61+
:style="{ 'min-height': minHeight }"
62+
:class="{ 'u-contents': showUcontents }"
63+
>
6064
<slot name="object"></slot>
6165
</div>
6266
</div>

0 commit comments

Comments
 (0)