Merge pull request ucfopen#2096 from FrenjaminBanklin/issue/2095-exce…

…rpt-bugs

Resolves crashes when moving text upwards in a document into an excerpt citation.

packages/app/obojobo-document-engine/src/scripts/oboeditor/documents/oboeditor-tutorial.json

@@ -3483,7 +3483,7 @@
 					"id": "889429ed-f7ee-4a61-940a-4d4b6d8089e7",
 					"type": "ObojoboDraft.Pages.Page",
 					"content": {
-						"title": "Box/Excerpt"
+						"title": "Excerpt"
 					},
 					"children": [
 						{

packages/obonode/obojobo-chunks-excerpt/__snapshots__/converter.test.js.snap

@@ -20,24 +20,10 @@ Object {
     Object {
       "children": Array [
         Object {
-          "children": Array [
-            Object {
-              "text": "citation text",
-            },
-          ],
-          "content": Object {
-            "align": "center",
-            "hangingIndent": 0,
-            "indent": 0,
-          },
-          "subtype": "ObojoboDraft.Chunks.Excerpt.CitationLine",
-          "type": "ObojoboDraft.Chunks.Excerpt",
+          "text": "citation text",
         },
       ],
-      "content": Object {
-        "hangingIndent": 0,
-        "indent": 0,
-      },
+      "content": Object {},
       "subtype": "ObojoboDraft.Chunks.Excerpt.CitationText",
       "type": "ObojoboDraft.Chunks.Excerpt",
     },
@@ -71,24 +57,10 @@ Object {
     Object {
       "children": Array [
         Object {
-          "children": Array [
-            Object {
-              "text": "Citation Text",
-            },
-          ],
-          "content": Object {
-            "align": "center",
-            "hangingIndent": 0,
-            "indent": 0,
-          },
-          "subtype": "ObojoboDraft.Chunks.Excerpt.CitationLine",
-          "type": "ObojoboDraft.Chunks.Excerpt",
+          "text": "Citation Text",
         },
       ],
-      "content": Object {
-        "hangingIndent": 0,
-        "indent": 0,
-      },
+      "content": Object {},
       "subtype": "ObojoboDraft.Chunks.Excerpt.CitationText",
       "type": "ObojoboDraft.Chunks.Excerpt",
     },
@@ -109,9 +81,7 @@ Object {
       "type": "OboNode",
     },
   ],
-  "content": Object {
-    "citation": "Citation Line",
-  },
+  "content": Object {},
   "id": "mockKey",
   "type": "ObojoboDraft.Chunks.Excerpt",
 }
@@ -125,7 +95,6 @@ Object {
     },
   ],
   "content": Object {
-    "citation": "Citation Line",
     "triggers": "mock-triggers",
   },
   "id": "mockKey",

packages/obonode/obojobo-chunks-excerpt/__snapshots__/editor-registration.test.js.snap

@@ -1,25 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Excerpt editor renderNode renders excerpt citation line when passed 1`] = `
-<Line
-  attributes={
-    Object {
-      "dummy": "dummyData",
-    }
-  }
-  dummy="dummyData"
-  element={
-    Object {
-      "content": Object {},
-      "subtype": "ObojoboDraft.Chunks.Excerpt.CitationLine",
-      "type": "ObojoboDraft.Chunks.Excerpt",
-    }
-  }
-/>
-`;
-
 exports[`Excerpt editor renderNode renders excerpt citation text when passed 1`] = `
-<Citation
+<cite
   attributes={
     Object {
       "dummy": "dummyData",
@@ -28,6 +10,11 @@ exports[`Excerpt editor renderNode renders excerpt citation text when passed 1`]
   dummy="dummyData"
   element={
     Object {
+      "children": Array [
+        Object {
+          "text": "citation text",
+        },
+      ],
       "content": Object {},
       "subtype": "ObojoboDraft.Chunks.Excerpt.CitationText",
       "type": "ObojoboDraft.Chunks.Excerpt",

packages/obonode/obojobo-chunks-excerpt/components/edge-controls.jsx

@@ -1,3 +1,5 @@
+import './edge-controls.scss'
+
 import React from 'react'
 
 const EdgeControls = ({ position, edges, selectedEdge, onChangeEdge }) => {

packages/obonode/obojobo-chunks-excerpt/components/line/edge-controls.scss → packages/obonode/obojobo-chunks-excerpt/components/edge-controls.scss

@@ -73,11 +73,11 @@ $lighter-blue: lighten($color-obojobo-blue, 60%);
 		}
 
 		&.is-edge-fade::after {
-			background-image: url('../../images/icon-fade-edge.png');
+			background-image: url('../images/icon-fade-edge.png');
 		}
 
 		&.is-edge-jagged::after {
-			background-image: url('../../images/icon-jagged-edge.png');
+			background-image: url('../images/icon-jagged-edge.png');
 		}
 	}
 

packages/obonode/obojobo-chunks-excerpt/converter.js

@@ -5,7 +5,7 @@ import withoutUndefined from 'obojobo-document-engine/src/scripts/common/util/wi
 const EXCERPT_NODE = 'ObojoboDraft.Chunks.Excerpt'
 const EXCERPT_CONTENT_NODE = 'ObojoboDraft.Chunks.Excerpt.ExcerptContent'
 const CITE_TEXT_NODE = 'ObojoboDraft.Chunks.Excerpt.CitationText'
-const CITE_LINE_NODE = 'ObojoboDraft.Chunks.Excerpt.CitationLine'
+
 /**
  * Generates an Obojobo Excerpt Node from a Slate node.
  * Copies the id, type, triggers, and condenses ExcerptLine children and their
@@ -20,7 +20,7 @@ const slateToObo = node => {
 	// but it's only ever going to be a single line of centered text
 	// so there's really no reason to go to the trouble here
 	// this seems a bit magical, though - may be a convenience function somewhere?
-	const citationText = node.children[1].children[0].children[0].text
+	const citationText = node.children[1].children[0].text
 
 	return {
 		id: node.id,
@@ -72,15 +72,8 @@ const oboToSlate = node => {
 	slateNode.children.push({
 		type: EXCERPT_NODE,
 		subtype: CITE_TEXT_NODE,
-		content: { indent: 0, hangingIndent: 0 },
-		children: [
-			{
-				type: EXCERPT_NODE,
-				subtype: CITE_LINE_NODE,
-				content: { indent: 0, hangingIndent: 0, align: 'center' },
-				children: [{ text: node.content.citation }]
-			}
-		]
+		content: {},
+		children: [{ text: node.content.citation }]
 	})
 
 	delete slateNode.content.excerpt

packages/obonode/obojobo-chunks-excerpt/converter.test.js

@@ -118,6 +118,7 @@ describe('Excerpt Converter', () => {
 			}
 		}
 		const slateNode = Converter.oboToSlate(oboNode)
+		expect(slateNode.children[1].children).toEqual([{ text: 'Citation Text' }])
 
 		expect(slateNode).toMatchSnapshot()
 	})

packages/obonode/obojobo-chunks-excerpt/editor-component.scss

@@ -24,7 +24,13 @@ $lighter-blue: lighten($color-obojobo-blue, 60%);
 		}
 	}
 
-	> blockquote .delete-button {
+	// this is a bit of a hack to force the placeholder to do what we want
+	// but it's easier than fixing it 'properly'
+	> blockquote > cite span::before {
+		transform: translateX(-50%);
+	}
+
+	> blockquote > .excerpt-content > .delete-button {
 		position: absolute;
 		left: auto;
 		top: 0;