Skip to content

Fix popups drag issue when selecting input values #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaur-mananjeet merged 3 commits into from
Dec 11, 2025
Merged

Fix popups drag issue when selecting input values #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b5364d
disable drag in all popups when selecting input value
kaur-mananjeet Dec 11, 2025
780b9c4
fix unused event
kaur-mananjeet Dec 11, 2025
cc74e55
remove unused event
kaur-mananjeet Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion script-gen-ui/src/app/components/main-sweep/list/list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div #listPopUp class="sweep-list-popup" cdkDrag cdkDragBoundary="body">
<div #listPopUp class="sweep-list-popup" cdkDrag cdkDragBoundary="body" [cdkDragDisabled]="isDragDisabled">
<div class="sweep-list-popup-content">
<div class="sweep-list-popup-header" cdkDragHandle>
<h3 style="margin: 0">List</h3>
Expand All @@ -14,6 +14,9 @@ <h3 style="margin: 0">List</h3>
*ngIf="noOfPointsOrSteps !== undefined && noOfPointsOrSteps !== null"
(inputChange)="emitStepsOrPoints()"
[disabled]="!isNoOfPointsOrSteps"
(mousedown)="onInputMouseDown()"
(mouseup)="onInputMouseUp()"
(blur)="onInputBlur()"
></app-input-numeric>
</div>
<div class="sweep-list-popup-inputs">
Expand Down Expand Up @@ -42,6 +45,9 @@ <h3 style="margin: 0">List</h3>
(inputChange)="onChange()"
style="width: 95%"
[disabled]="!sweep.isDeviceValid"
(mousedown)="onInputMouseDown()"
(mouseup)="onInputMouseUp()"
(blur)="onInputBlur()"
></app-input-plain>
</td>
</tr>
Expand Down
19 changes: 19 additions & 0 deletions script-gen-ui/src/app/components/main-sweep/list/list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export class ListComponent implements OnChanges, AfterViewInit {
@Output() updatedStepsOrPoints = new EventEmitter<number>();

rowIndices: number[] = [];
isDragDisabled = false;

getRowIndices(): number[] {
return this.listsWithNames.length > 0
Expand Down Expand Up @@ -97,4 +98,22 @@ export class ListComponent implements OnChanges, AfterViewInit {
this.listPositionChange.emit({ left: rect.left, top: rect.top });
}
}

onInputBlur() {
this.isDragDisabled = false;
}

onInputMouseDown() {
this.isDragDisabled = true;

setTimeout(() => {
if (this.isDragDisabled) {
this.isDragDisabled = false;
}
}, 500);
}

onInputMouseUp() {
this.isDragDisabled = false;
}
}
17 changes: 16 additions & 1 deletion script-gen-ui/src/app/components/main-sweep/timing/timing.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="popup">
<div class="popup-content" cdkDrag cdkDragBoundary="body">
<div class="popup-content" cdkDrag cdkDragBoundary="body" [cdkDragDisabled]="isDragDisabled">
<!-- <span class="close" (click)="close_Timing()">&times;</span> -->
<div>
<div class="popup-header" cdkDragHandle>
Expand All @@ -16,6 +16,9 @@ <h3 id="timingLabel">Timing</h3>
[label]="'Measure Count (per step)'"
*ngIf="measureCount"
(inputChange)="submitTimingData()"
(mousedown)="onInputMouseDown()"
(mouseup)="onInputMouseUp()"
(blur)="onInputBlur()"
></app-input-numeric>
</div>

Expand All @@ -42,6 +45,9 @@ <h3 id="SMUTimingLabel">SMU Timing</h3>
[label]="'NPLC'"
*ngIf="nplc"
(inputChange)="submitTimingData()"
(mousedown)="onInputMouseDown()"
(mouseup)="onInputMouseUp()"
(blur)="onInputBlur()"
></app-input-numeric>
</div>
<div *ngIf="nplcType?.value === 'Aperture'">
Expand All @@ -52,6 +58,9 @@ <h3 id="SMUTimingLabel">SMU Timing</h3>
[unit]="aperture.unit"
*ngIf="aperture"
(inputChange)="submitTimingData()"
(mousedown)="onInputMouseDown()"
(mouseup)="onInputMouseUp()"
(blur)="onInputBlur()"
></app-input-plain>
</div>
<div>
Expand All @@ -73,6 +82,9 @@ <h3 id="SMUTimingLabel">SMU Timing</h3>
[unit]="sourceDelay.unit"
*ngIf="sourceDelay"
(inputChange)="submitTimingData()"
(mousedown)="onInputMouseDown()"
(mouseup)="onInputMouseUp()"
(blur)="onInputBlur()"
></app-input-plain>
</div>
<div>
Expand All @@ -94,6 +106,9 @@ <h3 id="SMUTimingLabel">SMU Timing</h3>
[unit]="measureDelay.unit"
*ngIf="measureDelay"
(inputChange)="submitTimingData()"
(mousedown)="onInputMouseDown()"
(mouseup)="onInputMouseUp()"
(blur)="onInputBlur()"
></app-input-plain>
</div>
</div>
Expand Down
20 changes: 20 additions & 0 deletions script-gen-ui/src/app/components/main-sweep/timing/timing.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export class TimingComponent implements OnDestroy, OnChanges {

boundaryElement = 'app-root';

isDragDisabled = false;

@Input() sweepTimingConfig: SweepTimingConfig | undefined;
@Output() ok = new EventEmitter<void>();
@Output() emitTimingData = new EventEmitter<void>();
Expand Down Expand Up @@ -129,6 +131,24 @@ export class TimingComponent implements OnDestroy, OnChanges {
});
}

onInputBlur() {
this.isDragDisabled = false;
}

onInputMouseDown() {
this.isDragDisabled = true;

setTimeout(() => {
if (this.isDragDisabled) {
this.isDragDisabled = false;
}
}, 500);
}

onInputMouseUp() {
this.isDragDisabled = false;
}

ngOnDestroy(): void {
console.log('component destroyed');
}
Expand Down
Loading