Skip to content
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.

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

[FW][FIX] web_editor: fix page scroll after scrolling a modal #163619

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 26, 2024

Steps to reproduce the bug:

  • In "Website" edit mode.
  • Drag and drop enough snippets onto the page to make the vertical
    scrollbar appear.
  • Drag and drop the "Popup" snippet onto the page.
  • Drag and drop enough snippets into the "Popup" to make the vertical
    scrollbar appear.
  • Close the popup.
  • Drag a snippet from the snippet menu without releasing the mouse.
  • Move it to the bottom of the page.
  • Bug: the page doesn't scroll.

In the following commit 1, we enabled "smooth scroll on drag" to work
within a modal. The element being scrolled was indeed the modal when
dragging a snippet over it. However, in a later commit 2, the behavior
was changed and caused the bug. After closing the modal, we did not
redefine the scrollable element, so it remained the modal instead of the
page.

task-3854032

Forward-Port-Of: #162166

Steps to reproduce the bug:
- In "Website" edit mode.
- Drag and drop enough snippets onto the page to make the vertical
scrollbar appear.
- Drag and drop the "Popup" snippet onto the page.
- Drag and drop enough snippets into the "Popup" to make the vertical
scrollbar appear.
- Close the popup.
- Drag a snippet from the snippet menu without releasing the mouse.
- Move it to the bottom of the page.
- Bug: the page doesn't scroll.

In the following commit [1], we enabled "smooth scroll on drag" to work
within a modal. The element being scrolled was indeed the modal when
dragging a snippet over it. However, in a later commit [2], the behavior
was changed and caused the bug. After closing the modal, we did not
redefine the scrollable element, so it remained the modal instead of the
page.

[1]: odoo@40795c0
[2]: odoo@7ed3f31

task-3854032

X-original-commit: f85e3f4
@robodoo
Copy link
Contributor

robodoo commented Apr 26, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 26, 2024

@bvr-odoo @SergeBayet cherrypicking of pull request #162166 failed.

stdout:

Auto-merging addons/web_editor/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/web_editor/static/src/js/editor/snippets.editor.js

stderr:

19:17:15.921016 git.c:463               trace: built-in: git cherry-pick 103c9d627e1760ebc8e8d4bb8659531246cb563b
error: could not apply 103c9d627e17... [FIX] web_editor: fix page scroll after scrolling a modal
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 26, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 26, 2024
@bvr-odoo
Copy link
Contributor

bvr-odoo commented Apr 29, 2024

@SergeBayet The bug doesn't exist in 17.0 thanks to this commit

@bvr-odoo bvr-odoo closed this Apr 29, 2024
@qsm-odoo qsm-odoo deleted the 17.0-15.0-fix-scroll-page-after-scrolling-a-modal-bvr-8Ap0-fw branch April 30, 2024 06:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants