Merge pull request #3013 from tangly1024/release/4.7.11

Release/4.7.11
tangly1024 · Nov 23, 2024 · fac33c4 · fac33c4
2 parents be1ada5 + 668b3c7
commit fac33c4
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 74 deletions.
diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -204,6 +204,9 @@ export function getQueryVariable(key) {
  * @returns {string|null}
  */
 export function getQueryParam(url, param) {
+  if (!url) {
+    return ''
+  }
   // 移除哈希部分
   const urlWithoutHash = url.split('#')[0]
   const searchParams = new URLSearchParams(urlWithoutHash.split('?')[1])

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "4.7.10",
+  "version": "4.7.11",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {

diff --git a/pages/404.js b/pages/404.js
@@ -2,17 +2,15 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 404
  * @param {*} props
  * @returns
  */
 const NoFound = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='Layout404' {...props} />
 }
 
 export async function getStaticProps(req) {

diff --git a/pages/[prefix]/index.js b/pages/[prefix]/index.js
@@ -87,7 +87,7 @@ const Slug = props => {
   return (
     <>
       {/* 文章布局 */}
-      <DynamicLayout theme={theme} router={router} {...props} />
+      <DynamicLayout theme={theme} layoutName='LayoutSlug' {...props} />
       {/* 解锁密码提示框 */}
       {post?.password && post?.password !== '' && !lock && <Notification />}
       {/* 导流工具 */}

diff --git a/pages/_app.js b/pages/_app.js
@@ -8,7 +8,7 @@ import 'react-notion-x/src/styles.css' // 原版的react-notion-x
 
 import useAdjustStyle from '@/hooks/useAdjustStyle'
 import { GlobalContextProvider } from '@/lib/global'
-import { getGlobalLayoutByTheme } from '@/themes/theme'
+import { getBaseLayoutByTheme } from '@/themes/theme'
 import { useRouter } from 'next/router'
 import { useCallback, useMemo } from 'react'
 import { getQueryParam } from '../lib/utils'
@@ -34,7 +34,7 @@ const MyApp = ({ Component, pageProps }) => {
   useAdjustStyle()
 
   const route = useRouter()
-  const queryParam = useMemo(() => {
+  const theme = useMemo(() => {
     return (
       getQueryParam(route.asPath, 'theme') ||
       pageProps?.NOTION_CONFIG?.THEME ||
@@ -45,10 +45,10 @@ const MyApp = ({ Component, pageProps }) => {
   // 整体布局
   const GLayout = useCallback(
     props => {
-      const Layout = getGlobalLayoutByTheme(queryParam)
+      const Layout = getBaseLayoutByTheme(theme)
       return <Layout {...props} />
     },
-    [queryParam]
+    [theme]
   )
 
   const enableClerk = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY

diff --git a/pages/archive/index.js b/pages/archive/index.js
@@ -4,7 +4,6 @@ import { getGlobalData } from '@/lib/db/getSiteData'
 import { isBrowser } from '@/lib/utils'
 import { formatDateFmt } from '@/lib/utils/formatDate'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 import { useEffect } from 'react'
 
 /**
@@ -27,9 +26,8 @@ const ArchiveIndex = props => {
     }
   }, [])
 
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutArchive' {...props} />
 }
 
 export async function getStaticProps({ locale }) {

diff --git a/pages/category/[category]/index.js b/pages/category/[category]/index.js
@@ -2,17 +2,15 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 分类页
  * @param {*} props
  * @returns
  */
 export default function Category(props) {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
 }
 
 export async function getStaticProps({ params: { category }, locale }) {

diff --git a/pages/category/[category]/page/[page].js b/pages/category/[category]/page/[page].js
@@ -2,7 +2,6 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 分类页
@@ -11,9 +10,8 @@ import { useRouter } from 'next/router'
  */
 
 export default function Category(props) {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
 }
 
 export async function getStaticProps({ params: { category, page } }) {

diff --git a/pages/category/index.js b/pages/category/index.js
@@ -2,17 +2,15 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 分类首页
  * @param {*} props
  * @returns
  */
 export default function Category(props) {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
 }
 
 export async function getStaticProps({ locale }) {

diff --git a/pages/dashboard/[[...index]].js b/pages/dashboard/[[...index]].js
@@ -2,7 +2,6 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData, getPost, getPostBlocks } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 根据notion的slug访问页面
@@ -11,9 +10,8 @@ import { useRouter } from 'next/router'
  * @returns
  */
 const Dashboard = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutDashboard' {...props} />
 }
 
 export async function getStaticProps({ locale }) {

diff --git a/pages/index.js b/pages/index.js
@@ -5,17 +5,15 @@ import { generateRobotsTxt } from '@/lib/robots.txt'
 import { generateRss } from '@/lib/rss'
 import { generateSitemapXml } from '@/lib/sitemap.xml'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 首页布局
  * @param {*} props
  * @returns
  */
 const Index = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutIndex' {...props} />
 }
 
 /**

diff --git a/pages/page/[page].js b/pages/page/[page].js
@@ -2,17 +2,15 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData, getPostBlocks } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 文章列表分页
  * @param {*} props
  * @returns
  */
 const Page = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
 }
 
 export async function getStaticPaths({ locale }) {

diff --git a/pages/search/[keyword]/index.js b/pages/search/[keyword]/index.js
@@ -3,12 +3,10 @@ import { getDataFromCache } from '@/lib/cache/cache_manager'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 const Index = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutSearch' {...props} />
 }
 
 /**

diff --git a/pages/search/[keyword]/page/[page].js b/pages/search/[keyword]/page/[page].js
@@ -3,15 +3,13 @@ import { getDataFromCache } from '@/lib/cache/cache_manager'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 const Index = props => {
   const { keyword } = props
   props = { ...props, currentSearch: keyword }
 
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutSearch' {...props} />
 }
 
 /**

diff --git a/pages/search/index.js b/pages/search/index.js
@@ -32,7 +32,7 @@ const Search = props => {
   props = { ...props, posts: filteredPosts }
 
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutSearch' {...props} />
 }
 
 /**

diff --git a/pages/sign-in/[[...index]].js b/pages/sign-in/[[...index]].js
@@ -3,17 +3,15 @@ import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 // import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 登录
  * @param {*} props
  * @returns
  */
 const SignIn = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutSignIn' {...props} />
 }
 
 export async function getStaticProps(req) {

diff --git a/pages/sign-up/[[...index]].js b/pages/sign-up/[[...index]].js
@@ -2,17 +2,15 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 注册
  * @param {*} props
  * @returns
  */
 const SignUp = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutSignUp' {...props} />
 }
 
 export async function getStaticProps(req) {

diff --git a/pages/tag/[tag]/index.js b/pages/tag/[tag]/index.js
@@ -2,17 +2,15 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 /**
  * 标签下的文章列表
  * @param {*} props
  * @returns
  */
 const Tag = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
 }
 
 export async function getStaticProps({ params: { tag }, locale }) {

diff --git a/pages/tag/[tag]/page/[page].js b/pages/tag/[tag]/page/[page].js
@@ -2,12 +2,10 @@ import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { getGlobalData } from '@/lib/db/getSiteData'
 import { DynamicLayout } from '@/themes/theme'
-import { useRouter } from 'next/router'
 
 const Tag = props => {
-  const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
 }
 
 export async function getStaticProps({ params: { tag, page }, locale }) {

diff --git a/pages/tag/index.js b/pages/tag/index.js
@@ -12,7 +12,7 @@ import { useRouter } from 'next/router'
 const TagIndex = props => {
   const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} router={router} {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
 }
 
 export async function getStaticProps(req) {

diff --git a/styles/globals.css b/styles/globals.css
@@ -19,6 +19,7 @@ html {
   position: sticky;
   z-index: 10;
   top: -1px;
+  -webkit-backdrop-filter: blur(5px);
   backdrop-filter: blur(5px);
   transition: all 0.5s cubic-bezier(0.4, 0, 0, 1);
   border-bottom-color: transparent;
@@ -74,6 +75,7 @@ nav {
 
 @supports not (backdrop-filter: none) {
   .sticky-nav {
+    -webkit-backdrop-filter: none;
     backdrop-filter: none;
     @apply bg-day dark:bg-gray-800;
   }