Alter attribute input for mentions

bindings/wysiwyg-ffi/src/ffi_composer_model.rs

@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
+use std::vec;
 
 use widestring::Utf16String;
 
@@ -259,21 +260,9 @@ impl ComposerModel {
     }
 
     /// Creates an at-room mention node and inserts it into the composer at the current selection
-    pub fn insert_at_room_mention(
-        self: &Arc<Self>,
-        attributes: Vec<Attribute>,
-    ) -> Arc<ComposerUpdate> {
-        let attrs = attributes
-            .iter()
-            .map(|attr| {
-                (
-                    Utf16String::from_str(&attr.key),
-                    Utf16String::from_str(&attr.value),
-                )
-            })
-            .collect();
+    pub fn insert_at_room_mention(self: &Arc<Self>) -> Arc<ComposerUpdate> {
         Arc::new(ComposerUpdate::from(
-            self.inner.lock().unwrap().insert_at_room_mention(attrs),
+            self.inner.lock().unwrap().insert_at_room_mention(vec![]),
         ))
     }
 
@@ -282,19 +271,11 @@ impl ComposerModel {
         self: &Arc<Self>,
         url: String,
         text: String,
-        attributes: Vec<Attribute>,
+        _attributes: Vec<Attribute>, // TODO remove attributes
     ) -> Arc<ComposerUpdate> {
         let url = Utf16String::from_str(&url);
         let text = Utf16String::from_str(&text);
-        let attrs = attributes
-            .iter()
-            .map(|attr| {
-                (
-                    Utf16String::from_str(&attr.key),
-                    Utf16String::from_str(&attr.value),
-                )
-            })
-            .collect();
+        let attrs = vec![];
         Arc::new(ComposerUpdate::from(
             self.inner.lock().unwrap().insert_mention(url, text, attrs),
         ))
@@ -305,18 +286,9 @@ impl ComposerModel {
     pub fn insert_at_room_mention_at_suggestion(
         self: &Arc<Self>,
         suggestion: SuggestionPattern,
-        attributes: Vec<Attribute>,
     ) -> Arc<ComposerUpdate> {
         let suggestion = wysiwyg::SuggestionPattern::from(suggestion);
-        let attrs = attributes
-            .iter()
-            .map(|attr| {
-                (
-                    Utf16String::from_str(&attr.key),
-                    Utf16String::from_str(&attr.value),
-                )
-            })
-            .collect();
+        let attrs = vec![];
         Arc::new(ComposerUpdate::from(
             self.inner
                 .lock()
@@ -332,20 +304,12 @@ impl ComposerModel {
         url: String,
         text: String,
         suggestion: SuggestionPattern,
-        attributes: Vec<Attribute>,
+        _attributes: Vec<Attribute>, // TODO remove attributes
     ) -> Arc<ComposerUpdate> {
         let url = Utf16String::from_str(&url);
         let text = Utf16String::from_str(&text);
         let suggestion = wysiwyg::SuggestionPattern::from(suggestion);
-        let attrs = attributes
-            .iter()
-            .map(|attr| {
-                (
-                    Utf16String::from_str(&attr.key),
-                    Utf16String::from_str(&attr.value),
-                )
-            })
-            .collect();
+        let attrs = vec![];
         Arc::new(ComposerUpdate::from(
             self.inner
                 .lock()

bindings/wysiwyg-ffi/src/ffi_composer_update.rs

@@ -31,8 +31,8 @@ mod test {
     use std::{collections::HashMap, sync::Arc};
 
     use crate::{
-        ActionState, Attribute, ComposerAction, ComposerModel, MenuAction,
-        MenuState, SuggestionPattern,
+        ActionState, ComposerAction, ComposerModel, MenuAction, MenuState,
+        SuggestionPattern,
     };
 
     #[test]
@@ -229,10 +229,7 @@ mod test {
             "https://matrix.to/#/@alice:matrix.org".into(),
             "Alice".into(),
             suggestion_pattern,
-            vec![Attribute {
-                key: "data-mention-type".into(),
-                value: "user".into(),
-            }],
+            vec![], // TODO remove argument when function signature changes
         );
     }
 

bindings/wysiwyg-ffi/src/wysiwyg_composer.udl

@@ -48,9 +48,9 @@ interface ComposerModel {
     ComposerUpdate set_link(string url, sequence<Attribute> attributes);
     ComposerUpdate set_link_with_text(string url, string text, sequence<Attribute> attributes);
     ComposerUpdate remove_links();
-    ComposerUpdate insert_at_room_mention(sequence<Attribute> attributes);
+    ComposerUpdate insert_at_room_mention();
     ComposerUpdate insert_mention(string url, string text, sequence<Attribute> attributes);
-    ComposerUpdate insert_at_room_mention_at_suggestion(SuggestionPattern suggestion, sequence<Attribute> attributes);
+    ComposerUpdate insert_at_room_mention_at_suggestion(SuggestionPattern suggestion);
     ComposerUpdate insert_mention_at_suggestion(string url, string text, SuggestionPattern suggestion, sequence<Attribute> attributes);
     ComposerUpdate code_block();
     ComposerUpdate quote();

crates/wysiwyg/src/dom/nodes/mention_node.rs

@@ -162,7 +162,16 @@ impl<S: UnicodeString> MentionNode<S> {
                 let attributes = if as_message {
                     vec![("href".into(), S::from(mention.uri()))]
                 } else {
+                    // this is now only required for us to attach a custom style attribute for web
                     let mut attrs = self.attributes.clone();
+                    let data_mention_type = match mention.kind() {
+                        MentionKind::Room => "room",
+                        MentionKind::User => "user",
+                    };
+                    attrs.push((
+                        "data-mention-type".into(),
+                        data_mention_type.into(),
+                    ));
                     attrs.push(("href".into(), S::from(mention.uri())));
                     attrs.push(("contenteditable".into(), "false".into()));
                     attrs
@@ -184,7 +193,10 @@ impl<S: UnicodeString> MentionNode<S> {
                 if as_message {
                     formatter.push(self.display_text())
                 } else {
+                    // this is now only required for us to attach a custom style attribute for web
                     let mut attributes = self.attributes.clone();
+                    attributes
+                        .push(("data-mention-type".into(), "at-room".into()));
                     attributes.push(("href".into(), "#".into())); // designates a placeholder link in html
                     attributes.push(("contenteditable".into(), "false".into()));
 

crates/wysiwyg/src/dom/parser/parse.rs

@@ -831,8 +831,8 @@ mod js {
                         self.current_path.push(DomNodeKind::Link);
 
                         let mut attributes = vec![];
-                        let valid_attributes =
-                            ["contenteditable", "data-mention-type", "style"];
+                        // we only need to pass in a style attribute from web to allow CSS variable insertion
+                        let valid_attributes = ["style"];
 
                         for attr in valid_attributes.into_iter() {
                             if node
@@ -1081,27 +1081,10 @@ mod js {
             roundtrip(r#"foo <a href="">bar</a> baz"#);
         }
 
-        #[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>"#
-            );
-        }
-
         #[wasm_bindgen_test]
         fn mention_with_attributes() {
             roundtrip(
-                r#"<a contenteditable="false" data-mention-type="user" style="something" href="https://matrix.to/@test:example.org">test</a>"#,
+                r#"<a style="something" href="https://matrix.to/@test:example.org">test</a>"#,
             );
         }
 
@@ -1111,7 +1094,7 @@ mod js {
             let dom = HtmlParser::default().parse::<Utf16String>(html).unwrap();
             assert_eq!(
                 dom.to_string(),
-                r#"<a href="https://matrix.to/#/@test:example.org" contenteditable="false">test</a>"#
+                r#"<a data-mention-type="user" href="https://matrix.to/#/@test:example.org" contenteditable="false">test</a>"#
             );
         }
 

crates/wysiwyg/src/tests/test_deleting.rs

@@ -901,7 +901,7 @@ fn backspace_mention_multiple() {
     model.backspace();
     assert_eq!(
         restore_whitespace(&tx(&model)),
-        "<a href=\"https://matrix.to/#/@test:example.org\" contenteditable=\"false\">first</a>|"
+        "<a data-mention-type=\"user\" href=\"https://matrix.to/#/@test:example.org\" contenteditable=\"false\">first</a>|"
     );
     model.backspace();
     assert_eq!(restore_whitespace(&tx(&model)), "|");
@@ -972,7 +972,7 @@ fn delete_first_mention_of_multiple() {
     model.delete();
     assert_eq!(
         restore_whitespace(&tx(&model)),
-        "|<a href=\"https://matrix.to/#/@test:example.org\" contenteditable=\"false\">second</a>"
+        "|<a data-mention-type=\"user\" href=\"https://matrix.to/#/@test:example.org\" contenteditable=\"false\">second</a>"
     );
     model.delete();
     assert_eq!(restore_whitespace(&tx(&model)), "|");
@@ -1000,7 +1000,7 @@ fn delete_second_mention_of_multiple() {
     model.delete();
     assert_eq!(
         restore_whitespace(&tx(&model)),
-        "<a href=\"https://matrix.to/#/@test:example.org\" contenteditable=\"false\">first</a> |"
+        "<a data-mention-type=\"user\" href=\"https://matrix.to/#/@test:example.org\" contenteditable=\"false\">first</a> |"
     );
 }