Fix: prevent editing of the span that wraps math.

Author: bjones1

server/src/processing.rs

@@ -1176,11 +1176,21 @@ fn replace_math_node(child: &Rc<Node>, is_hydrate: bool) -> Option<Rc<Node>> {
     {
         // Final test: if the class is correct, this is math; otherwise, perform
         // no transformation.
+        //
+        // Add/remove the `mceNonEditable` class to prevent accidental edits of this span.
         let attr_value_str: &str = attr_value;
-        let delim = match attr_value_str {
-            "math math-inline" => Some(("\\(", "\\)")),
-            "math math-display" => Some(("$$", "$$")),
-            _ => None,
+        let delim = if is_hydrate {
+            match attr_value_str {
+                "math math-inline" => Some(("\\(", "\\)", "math math-inline mceNonEditable")),
+                "math math-display" => Some(("$$", "$$", "math math-display mceNonEditable")),
+                _ => None,
+            }
+        } else {
+            match attr_value_str {
+                "math math-inline mceNonEditable" => Some(("\\(", "\\)", "math math-inline")),
+                "math math-display mceNonEditable" => Some(("$$", "$$", "math math-display")),
+                _ => None,
+            }
         };
 
         // Since we've already borrowed `child`, we can't `borrow_mut` to modify
@@ -1205,7 +1215,7 @@ fn replace_math_node(child: &Rc<Node>, is_hydrate: bool) -> Option<Rc<Node>> {
                 name: QualName::new(None, Namespace::from(""), LocalName::from("span")),
                 attrs: RefCell::new(vec![Attribute {
                     name: QualName::new(None, Namespace::from(""), LocalName::from("class")),
-                    value: attr_value.clone(),
+                    value: delim.2.into(),
                 }]),
                 template_contents: RefCell::new(None),
                 mathml_annotation_xml_integration_point: false,

server/src/processing/tests.rs

@@ -1293,12 +1293,12 @@ fn test_hydrate_html_1() {
         .unwrap(),
         indoc!(
             r#"
-            <p><span class="math math-inline">\({a}_1, b_{2}\)</span>
-            <span class="math math-inline">\(a*1, b*2\)</span>
-            <span class="math math-inline">\([a](b)\)</span>
-            <span class="math math-inline">\(3 &lt;a&gt; b\)</span>
-            <span class="math math-inline">\(a \; b\)</span></p>
-            <p><span class="math math-display">$${a}_1, b_{2}, a*1, b*2, [a](b), 3 &lt;a&gt; b, a \; b$$</span></p>
+            <p><span class="math math-inline mceNonEditable">\({a}_1, b_{2}\)</span>
+            <span class="math math-inline mceNonEditable">\(a*1, b*2\)</span>
+            <span class="math math-inline mceNonEditable">\([a](b)\)</span>
+            <span class="math math-inline mceNonEditable">\(3 &lt;a&gt; b\)</span>
+            <span class="math math-inline mceNonEditable">\(a \; b\)</span></p>
+            <p><span class="math math-display mceNonEditable">$${a}_1, b_{2}, a*1, b*2, [a](b), 3 &lt;a&gt; b, a \; b$$</span></p>
             "#
         )
     );
@@ -1380,12 +1380,12 @@ fn test_dehydrate_html_1() {
             .convert(
                 &dehydrate_html(indoc!(
                     r#"
-                    <p><span class="math math-inline">\({a}_1, b_{2}\)</span>
-                    <span class="math math-inline">\(a*1, b*2\)</span>
-                    <span class="math math-inline">\([a](b)\)</span>
-                    <span class="math math-inline">\(3 &lt;a&gt; b\)</span>
-                    <span class="math math-inline">\(a \; b\)</span></p>
-                    <p><span class="math math-display">$${a}_1, b_{2}, a*1, b*2, [a](b), 3 &lt;a&gt; b, a \; b$$</span></p>
+                    <p><span class="math math-inline mceNonEditable">\({a}_1, b_{2}\)</span>
+                    <span class="math math-inline mceNonEditable">\(a*1, b*2\)</span>
+                    <span class="math math-inline mceNonEditable">\([a](b)\)</span>
+                    <span class="math math-inline mceNonEditable">\(3 &lt;a&gt; b\)</span>
+                    <span class="math math-inline mceNonEditable">\(a \; b\)</span></p>
+                    <p><span class="math math-display mceNonEditable">$${a}_1, b_{2}, a*1, b*2, [a](b), 3 &lt;a&gt; b, a \; b$$</span></p>
                     "#
                 ))
                 .unwrap()