Alter attribute input for mentions #720
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
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #720 +/- ##
==========================================
- Coverage 90.04% 89.87% -0.18%
==========================================
Files 113 83 -30
Lines 16059 14603 -1456
Branches 565 0 -565
==========================================
- Hits 14460 13124 -1336
+ Misses 1579 1479 -100
+ Partials 20 0 -20
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
alunturner
force-pushed
the
alunturner/alter-attribute-input-for-mentions
branch
2 times, most recently
from
140d97a
to
e2b8344
Compare
added 22 commits
June 16, 2023 11:38
alunturner
force-pushed
the
alunturner/alter-attribute-input-for-mentions
branch
from
729f5ba
to
b1ca983
Compare
alunturner
commented
Jun 16, 2023
Comment on lines
-1084
to
-1100
| #[wasm_bindgen_test] | ||
| fn a_with_attributes() { | ||
| roundtrip( | ||
| r#"<a contenteditable="false" data-mention-type="user" style="something" href="http://example.com">a user mention</a>"#, | ||
| ); | ||
| } | ||
|
|
||
| #[wasm_bindgen_test] | ||
| fn a_with_bad_attribute() { | ||
| let html = r#"<a invalidattribute="true" href="http://example.com">a user mention</a>"#; | ||
| let dom = HtmlParser::default().parse::<Utf16String>(html).unwrap(); | ||
| assert_eq!( | ||
| dom.to_string(), | ||
| r#"<a href="http://example.com">a user mention</a>"# | ||
| ); | ||
| } | ||
|
|
There was a problem hiding this comment.
No longer good tests, as we don't have links with attributes
Comment on lines
+75
to
+92
| case 'insertAtRoomSuggestion': { | ||
| if (suggestion && isAtRoomSuggestionEvent(event)) { | ||
| const { attributes } = event.data; | ||
| // we need to track data-mention-type in element web, ensure we do not pass | ||
| // it in as rust model can handle this automatically | ||
| if (attributes.has('data-mention-type')) { | ||
| attributes.delete('data-mention-type'); | ||
| } | ||
| return action( | ||
| composerModel.insert_at_room_mention_at_suggestion( | ||
| suggestion, | ||
| attributes, | ||
| ), | ||
| 'insert_at_room_mention_at_suggestion', | ||
| ); | ||
| } | ||
| break; | ||
| } |
There was a problem hiding this comment.
This replaces the if text === ... check from before to completely separate mention and at mention handling
Comment on lines
+29
to
+32
| export type AllowedMentionAttributes = Map< | ||
| 'style' | 'data-mention-type', | ||
| string | ||
| >; |
There was a problem hiding this comment.
This change the type to be a Map, which fixes another open issue and we also make it less permissive in terms of what it accepts.
| @@ -108,5 +108,6 @@ export function useWysiwyg(wysiwygProps?: WysiwygProps) { | |||
| traceAction: testUtilities.traceAction, | |||
| }, | |||
| suggestion: memoisedMappedSuggestion, | |||
| messageContent: composerModel?.get_content_as_message_html() ?? null, | |||
There was a problem hiding this comment.
Exposing the ability to use the rust model to output message format html
jonnyandrew
approved these changes
Jun 16, 2023
| @@ -831,8 +831,8 @@ mod js { | |||
| self.current_path.push(DomNodeKind::Link); | |||
|
|
|||
| let mut attributes = vec![]; | |||
| let valid_attributes = | |||
| ["contenteditable", "data-mention-type", "style"]; | |||
alunturner
force-pushed
the
alunturner/alter-attribute-input-for-mentions
branch
from
2ed5d77
to
42300cd
Compare
|
SonarCloud Quality Gate failed. |
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.
This PR:
attributeargument from calls to mention functions #721, but still require removal from the mobile side of the codebasedata-mention-typeautomaticdata-mention-typeattribute in web, and changes the type for attributes to a map