Merge branch 'develop' into try/nested-tags-cleanup

Author: mzorz

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -113,7 +113,9 @@ open class MainActivity : AppCompatActivity(),
                         "</div>" +
                         "<br>"
         private val GUTENBERG_CODE_BLOCK = "<!-- wp:core/image {\"id\":316} -->\n" +
-                "<figure class=\"wp-block-image\"><img src=\"https://upload.wikimedia.org/wikipedia/commons/thumb/9/98/WordPress_blue_logo.svg/1200px-WordPress_blue_logo.svg.png\" alt=\"\" /></figure>\n" +
+                "<figure class=\"wp-block-image\"><img src=\"https://upload.wikimedia.org/wikipedia/commons/thumb/9/98/WordPress_blue_logo.svg/1200px-WordPress_blue_logo.svg.png\" alt=\"\" />\n" +
+                "  <figcaption>The WordPress logo!</figcaption>\n" +
+                "</figure>\n" +
                 "<!-- /wp:core/image -->"
         private val PREFORMAT =
                 "<pre>" +
@@ -418,7 +420,9 @@ open class MainActivity : AppCompatActivity(),
         }
 
         if (savedInstanceState == null) {
-            aztec.visualEditor.fromHtml(aztec.sourceEditor?.getPureHtml()!!)
+            if (!isRunningTest) {
+                aztec.visualEditor.fromHtml(EXAMPLE)
+            }
             aztec.initSourceEditorHistory()
         }
 

aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt

@@ -41,6 +41,7 @@ import org.wordpress.aztec.spans.AztecQuoteSpan
 import org.wordpress.aztec.spans.AztecStrikethroughSpan
 import org.wordpress.aztec.spans.AztecUnorderedListSpan
 import org.wordpress.aztec.spans.AztecVideoSpan
+import org.wordpress.aztec.spans.HiddenHtmlBlock
 import org.wordpress.aztec.spans.HiddenHtmlSpan
 import org.wordpress.aztec.spans.IAztecAttributedSpan
 import org.wordpress.aztec.spans.IAztecNestable
@@ -75,10 +76,14 @@ class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = Ar
                 handleElement(output, opening, AztecStrikethroughSpan(tag, AztecAttributes(attributes)))
                 return true
             }
-            DIV, SPAN, FIGURE, FIGCAPTION, SECTION -> {
+            SPAN -> {
                 handleElement(output, opening, HiddenHtmlSpan(tag, AztecAttributes(attributes), nestingLevel))
                 return true
             }
+            DIV, FIGURE, FIGCAPTION, SECTION -> {
+                handleElement(output, opening, HiddenHtmlBlock(tag, AztecAttributes(attributes), nestingLevel))
+                return true
+            }
             LIST_UL -> {
                 handleElement(output, opening, AztecUnorderedListSpan(nestingLevel, AztecAttributes(attributes)))
                 return true

aztec/src/main/kotlin/org/wordpress/aztec/spans/HiddenHtmlBlock.kt

@@ -0,0 +1,14 @@
+package org.wordpress.aztec.spans
+
+import android.text.Layout
+import org.wordpress.aztec.AztecAttributes
+
+class HiddenHtmlBlock(tag: String, override var attributes: AztecAttributes = AztecAttributes(),
+                      override var nestingLevel: Int) : IAztecBlockSpan {
+    override var endBeforeBleed: Int = -1
+    override var startBeforeCollapse: Int = -1
+
+    override var align: Layout.Alignment? = null
+
+    override val TAG: String = tag
+}

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt

@@ -575,6 +575,12 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
     private fun syncSourceFromEditor() {
         val editorHtml = editor!!.toPlainHtml(true)
         val sha256 = AztecText.calculateSHA256(editorHtml)
+
+        if (editorContentParsedSHA256LastSwitch.isEmpty()) {
+            // initialize the var if it's the first time we're about to use it
+            editorContentParsedSHA256LastSwitch = sha256
+        }
+
         if (editor!!.hasChanges() != NO_CHANGES || !Arrays.equals(editorContentParsedSHA256LastSwitch, sha256)) {
             sourceEditor!!.displayStyledAndFormattedHtml(editorHtml)
         }
@@ -585,6 +591,12 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
         // temp var of the source html to load it to the editor if needed
         val sourceHtml = sourceEditor!!.getPureHtml(true)
         val sha256 = AztecText.calculateSHA256(sourceHtml)
+
+        if (sourceContentParsedSHA256LastSwitch.isEmpty()) {
+            // initialize the var if it's the first time we're about to use it
+            sourceContentParsedSHA256LastSwitch = sha256
+        }
+
         if (sourceEditor!!.hasChanges() != NO_CHANGES || !Arrays.equals(sourceContentParsedSHA256LastSwitch, sha256)) {
             editor!!.fromHtml(sourceHtml)
         }

aztec/src/test/kotlin/org/wordpress/aztec/AztecToolbarTest.kt

@@ -1019,23 +1019,23 @@ class AztecToolbarTest {
     @Test
     @Throws(Exception::class)
     fun hiddenElementAlignment() {
-        editText.fromHtml("<div>a<br><div>b<br><span>c</span><br>d</div></div>")
+        editText.fromHtml("<div>a<div>b<br><span>c</span><br>d</div></div>")
 
         editText.setSelection(editText.text.indexOf("a"))
         alignRightButton.performClick()
-        Assert.assertEquals("<div style=\"text-align:right;\">a<br><div>b<br><span>c</span><br>d</div></div>",
+        Assert.assertEquals("<div style=\"text-align:right;\">a<div>b<br><span>c</span><br>d</div></div>",
                 editText.toHtml())
 
         editText.setSelection(editText.text.indexOf("c") + 1)
         alignCenterButton.performClick()
-        Assert.assertEquals("<div style=\"text-align:center;\">a<br>" +
+        Assert.assertEquals("<div style=\"text-align:center;\">a" +
                 "<div style=\"text-align:center;\">b<br>" +
                 "<span style=\"text-align:center;\">c</span><br>d</div></div>",
                 editText.toHtml())
 
         editText.setSelection(editText.text.indexOf("d"))
         alignLeftButton.performClick()
-        Assert.assertEquals("<div style=\"text-align:left;\">a<br>" +
+        Assert.assertEquals("<div style=\"text-align:left;\">a" +
                 "<div style=\"text-align:left;\">b<br>" +
                 "<span style=\"text-align:center;\">c</span><br>d</div></div>",
                 editText.toHtml())