fix: Actually use spoiler summary defaults

ggs-dev · Sep 20, 2020 · f1ebfba · f1ebfba
1 parent 18dc27c
commit f1ebfba
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 30 deletions.
diff --git a/packages/remark-spoilers/__tests__/__snapshots__/index.spec.js.snap b/packages/remark-spoilers/__tests__/__snapshots__/index.spec.js.snap
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`spoilers should not show spoiler if duped start token 1`] = `
-"<details></details>
-<details></details>
-<details></details>
-<details></details>
-<details></details>
-<details></details>
+"<details><summary>Open spoiler</summary></details>
+<details><summary>Open spoiler</summary></details>
+<details><summary>Open spoiler</summary></details>
+<details><summary>Open spoiler</summary></details>
+<details><summary>Open spoiler</summary></details>
+<details><summary>Open spoiler</summary></details>
 <p>why isn't this working!?</p>
 <p>there's no end!!!</p>
 "
@@ -44,7 +44,7 @@ exports[`spoilers should show spoiler with custom summary 1`] = `
 `;
 
 exports[`spoilers should show spoiler with details class name 1`] = `
-"<details class=\\"hello hello-world\\"><p>peek-a-boo!</p></details>
+"<details class=\\"hello hello-world\\"><summary>Open spoiler</summary><p>peek-a-boo!</p></details>
 "
 `;
 
@@ -54,6 +54,6 @@ exports[`spoilers should show spoiler with summary class name 1`] = `
 `;
 
 exports[`spoilers should show spoiler without custom summary 1`] = `
-"<details><p>peek-a-boo!</p></details>
+"<details><summary>Open spoiler</summary><p>peek-a-boo!</p></details>
 "
 `;
diff --git a/packages/remark-spoilers/src/index.js b/packages/remark-spoilers/src/index.js
@@ -71,32 +71,28 @@ export default function plugin(options = {}) {
     const start = eat.now()
     const add = eat(block)
     const end = eat.now()
-    let children = []
     let childrenBlockContent = this.tokenizeBlock(blockContent, start)
 
-    if (summary !== '') {
-      children.push({
-        type: 'summary',
-        data: {
-          hName: 'summary',
-          hProperties: {
-            class: options.summaryClassName
-          }
-        },
-        children: [
-          {
-            type: 'text',
-            value: summary
-          }
-        ]
-      })
-    }
-
-    children = [...children, ...childrenBlockContent]
-
     return add({
       type: 'spoiler',
-      children: children,
+      children: [
+        {
+          type: 'summary',
+          data: {
+            hName: 'summary',
+            hProperties: {
+              class: options.summaryClassName
+            }
+          },
+          children: [
+            {
+              type: 'text',
+              value: summary !== '' ? summary : options.defaultSummary
+            }
+          ]
+        },
+        ...childrenBlockContent
+      ],
       data: {
         hName: 'details',
         hProperties: {