🐛 Output HTML as div instead of p

BREAKING CHANGE: Output is now a `div` in order to allow nesting
favoloso · Mar 12, 2019 · 38d36bb · 38d36bb
1 parent 3537f48
commit 38d36bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/parser.spec.ts b/src/parser.spec.ts
@@ -18,9 +18,9 @@ describe('parser', () => {
         :::
       `)
     ).toMatchInlineSnapshot(`
-"<p class=\\"callout callout-info\\"><p>Info
+"<div class=\\"callout callout-info\\"><p>Info
 :::</p>
-</p>"
+</div>"
 `);
   });
 
@@ -35,9 +35,9 @@ describe('parser', () => {
         Normal paragraph
       `)
     ).toMatchInlineSnapshot(`
-"<p class=\\"callout callout-info\\"><p>Info
+"<div class=\\"callout callout-info\\"><p>Info
 :::</p>
-</p><p>Normal paragraph</p>
+</div><p>Normal paragraph</p>
 "
 `);
   });
@@ -54,9 +54,9 @@ describe('parser', () => {
       `)
     ).toMatchInlineSnapshot(`
 "<p>Normal paragraph</p>
-<p class=\\"callout callout-info\\"><p>Info
+<div class=\\"callout callout-info\\"><p>Info
 :::</p>
-</p>"
+</div>"
 `);
   });
 
@@ -73,10 +73,10 @@ describe('parser', () => {
         :::
       `)
     ).toMatchInlineSnapshot(`
-"<p class=\\"callout callout-caution\\"><p><em>Alert!</em></p>
+"<div class=\\"callout callout-caution\\"><p><em>Alert!</em></p>
 <pre><code>this is my code block
 </code></pre>
-</p>"
+</div>"
 `);
   });
 
@@ -88,8 +88,8 @@ describe('parser', () => {
         *Alert!*
       `)
     ).toMatchInlineSnapshot(`
-"<p class=\\"callout callout-caution\\"><p><em>Alert!</em></p>
-</p>"
+"<div class=\\"callout callout-caution\\"><p><em>Alert!</em></p>
+</div>"
 `);
   });
 
@@ -102,9 +102,9 @@ describe('parser', () => {
         :art:
       `)
     ).toMatchInlineSnapshot(`
-"<p class=\\"callout callout-caution\\"><p>Message
+"<div class=\\"callout callout-caution\\"><p>Message
 :art:</p>
-</p>"
+</div>"
 `);
   });
 });
diff --git a/src/parser.ts b/src/parser.ts
@@ -31,7 +31,7 @@ export const parser: Remarkable.BlockParsingRule = (
   while (nextLine < endLine) {
     nextLine++;
 
-    const nextPos = state.bMarks[nextLine] + state.tShift[nextLine];
+    const nextPos = state.bMarks[nextLine] + state.blkIndent;
     const nextMax = state.eMarks[nextLine];
 
     if (state.src.charCodeAt(nextPos) !== marker) continue;
@@ -46,14 +46,14 @@ export const parser: Remarkable.BlockParsingRule = (
   // Let register token and progress
   state.tokens.push({
     type: TOKENS.CALLOUT_OPEN,
-    level: state.level++,
+    level: state.level,
     lines: [startLine, nextLine + (hasEnding ? 1 : 0)],
     calloutType
   } as any);
   state.parser.tokenize(state, startLine + 1, nextLine);
   state.tokens.push({
     type: TOKENS.CALLOUT_CLOSE,
-    level: state.level--
+    level: state.level
   } as any);
   state.line = nextLine + (hasEnding ? 1 : 0);
   return true;

diff --git a/src/renderer.ts b/src/renderer.ts
@@ -10,7 +10,7 @@ export const calloutOpenRenderer: Remarkable.Rule = (
   env
 ) => {
   const token = tokens[idx] as any;
-  return `<p class="callout callout-${token.calloutType}">`;
+  return `<div class="callout callout-${token.calloutType}">`;
 };
 
 /**
@@ -22,5 +22,5 @@ export const calloutCloseRenderer: Remarkable.Rule = (
   options,
   env
 ) => {
-  return `</p>`;
+  return `</div>`;
 };