-
Notifications
You must be signed in to change notification settings - Fork 704
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
implement comment at-mentions #10145
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
caolanm
commented
Sep 30, 2024
•
edited by Rash419
Loading
edited by Rash419
- Resolves: Support mentioning of contacts in comments #1529
- Target version: master
caolanm
force-pushed
the
private/caolan/comment_at_mentions
branch
from
September 30, 2024 14:43
74cd11d
to
8efe1ea
Compare
caolanm
force-pushed
the
private/caolan/comment_at_mentions
branch
from
October 1, 2024 09:57
32c8694
to
74491bb
Compare
caolanm
commented
Oct 1, 2024
caolanm
commented
Oct 7, 2024
caolanm
force-pushed
the
private/caolan/comment_at_mentions
branch
from
October 12, 2024 10:31
2270da7
to
7fe4cd3
Compare
caolanm
commented
Oct 12, 2024
caolanm
force-pushed
the
private/caolan/comment_at_mentions
branch
from
October 14, 2024 16:15
cddb9b2
to
1944e75
Compare
caolanm
changed the title
wip: Private/caolan/comment at mentions
implement comment at-mentions
Oct 14, 2024
caolanm
force-pushed
the
private/caolan/comment_at_mentions
branch
from
October 16, 2024 15:30
67e0455
to
807e86a
Compare
firing close, calls JSDialog::close which calls closePopover which calls clearDialog before focusToLastElement, and clearDialog removes the entry that focusToLastElement looks up to find the previous thing that has focus, so it always ends up on the map via fallback. So explicitly call focusToLastElement first and then clearDialog, so we get the focus returned to the text entry we want it to return to. Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I0077216c9bebd780c9244ba99b32ba7d266c02fc
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: Id57c847f9a00a94a5f8bf32d80b264dd247b113a
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: If45bf3243b0f7d435b3fb52a02cb363edaacc1fc
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Ifa2ab4d1f2d58b5629d088a42962a44ac964a404
- also update the file to use textContent Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Ib73230161212aeb536de8a528d0b374365e05990
…n comments Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: Ia67c4496dacf498f3fffe9e94e4e2bf5ac290d44
- also fixes @mention autocomplete not working in replyNode as result of using contenteditable instead of textarea Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I7590d3efc00a1c5ce5f593f7016e8c72849faa35
- EditAnnotation, ReplyAnnotation, InsertAnnotation Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I89d4c6d41ea5cc160faa493829b781f7071d3d16
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I5741c9f8124b5c19e8a04e2255bfcdd6a16f9dbd
- problem: we send openmentionpopup event once we get the list of users from integrator in Map.WOPI.js. At that moment we don't have cursor position. Hence, the undefined error - solution: get cursor position directly in AutoCompletePopup so we don't need to pass around this cursor position Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I4c15bd698c17e761f808cc99c58c5ac96180de73
if there is any Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I23e7b8bc4bd99532e5957027df186c04db3599af
textarea had a default 2px padding, so use that here Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I0405678a755e01b83a4f8fd67dec830bb0e3e4ca
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I26c961a2186f0b521cc3afe9da55c96dd77a423d
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Ia66b22998d5dedb58137162e26f8251c9f8fe8d8
- This patch fixes the following scenario: 1. Insert comment 2. Change comment to editmode using modify but don't make changes 3. Press 'ESC'. You will see that comment is autosaved and in editmode Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I2cbd1bae4c20b16c3b7578a7f4764f5e094f6026
- this additional br tag would affect the following scenario: - comment insert and save -> comment modify -> do changes -> make it autosave -> Focus textbox again -> Edit -> ESC: Comment should be out of edit mode and last change should be discarded. This patch fixes the mentioned problem Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Ia32a614ce1f79a761c3bce3a8155d52a92e82e9e
in which case we get the autocomplete popup for main body text in the wrong place, so add a getActive which depends on selectedComment existing, but that's the root of the thread, so check its children for the active edit. Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: Ie77cdbcbd399f38026205e8458555f77171614d5
so there isn't mystery whitespace around it, and drop the padding to 0 Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I966c24ddae81bf5f7430376d314fc50a5f26bea0
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I8822e370f390ebd9be235953fef1260d7b82c2bc
- it will help us test mention popup in cypress and locally without any integration Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I41080499f2c2608d25a59209f6145c9beb41a9e9
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I0a401408e7763c1f50e6245afa824765bc444828
- also fix fullscreen contentcontrol dropdown and mention popup, regression from f4dc729 Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Ic2bc0691e95d8a82ec877d36225b9ace882e7e44
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I2eb452658e52f0e0492ba46e78fe91b29e7a02d4
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I7bd1a047248acaab2ef60b029675c03409bda792
- adds a new option to multilineedit widget to make it contenteditable so that we can insert hyperlink for mention Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I1857493cba7306cac004a88fda6097f49d5ea499
- show mentionlist in comment modal dialog Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I23d1f2e59288f83ac9b700bd840e3d1414279880
if there is no username match Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I4385182b95a5bc6b7d4bd04a291abfa690c83665
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Idc5e96f61dfcf78a109612813e296978701fe176
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I547970b064fce4c2645ef3dbf5d99de6a8f677fb
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I0d8b7a197ed46f294650deb7c2c642676f097c4d
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I64249bcae3dc68da2ad0b59491ba15570e7eb17b
- for that I have added new property to TreeView widget called "hideIfEmpty". If it is true it will hide the treelistbox Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I782f9d2ba517d522323b946db4d6d940ec5a7fc5
- regression from d47f88d - Not just comment modal there are lot of different dialog that are fullscreen Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Icf1399e77e8582c1a186977edb4c01450e43527d
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Ie17f1cd956015b6d98586fb1159d86ed1eef8086
- insertComment would click outside the modify which leads to comment losing focus and inserting an extra comment due to autosave Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I410b1f38f2d593b39aca193d2d90ea05cd02de8c
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: Ibdb24511604c9bbd79af954983d1ce5fa9b6f3ce
Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I08617b806cc9e509962f608ba2cf905b4ba200e5
… and impress Signed-off-by: Rashesh <rashesh.padia@collabora.com> Change-Id: I45cf0447bea8054f623e2266218e40eed811d628
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I2a6c1b328af848a3c63008aec6a06e50c36a5084
caolanm
force-pushed
the
private/caolan/comment_at_mentions
branch
from
October 17, 2024 08:24
807e86a
to
26edb04
Compare
2 tasks
eszkadev
approved these changes
Oct 18, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks fine
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.