Skip to content

Commit 5872b90

Browse files
akhenrydavetsaycharlesh88
authored
Adjustable swimlanes merge attempt 2 (#8138)
* Move ResizeHandle to reusable ui location * Changes for user-settable swimlane heights. * resize widths for all swimlane labels * make drag resizer more scalable * add resize handles to time strip views * Moved many CSS defs from flexible-layout.scss into new mixin `resizeHandleStyle`. --------- Co-authored-by: David Tsay <[email protected]> Co-authored-by: Charles Hacskaylo <[email protected]>
1 parent de07086 commit 5872b90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1531
-342
lines changed
1.06 KB
Loading
570 Bytes
Loading

e2e/tests/functional/ui/inspector.e2e.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ test.describe('Inspector tests', () => {
186186
const objectInfo = await createDomainObjectWithDefaults(
187187
page,
188188
createOptions,
189-
viewConfig.required ? viewConfig.required : {}
189+
viewConfig.required ?? {}
190190
);
191191
await page.goto(objectInfo.url);
192192

e2e/tests/visual-a11y/planning-timestrip.visual.spec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ test.describe('Visual - Time Strip @a11y', () => {
6969
//This will stabilize the state of the test and allow the SWG to render as empty
7070
await waitForAnimations(page.getByLabel('Plot Canvas'));
7171

72+
// FIXME: https://github.com/nasa/openmct/issues/8005
73+
// eslint-disable-next-line playwright/no-wait-for-timeout
74+
await page.waitForTimeout(500);
75+
7276
await percySnapshot(page, `Time Strip View (theme: ${theme}) - With SWG and Plan`);
7377
});
7478
});

src/plugins/events/components/events-view.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
&__container {
2121
// Holds event lines
2222
background-color: $colorPlotBg;
23-
//box-shadow: inset $colorPlotAreaBorder 0 0 0 1px; // Using box-shadow instead of border to not affect box size
2423
position: absolute;
2524
top: $m; right: 0; bottom: $m; left: 0;
2625
}
@@ -77,10 +76,13 @@
7776
}
7877

7978
// Extended event lines
79+
.c-timeline__overlay-lines__extended-line-container {
80+
display: contents;
81+
}
82+
8083
.c-timeline__event-line--extended {
8184
@include abs();
8285
width: $eventLineW;
83-
opacity: 0.4;
8486

8587
&.--hilite {
8688
opacity: 0.8;

src/plugins/flexibleLayout/components/ContainerComponent.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@
8080
</template>
8181

8282
<script>
83+
import ResizeHandle from '@/ui/layout/ResizeHandle/ResizeHandle.vue';
84+
8385
import DropHint from './DropHint.vue';
8486
import FrameComponent from './FrameComponent.vue';
85-
import ResizeHandle from './ResizeHandle.vue';
8687
8788
const MIN_FRAME_SIZE = 5;
8889

src/plugins/flexibleLayout/components/FlexibleLayout.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@
7777
</template>
7878

7979
<script>
80-
import Container from '../utils/container.js';
81-
import Frame from '../utils/frame.js';
80+
import Container from '@/ui/layout/Container.js';
81+
import Frame from '@/ui/layout/Frame.js';
82+
import ResizeHandle from '@/ui/layout/ResizeHandle/ResizeHandle.vue';
83+
8284
import ContainerComponent from './ContainerComponent.vue';
8385
import DropHint from './DropHint.vue';
84-
import ResizeHandle from './ResizeHandle.vue';
8586
8687
const MIN_CONTAINER_SIZE = 5;
8788

src/plugins/flexibleLayout/components/flexible-layout.scss

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -247,46 +247,17 @@
247247
}
248248

249249
&__resize-handle {
250-
$size: 2px;
250+
$size: 1px;
251251
$margin: 3px;
252252
$marginHov: 0;
253253
$grippyThickness: $size + 6;
254254
$grippyLen: $grippyThickness * 2;
255255

256+
@include resizeHandleStyle($size, $margin);
257+
256258
display: flex;
257259
flex-direction: column;
258260
flex: 0 0 ($margin * 2) + $size;
259-
260-
&:before {
261-
// The visible resize line
262-
background-color: $editUIColor;
263-
content: '';
264-
display: block;
265-
flex: 1 1 auto;
266-
min-height: $size;
267-
min-width: $size;
268-
}
269-
270-
&.vertical {
271-
padding: $margin $size;
272-
&:hover {
273-
cursor: row-resize;
274-
}
275-
}
276-
277-
&.horizontal {
278-
padding: $size $margin;
279-
&:hover {
280-
cursor: col-resize;
281-
}
282-
}
283-
284-
&:hover {
285-
&:before {
286-
// The visible resize line
287-
background-color: $editUIColorHov;
288-
}
289-
}
290261
}
291262

292263
// Hide the resize-handles in first and last c-fl-frame elements

src/plugins/flexibleLayout/plugin.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
* at runtime from the About dialog for additional information.
2121
*****************************************************************************/
2222

23+
import Container from '@/ui/layout/Container.js';
24+
2325
import flexibleLayoutStylesInterceptor from './flexibleLayoutStylesInterceptor.js';
2426
import FlexibleLayoutViewProvider from './flexibleLayoutViewProvider.js';
2527
import ToolBarProvider from './toolbarProvider.js';
26-
import Container from './utils/container.js';
2728

2829
export default function plugin() {
2930
return function install(openmct) {

src/plugins/inspectorViews/elements/ElementItem.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
:object-path="[elementObject, domainObject]"
4747
@context-click-active="setContextClickState"
4848
/>
49+
<slot name="content"></slot>
4950
</div>
5051
</li>
5152
<li v-else :aria-label="`${elementObject.name} Element Item`">

0 commit comments

Comments
 (0)