From 9ecf329e667dea89b3bf4745a6a2027823f56b4f Mon Sep 17 00:00:00 2001
From: drizzlesconsin <69514654+drizzlesconsin@users.noreply.github.com>
Date: Tue, 23 Aug 2022 20:23:02 +0800
Subject: [PATCH 1/8] fix(theme-classic): fix empty searchBox
---
.../docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
index 236d237aa082..fcdb8f822ba3 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
@@ -15,5 +15,6 @@ export default function NavbarSearch({
children,
className,
}: Props): JSX.Element {
+ if (!children) return <>;
return {children}
;
}
From b7aa3bf7ae2365a73fa47bfcba7db81a149c29dc Mon Sep 17 00:00:00 2001
From: Joshua Chen
Date: Tue, 23 Aug 2022 08:43:35 -0400
Subject: [PATCH 2/8] Update
packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
---
.../src/theme/Navbar/Search/index.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
index fcdb8f822ba3..b9607b53b8b1 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
@@ -15,6 +15,8 @@ export default function NavbarSearch({
children,
className,
}: Props): JSX.Element {
- if (!children) return <>;
+ if (!children) {
+ return null;
+ }
return {children}
;
}
From 1bcfb751e18efc7cb6814676e5ccbfe5f02e546f Mon Sep 17 00:00:00 2001
From: Joshua Chen
Date: Tue, 23 Aug 2022 08:43:52 -0400
Subject: [PATCH 3/8] Update
packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
---
.../docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
index b9607b53b8b1..e2f5b511e720 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
@@ -14,7 +14,7 @@ import styles from './styles.module.css';
export default function NavbarSearch({
children,
className,
-}: Props): JSX.Element {
+}: Props): JSX.Element | null {
if (!children) {
return null;
}
From 87c7c1cb6c6c4487abde11ac65555f6cfcddf189 Mon Sep 17 00:00:00 2001
From: drizzlesconsin <69514654+drizzlesconsin@users.noreply.github.com>
Date: Tue, 23 Aug 2022 20:56:27 +0800
Subject: [PATCH 4/8] chore: update NavbarSearch type
---
packages/docusaurus-theme-classic/src/theme-classic.d.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index 8cf475b8400c..7cc62a5f202c 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -74,7 +74,6 @@ declare module '@theme/AnnouncementBar/CloseButton' {
declare module '@theme/BackToTopButton' {
export default function BackToTopButton(): JSX.Element;
}
-
declare module '@theme/BlogListPaginator' {
import type {BlogPaginatedMetadata} from '@docusaurus/plugin-content-blog';
@@ -900,7 +899,7 @@ declare module '@theme/Navbar/Search' {
readonly className?: string;
}
- export default function NavbarSearch(props: Props): JSX.Element;
+ export default function NavbarSearch(props: Props): JSX.Element | null;
}
declare module '@theme/NavbarItem/DefaultNavbarItem' {
From 77a61c33f62e58651decbaf7bb065e0548aa4c81 Mon Sep 17 00:00:00 2001
From: drizzlesconsin <69514654+drizzlesconsin@users.noreply.github.com>
Date: Tue, 23 Aug 2022 20:57:58 +0800
Subject: [PATCH 5/8] Update theme-classic.d.ts
---
packages/docusaurus-theme-classic/src/theme-classic.d.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index 7cc62a5f202c..18aca7d8ee98 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -74,6 +74,7 @@ declare module '@theme/AnnouncementBar/CloseButton' {
declare module '@theme/BackToTopButton' {
export default function BackToTopButton(): JSX.Element;
}
+
declare module '@theme/BlogListPaginator' {
import type {BlogPaginatedMetadata} from '@docusaurus/plugin-content-blog';
From ff51a63fed18b814b6695c54511137518cdb4c9c Mon Sep 17 00:00:00 2001
From: Joshua Chen
Date: Tue, 23 Aug 2022 23:50:41 -0400
Subject: [PATCH 6/8] This makes more sense
---
packages/docusaurus-theme-classic/src/theme-classic.d.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index 18aca7d8ee98..3ffea59cfc4c 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -1117,7 +1117,7 @@ declare module '@theme/PaginatorNavLink' {
}
declare module '@theme/SearchBar' {
- export default function SearchBar(): JSX.Element;
+ export default function SearchBar(): JSX.Element | null;
}
declare module '@theme/TabItem' {
From 31ee0b0f1d35d70b5efa4a0e7bd9e53efd22f9b1 Mon Sep 17 00:00:00 2001
From: drizzlesconsin <69514654+drizzlesconsin@users.noreply.github.com>
Date: Wed, 24 Aug 2022 13:46:05 +0800
Subject: [PATCH 7/8] fix: update judgment condition
---
.../src/theme/Navbar/Search/index.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
index e2f5b511e720..fcbb249b2046 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
@@ -7,6 +7,7 @@
import React from 'react';
import clsx from 'clsx';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import type {Props} from '@theme/Navbar/Search';
import styles from './styles.module.css';
@@ -15,7 +16,8 @@ export default function NavbarSearch({
children,
className,
}: Props): JSX.Element | null {
- if (!children) {
+ const {siteConfig} = useDocusaurusContext();
+ if (!siteConfig.themeConfig?.algolia) {
return null;
}
return {children}
;
From efb479e57df6a006995be9ea924d1aa752cda4ff Mon Sep 17 00:00:00 2001
From: drizzlesconsin <69514654+drizzlesconsin@users.noreply.github.com>
Date: Thu, 25 Aug 2022 02:31:05 +0800
Subject: [PATCH 8/8] feat: is child null
---
.../src/theme/Navbar/Search/index.tsx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
index fcbb249b2046..ac092a81e563 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
@@ -7,7 +7,6 @@
import React from 'react';
import clsx from 'clsx';
-import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import type {Props} from '@theme/Navbar/Search';
import styles from './styles.module.css';
@@ -16,8 +15,7 @@ export default function NavbarSearch({
children,
className,
}: Props): JSX.Element | null {
- const {siteConfig} = useDocusaurusContext();
- if (!siteConfig.themeConfig?.algolia) {
+ if ((children as any)?.type?.() === null) {
return null;
}
return {children}
;