@brillout/docpress 0.7.10-commit-d154167 → 0.8.0

package/dist/navigation/Navigation.d.ts

@@ -12,7 +12,7 @@ type NavItem = {
     menuModalFullWidth?: true;
 };
 type NavItemAll = NavItem & {
-    columnLayoutEntry?: true;
+    columnLayoutElement?: true;
 };
 declare function NavigationContent(props: {
     navItems: NavItem[];

package/dist/navigation/Navigation.js

@@ -28,7 +28,7 @@ function NavigationContent(props) {
     }
     else {
         assert(!props.showOnlyRelevant);
-        var navItemsColumnLayout = groupByColumns(navItemsWithComputed);
+        var navItemsColumnLayout = groupByColumnLayout(navItemsWithComputed);
         var paddingBottom_1 = 40;
         navContent = (React.createElement(React.Fragment, null, navItemsColumnLayout.map(function (_a, i) {
             var navItemsColumnEntries = _a.navItemsColumnEntries, isFullWidth = _a.isFullWidth;
@@ -40,7 +40,7 @@ function NavigationContent(props) {
                         flexGrow: 1,
                         columnGap: 20,
                         paddingBottom: isFullWidth ? paddingBottom_1 : undefined,
-                    } }, navItemsColumnEntries.map(function (navItemColumnEntry, k) { return (React.createElement("div", { key: k, className: "column-layout-entry", style: {
+                    } }, navItemsColumnEntries.map(function (navItemColumnEntry, j) { return (React.createElement("div", { key: j, className: "column-layout-entry", style: {
                         breakInside: 'avoid',
                         paddingBottom: !isFullWidth ? paddingBottom_1 : undefined,
                         width: '100%',
@@ -80,7 +80,7 @@ function NavItemComponent(_a) {
             .filter(Boolean)
             .join(' '), href: (_b = navItem.url) !== null && _b !== void 0 ? _b : undefined }, titleInNavJsx));
 }
-function groupByColumns(navItems) {
+function groupByColumnLayout(navItems) {
     var navItemsColumnLayout = [];
     var navItemsColumnEntries = [];
     var isFullWidth;
@@ -94,7 +94,7 @@ function groupByColumns(navItems) {
             }
         }
         assert(isFullWidth !== undefined);
-        if (navItem.columnLayoutEntry) {
+        if (navItem.columnLayoutElement) {
             assert(navItem.level === 1 || navItem.level === 4);
             var navItemColumnEntry = __assign(__assign({}, navItem), { navItemChilds: [] });
             navItemsColumnEntries.push(navItemColumnEntry);

package/dist/renderer/getStyleColumnLayout.js

@@ -36,6 +36,7 @@ function determineColumnLayoutEntries(navItems) {
     navItemsWithLength.forEach(function (navItem) {
         if (navItem.level === 1) {
             navItemLevel1 = navItem;
+            navItemLevel4 = undefined;
             return;
         }
         if (navItem.level === 4) {
@@ -43,7 +44,7 @@ function determineColumnLayoutEntries(navItems) {
             return;
         }
         var bumpNavItemLength = function (navItem) {
-            assert(navItem.numberOfHeadings !== null && navItem.numberOfHeadings >= 0);
+            assert(navItem.numberOfHeadings !== null);
             navItem.numberOfHeadings++;
         };
         assert(navItemLevel1);
@@ -67,12 +68,18 @@ function determineColumnLayoutEntries(navItems) {
                 columns = [];
             }
         }
-        if ((!isFullWidth && navItem.level === 1) ||
-            (isFullWidth && navItem.level === 4 && navItemsWithLength[i - 1].level !== 1) ||
-            isFullWidthBegin) {
+        if (!isFullWidth
+            ? navItem.level === 1
+            : (navItem.level === 4 && navItemsWithLength[i - 1].level !== 1) || isFullWidthBegin) {
+            if (isFullWidth) {
+                assert(navItem.level === 4 || (navItem.level === 1 && isFullWidthBegin));
+            }
+            else {
+                assert(navItem.level === 1);
+            }
             assert(navItem.numberOfHeadings !== null);
             columns.push(navItem.numberOfHeadings);
-            navItems[i].columnLayoutEntry = true;
+            navItems[i].columnLayoutElement = true;
         }
     });
     columnLayouts.push(columns);

package/docsearch/SearchLink.tsx

@@ -1,7 +1,7 @@
 export { SearchLink }
 
 import React from 'react'
-import { openDocsearchModal } from './closeDocsearchModal'
+import { openDocsearchModal } from './toggleDocsearchModal'
 
 type PropsDiv = React.HTMLProps<HTMLDivElement>
 function SearchLink(props: PropsDiv) {

package/initKeyBindings.ts

@@ -1,6 +1,6 @@
 export { initKeyBindings }
 
-import { closeDocsearchModal } from './docsearch/closeDocsearchModal'
+import { closeDocsearchModal } from './docsearch/toggleDocsearchModal'
 import { closeMenuModal, toggleMenuModal } from './MenuModal'
 
 function initKeyBindings() {

package/navigation/Navigation.tsx

@@ -19,7 +19,7 @@ type NavItem = {
   menuModalFullWidth?: true
 }
 type NavItemAll = NavItem & {
-  columnLayoutEntry?: true
+  columnLayoutElement?: true
 }
 function NavigationContent(props: {
   navItems: NavItem[]
@@ -36,7 +36,7 @@ function NavigationContent(props: {
       .map((navItem, i) => <NavItemComponent navItem={navItem} key={i} />)
   } else {
     assert(!props.showOnlyRelevant)
-    const navItemsColumnLayout = groupByColumns(navItemsWithComputed)
+    const navItemsColumnLayout = groupByColumnLayout(navItemsWithComputed)
     const paddingBottom = 40
     navContent = (
       <>
@@ -56,9 +56,9 @@ function NavigationContent(props: {
                 paddingBottom: isFullWidth ? paddingBottom : undefined,
               }}
             >
-              {navItemsColumnEntries.map((navItemColumnEntry, k) => (
+              {navItemsColumnEntries.map((navItemColumnEntry, j) => (
                 <div
-                  key={k}
+                  key={j}
                   className="column-layout-entry"
                   style={{
                     breakInside: 'avoid',
@@ -129,7 +129,7 @@ function NavItemComponent({
 }
 
 type NavItemsColumnEntry = NavItemComputed & { navItemChilds: NavItemComputed[] }
-function groupByColumns(navItems: NavItemComputed[]) {
+function groupByColumnLayout(navItems: NavItemComputed[]) {
   const navItemsColumnLayout: { navItemsColumnEntries: NavItemsColumnEntry[]; isFullWidth: boolean }[] = []
   let navItemsColumnEntries: NavItemsColumnEntry[] = []
   let isFullWidth: boolean | undefined
@@ -143,7 +143,7 @@ function groupByColumns(navItems: NavItemComputed[]) {
       }
     }
     assert(isFullWidth !== undefined)
-    if (navItem.columnLayoutEntry) {
+    if (navItem.columnLayoutElement) {
       assert(navItem.level === 1 || navItem.level === 4)
       const navItemColumnEntry = { ...navItem, navItemChilds: [] }
       navItemsColumnEntries.push(navItemColumnEntry)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.7.10-commit-d154167",
+  "version": "0.8.0",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",

package/renderer/getStyleColumnLayout.ts

@@ -18,7 +18,7 @@ const columnWidthMin = 300
 const columnWidthMax = 350
 
 type NavItemWithLength = NavItemAll & { numberOfHeadings: number | null }
-function determineColumnLayoutEntries(navItems: NavItemAll[]) {
+function determineColumnLayoutEntries(navItems: NavItemAll[]): { columnLayouts: number[][] } {
   const navItemsWithLength: NavItemWithLength[] = navItems.map((navItem) => ({
     ...navItem,
     numberOfHeadings: navItem.level === 1 || navItem.level === 4 ? 0 : null,
@@ -28,6 +28,7 @@ function determineColumnLayoutEntries(navItems: NavItemAll[]) {
   navItemsWithLength.forEach((navItem) => {
     if (navItem.level === 1) {
       navItemLevel1 = navItem
+      navItemLevel4 = undefined
       return
     }
     if (navItem.level === 4) {
@@ -35,7 +36,7 @@ function determineColumnLayoutEntries(navItems: NavItemAll[]) {
       return
     }
     const bumpNavItemLength = (navItem: NavItemWithLength) => {
-      assert(navItem.numberOfHeadings !== null && navItem.numberOfHeadings >= 0)
+      assert(navItem.numberOfHeadings !== null)
       navItem.numberOfHeadings++
     }
     assert(navItemLevel1)
@@ -60,13 +61,18 @@ function determineColumnLayoutEntries(navItems: NavItemAll[]) {
       }
     }
     if (
-      (!isFullWidth && navItem.level === 1) ||
-      (isFullWidth && navItem.level === 4 && navItemsWithLength[i - 1]!.level !== 1) ||
-      isFullWidthBegin
+      !isFullWidth
+        ? navItem.level === 1
+        : (navItem.level === 4 && navItemsWithLength[i - 1]!.level !== 1) || isFullWidthBegin
     ) {
+      if (isFullWidth) {
+        assert(navItem.level === 4 || (navItem.level === 1 && isFullWidthBegin))
+      } else {
+        assert(navItem.level === 1)
+      }
       assert(navItem.numberOfHeadings !== null)
       columns.push(navItem.numberOfHeadings)
-      navItems[i].columnLayoutEntry = true
+      navItems[i].columnLayoutElement = true
     }
   })
   columnLayouts.push(columns)

package/renderer/onRenderClient.tsx

@@ -10,7 +10,6 @@ import '../css/index.css'
 import { autoScrollNav } from '../autoScrollNav'
 import { installSectionUrlHashs } from '../installSectionUrlHashs'
 import { getGlobalObject } from '../utils/client'
-import { setpageContextCurrent } from './getPageContextCurrent'
 import { initKeyBindings } from '../initKeyBindings'
 
 const globalObject = getGlobalObject<{
@@ -22,8 +21,6 @@ addEcosystemStamp()
 initKeyBindings()
 
 async function onRenderClient(pageContext: PageContextClient) {
-  setpageContextCurrent(pageContext)
-
   onRenderStart()
 
   // TODO: stop using any

package/renderer/getPageContextCurrent.ts

@@ -1,16 +0,0 @@
-export { getpageContextCurrent }
-export { setpageContextCurrent }
-
-import { PageContextClient } from 'vike/types'
-import { getGlobalObject } from '../utils/getGlobalObject'
-
-const globalObject = getGlobalObject<{
-  pageContextCurrent?: PageContextClient
-}>('onRenderClient.ts', {})
-
-function getpageContextCurrent(): undefined | PageContextClient {
-  return globalObject.pageContextCurrent
-}
-function setpageContextCurrent(pageContext: PageContextClient): void {
-  globalObject.pageContextCurrent = pageContext
-}