Skip to content

Commit af55fdd

Browse files
authored
Merge pull request #1786 from ProcessMaker/bugfix/FOUR-17551
FOUR-17551: Scrollbar Position Issue When Navigating to Next Page
2 parents e6efb7a + 6e6ffc5 commit af55fdd

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

src/components/screen-renderer.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ export default {
110110
return this.$refs.component.getCurrentPage();
111111
},
112112
setCurrentPage(page) {
113+
this.$emit("updatedPage");
113114
this.$refs.component.setCurrentPage(page);
114115
},
115116
afterSubmit() {

src/components/task.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
:key="refreshScreen"
3333
:loop-context="loopContext"
3434
:taskdraft="this.task"
35+
@update-page-task="pageUpdate"
3536
@update="onUpdate"
3637
@after-submit="afterSubmit"
3738
@submit="submit"
@@ -50,6 +51,7 @@
5051
:watchers="screen.watchers"
5152
:data="requestData"
5253
:type="screen.type"
54+
@update-page-task="pageUpdate"
5355
@update="onUpdate"
5456
@after-submit="afterSubmit"
5557
@submit="submit"
@@ -107,7 +109,7 @@ export default {
107109
alwaysAllowEditing: { type: Boolean, default: false },
108110
disableInterstitial: { type: Boolean, default: false },
109111
waitLoadingListeners: { type: Boolean, default: false },
110-
isWebEntry: { type: Boolean, default: false },
112+
isWebEntry: { type: Boolean, default: false }
111113
},
112114
data() {
113115
return {
@@ -365,6 +367,9 @@ export default {
365367
this.hasErrors = false;
366368
}
367369
},
370+
pageUpdate() {
371+
this.$emit("updated-page-core");
372+
},
368373
resetScreenState() {
369374
this.loadingButton = false;
370375
this.disabled = false;

src/components/vue-form-renderer.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
class="p-0"
2020
:loop-context="loopContext"
2121
:taskdraft="taskdraft"
22+
@updatePage="setCurrentPage"
2223
@after-submit="afterSubmit"
2324
@submit="submit"
2425
/>
@@ -361,6 +362,7 @@ export default {
361362
return this.$refs.renderer.getCurrentPage();
362363
},
363364
setCurrentPage(page) {
365+
this.$emit("update-page-task");
364366
this.$refs.renderer.setCurrentPage(page);
365367
},
366368
onContainerObserver(entries) {

src/mixins/extensions/PageNavigate.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export default {
1313
if (!this.$parent.definition.config[page]) {
1414
return;
1515
}
16+
this.$parent.$emit("updatePage");
1617
this.currentPage__ = page;
1718
};
1819
},

0 commit comments

Comments
 (0)