Merge branch 'next' into main

readmeio · Jun 15, 2021 · 6feecea · 6feecea
2 parents dc06e20 + 24142c0
commit 6feecea
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 ===
 
+## Version 6.27.2-next.1
+
+### ✨ New & Improved
+
+* **tables:** hide empty table header rows ([#99](https://github.com/readmeio/markdown/issues/99)) ([8b6d24b](https://github.com/readmeio/markdown/commit/8b6d24bf3b1cebfce19b161bb669e504bddf083d))
+
 ## Version 6.27.1
 
 ### 🛠 Fixes & Updates

diff --git a/...sual-regression-tests-rdmd-syntax-renders-callouts-without-surprises-1-snap.png b/...sual-regression-tests-rdmd-syntax-renders-callouts-without-surprises-1-snap.png
diff --git a/...visual-regression-tests-rdmd-syntax-renders-tables-without-surprises-1-snap.png b/...visual-regression-tests-rdmd-syntax-renders-tables-without-surprises-1-snap.png
diff --git a/components/HTMLBlock.jsx b/components/HTMLBlock.jsx
@@ -6,7 +6,11 @@ const PropTypes = require('prop-types');
 const MATCH_SCRIPT_TAGS = /<script\b[^>]*>([\s\S]*?)<\/script>\n?/gim;
 
 const extractScripts = (html = '') => {
-  const scripts = [...html.matchAll(MATCH_SCRIPT_TAGS)].map(m => m[1]);
+  const scripts = [];
+  let match;
+  while ((match = MATCH_SCRIPT_TAGS.exec(html)) !== null) {
+    scripts.push(match[1]);
+  }
   const cleaned = html.replace(MATCH_SCRIPT_TAGS, '');
   return [cleaned, () => scripts.map(js => window.eval(js))];
 };

diff --git a/components/Table/style.scss b/components/Table/style.scss
@@ -21,12 +21,18 @@
 
     tr {
       background-color: var(--table-row, #{$row});
-      border-top: 1px solid var(--table-edges, #{$edges});
+      & + tr {
+        border-top: 1px solid var(--table-edges, #{$edges});
+      }
     }
 
     th,
     thead td {
       font-weight: 600;
+      &:empty {
+        padding: 0;
+        border: none;
+      }
     }
 
     td,
@@ -39,7 +45,7 @@
       > :first-child, > :only-child { margin-top:    0 !important }
       > :last-child, > :only-child  { margin-bottom: 0 !important }
     }
-    
+
     &:not(.plain) tr:nth-child(2n) {
       background-color: var(--table-stripe, #{$stripe});
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@readme/markdown",
   "description": "ReadMe's React-based Markdown parser",
   "author": "Rafe Goldberg <[email protected]>",
-  "version": "6.27.1",
+  "version": "6.27.2-next.1",
   "main": "dist/main.node.js",
   "browser": "dist/main.js",
   "files": [