@brillout/docpress 0.15.0 → 0.15.2

package/Layout.tsx

@@ -18,7 +18,6 @@ import { autoScrollNav_SSR } from './autoScrollNav'
 import { SearchLink } from './docsearch/SearchLink'
 import { navigate } from 'vike/client/router'
 import { css } from './utils/css'
-import { PassThrough } from './utils/PassTrough'
 import { Style } from './utils/Style'
 import { cls } from './utils/cls'
 import { iconBooks } from './icons'
@@ -282,7 +281,7 @@ const menuLinkStyle: React.CSSProperties = {
 function NavHead({ isNavLeft }: { isNavLeft?: true }) {
   const pageContext = usePageContext()
   const { isLandingPage } = pageContext.conf
-  const { navMaxWidth, name } = pageContext.globalContext.config.docpress
+  const { navMaxWidth, name, algolia } = pageContext.globalContext.config.docpress
 
   const navSecondaryContent = (
     <div
@@ -351,7 +350,7 @@ function NavHead({ isNavLeft }: { isNavLeft?: true }) {
         >
           <NavLogo className="grow-half" />
           {!isNavLeft && <div className="desktop-grow" />}
-          <SearchLink className="grow-half" style={menuLinkStyle} />
+          {algolia && <SearchLink className="grow-half" style={menuLinkStyle} />}
           <MenuToggleMain className="grow-full" style={menuLinkStyle} />
           {navSecondaryContent}
         </div>
@@ -483,8 +482,36 @@ function NavHeaderLeftFullWidthBackground() {
 
 function NavLogo({ className }: { className: string }) {
   const pageContext = usePageContext()
-  const iconSize = pageContext.globalContext.config.docpress.navLogoSize ?? 39
-  const { name } = pageContext.globalContext.config.docpress
+
+  const { navLogo } = pageContext.globalContext.config.docpress
+  let navLogoResolved = navLogo
+  if (!navLogoResolved) {
+    const iconSize = pageContext.globalContext.config.docpress.navLogoSize ?? 39
+    const { name, logo, navLogoStyle, navLogoTextStyle } = pageContext.globalContext.config.docpress
+    navLogoResolved = (
+      <>
+        <img
+          src={logo}
+          style={{
+            height: iconSize,
+            width: iconSize,
+            ...navLogoStyle,
+          }}
+          onContextMenu={onContextMenu}
+        />
+        <span
+          style={{
+            marginLeft: `calc(var(--icon-text-padding) + 2px)`,
+            fontSize: isProjectNameShort(name) ? '1.65em' : '1.3em',
+            ...navLogoTextStyle,
+          }}
+        >
+          {name}
+        </span>
+      </>
+    )
+  }
+
   return (
     <a
       className={cls(['nav-logo', className])}
@@ -495,32 +522,18 @@ function NavLogo({ className }: { className: string }) {
         color: 'inherit',
       }}
       href="/"
+      onContextMenu={!navLogo ? undefined : onContextMenu}
     >
-      <img
-        src={pageContext.globalContext.config.docpress.logo}
-        style={{
-          height: iconSize,
-          width: iconSize,
-          ...pageContext.globalContext.config.docpress.navLogoStyle,
-        }}
-        onContextMenu={(ev) => {
-          if (!pageContext.globalContext.config.docpress.pressKit) return // no /press page
-          if (window.location.pathname === '/press') return
-          ev.preventDefault()
-          navigate('/press#logo')
-        }}
-      />
-      <span
-        style={{
-          marginLeft: `calc(var(--icon-text-padding) + 2px)`,
-          fontSize: isProjectNameShort(name) ? '1.65em' : '1.3em',
-          ...pageContext.globalContext.config.docpress.navLogoTextStyle,
-        }}
-      >
-        {name}
-      </span>
+      {navLogoResolved}
     </a>
   )
+
+  function onContextMenu(ev: React.MouseEvent<unknown, MouseEvent>) {
+    if (!pageContext.globalContext.config.docpress.pressKit) return // no /press page
+    if (window.location.pathname === '/press') return
+    ev.preventDefault()
+    navigate('/press#logo')
+  }
 }
 function isProjectNameShort(name: string) {
   return name.length <= 4

package/dist/types/Config.d.ts

@@ -24,12 +24,13 @@ type Config = {
     i18n?: true;
     pressKit?: true;
     docsDir?: string;
-    globalNote?: React.ReactNode;
-    topNavigation?: React.ReactNode;
     navMaxWidth?: number;
+    topNavigation?: React.ReactNode;
+    navLogo?: React.ReactNode;
     navLogoSize?: number;
     navLogoStyle?: React.CSSProperties;
     navLogoTextStyle?: React.CSSProperties;
+    globalNote?: React.ReactNode;
 };
 /** Order in Algolia search results */
 type Category = string | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",

package/types/Config.ts

@@ -30,13 +30,16 @@ type Config = {
   i18n?: true
   pressKit?: true
   docsDir?: string
+  navMaxWidth?: number
 
-  globalNote?: React.ReactNode
   topNavigation?: React.ReactNode
-  navMaxWidth?: number
+
+  navLogo?: React.ReactNode
   navLogoSize?: number
   navLogoStyle?: React.CSSProperties
   navLogoTextStyle?: React.CSSProperties
+
+  globalNote?: React.ReactNode
 }
 
 /** Order in Algolia search results */