From fabc4c18f5d016102370c3ef1bc4194e078269ac Mon Sep 17 00:00:00 2001
From: sanyuan <494130947@qq.com>
Date: Sun, 9 Oct 2022 20:22:42 +0800
Subject: [PATCH] fix:  unexpect html string custom head children is undefined

---
 src/node/build.ts                            | 14 +++++++++-----
 src/theme-default/layout/DocLayout/index.tsx | 19 +++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/node/build.ts b/src/node/build.ts
index c61063ef..40170a17 100644
--- a/src/node/build.ts
+++ b/src/node/build.ts
@@ -244,7 +244,11 @@ class SSGBuilder {
         const attrString = Object.keys(attrs).reduce((pre, cur) => {
           return `${pre} ${cur}="${attrs[cur]}"`;
         }, '');
-        return `<${tag} ${attrString}> ${children} </${tag}>`;
+        if (children === undefined || children === null) {
+          return `<${tag} ${attrString} />`;
+        } else {
+          return `<${tag} ${attrString}>${children}</${tag}>`;
+        }
       })
       .join('\n');
 
@@ -258,10 +262,10 @@ class SSGBuilder {
         this.#config.siteData!.icon
       }" type="image/svg+xml"></link>
       ${headTag || ''}
-      ${helmet?.title.toString() || ''}
-      ${helmet?.meta.toString() || ''}
-      ${helmet?.link.toString() || ''}
-      ${helmet?.style.toString() || ''}
+      ${helmet?.title?.toString() || ''}
+      ${helmet?.meta?.toString() || ''}
+      ${helmet?.link?.toString() || ''}
+      ${helmet?.style?.toString() || ''}
       <script defer src='https://ga.jspm.io/npm:es-module-shims@1.6.0/dist/es-module-shims.js'></script>
       <script type="importmap">
         {
diff --git a/src/theme-default/layout/DocLayout/index.tsx b/src/theme-default/layout/DocLayout/index.tsx
index 4625198f..d17a0932 100644
--- a/src/theme-default/layout/DocLayout/index.tsx
+++ b/src/theme-default/layout/DocLayout/index.tsx
@@ -7,17 +7,24 @@ import { Content, usePageData } from 'island/client';
 import { useLocaleSiteData } from '../../logic';
 
 export function DocLayout() {
-  const { toc: headers = [], siteData, pagePath } = usePageData();
+  const { toc: headers = [], siteData, pagePath, frontmatter } = usePageData();
   const themeConfig = siteData.themeConfig;
   const localesData = useLocaleSiteData();
   const sidebar = localesData.sidebar || [];
+  // siderbar Priority
+  // 1. frontmatter.sidebar
+  // 2. themeConfig.locales.sidebar
+  // 3. themeConfig.sidebar
   const hasSidebar =
-    (Array.isArray(sidebar) && sidebar.length > 0) ||
-    Object.keys(sidebar).length > 0;
+    frontmatter?.sidebar !== false &&
+    ((Array.isArray(sidebar) && sidebar.length > 0) ||
+      Object.keys(sidebar).length > 0);
   const outlineTitle =
     localesData?.outlineTitle || themeConfig?.outlineTitle || 'ON THIS PAGE';
-
-  const hasAside = headers.length > 0 && themeConfig.outline !== false;
+  const hasAside =
+    headers.length > 0 &&
+    themeConfig.outline !== false &&
+    frontmatter?.outline !== false;
 
   return (
     <div p="t-0 x-6 b-24 sm:6">
@@ -27,7 +34,7 @@ export function DocLayout() {
           <div
             relative="~"
             m="x-auto"
-            className="md:max-w-712px lg:min-w-640px"
+            className={'md:max-w-712px lg:min-w-640px'}
           >
             <div className="island-doc">
               <Content fallback={<div>Loading...</div>} />