Skip to content

Commit e3c483b

Browse files
TSP-1180-Highlight timing button when timing popup is open (#28)
This PR has changes made to highlight 'Timing' button when timing popup is open. The same has been changed for 'Edit' button when list popup is open. Also, drag boundaries for both timing and list popups have been corrected.
1 parent 9bd7b04 commit e3c483b

File tree

8 files changed

+28
-6
lines changed

8 files changed

+28
-6
lines changed

script-gen-ui/src/app/components/main-sweep/list/list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="sweep-list-popup" cdkDrag>
1+
<div class="sweep-list-popup" cdkDrag cdkDragBoundary="body">
22
<div class="sweep-list-popup-content">
33
<div class="sweep-list-popup-header" cdkDragHandle>
44
<h3 style="margin: 0">List</h3>

script-gen-ui/src/app/components/main-sweep/main-sweep.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<div [attr.aria-label]="'timingTab'">
1919
<button
2020
class="timing"
21+
[class.timing-open]="showTiming"
2122
(click)="enableTiming()"
2223
[attr.aria-label]="'timing'"
2324
>
@@ -309,6 +310,7 @@ <h3>Sweep</h3>
309310
<div style="margin-top: auto; margin-bottom: 0.5vh">
310311
<button
311312
[attr.aria-label]="'EditSweepList'"
313+
[class.sweepList-open]="showList"
312314
class="timing"
313315
(click)="enableList()"
314316
[disabled]="!isListSweep"

script-gen-ui/src/app/components/main-sweep/main-sweep.component.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,17 @@
256256
border-style: solid;
257257
border-width: thin;
258258
padding: 5px 15px;
259+
cursor: pointer;
260+
}
261+
262+
button.timing.timing-open {
263+
outline: 1px solid -webkit-focus-ring-color;
264+
outline-offset: -1px;
265+
}
266+
267+
button.timing.sweepList-open {
268+
outline: 1px solid -webkit-focus-ring-color;
269+
outline-offset: -1px;
259270
}
260271

261272
button.timing:disabled {

script-gen-ui/src/app/components/main-sweep/step/step.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ <h3>
181181
<div style="margin-top: auto; margin-bottom: 0.5vh; margin-left: 3vh">
182182
<button
183183
class="timing"
184+
[class.stepList-open]="showStepList"
184185
[attr.aria-label]="'EditStepList'"
185186
(click)="showStepListPopup()"
186187
[disabled]="!selectedDeviceOption?.isValid || !listStep"

script-gen-ui/src/app/components/main-sweep/step/step.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,12 @@ h4 {
213213
border-style: solid;
214214
border-width: thin;
215215
padding: 5px 15px;
216+
cursor: pointer;
217+
}
218+
219+
button.timing.stepList-open {
220+
outline: 1px solid -webkit-focus-ring-color;
221+
outline-offset: -1px;
216222
}
217223

218224
button.timing:disabled {

script-gen-ui/src/app/components/main-sweep/timing/timing.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="popup">
2-
<div class="popup-content" cdkDrag [cdkDragBoundary]="boundaryElement">
2+
<div class="popup-content" cdkDrag cdkDragBoundary="body">
33
<!-- <span class="close" (click)="close_Timing()">&times;</span> -->
44
<div>
5-
<div class="popup-header">
5+
<div class="popup-header" cdkDragHandle>
66
<h3 id="timingLabel">Timing</h3>
77
<button (click)="okTiming()" class="button" [attr.aria-label]="'closeTiming'">
88
<mat-icon>close</mat-icon>

script-gen-ui/src/app/components/main-sweep/timing/timing.component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ h3 {
2020
display: flex;
2121
flex-direction: row;
2222
justify-content: space-between;
23+
cursor: move;
2324
}
2425

2526
.measure-count {

script-gen-ui/src/app/components/main-sweep/timing/timing.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { DropdownComponent } from '../../controls/dropdown/dropdown.component';
2323
import { InputNumericComponent } from '../../controls/input-numeric/input-numeric.component';
2424
import { InputPlainComponent } from '../../controls/input-plain/input-plain.component';
2525
import { InputToggleComponent } from '../../controls/input-toggle/input-toggle.component';
26-
import {CdkDrag} from '@angular/cdk/drag-drop';
26+
import { CdkDrag, CdkDragHandle } from '@angular/cdk/drag-drop';
2727

2828
@Component({
2929
selector: 'app-timing',
@@ -37,8 +37,9 @@ import {CdkDrag} from '@angular/cdk/drag-drop';
3737
InputNumericComponent,
3838
InputPlainComponent,
3939
InputToggleComponent,
40-
CdkDrag
41-
],
40+
CdkDrag,
41+
CdkDragHandle
42+
],
4243
templateUrl: './timing.component.html',
4344
styleUrl: './timing.component.scss',
4445
})

0 commit comments

Comments
 (0)