@brillout/docpress 0.8.0 → 0.8.1

package/dist/navigation/Navigation.d.ts

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

package/dist/navigation/Navigation.js

@@ -94,7 +94,7 @@ function groupByColumnLayout(navItems) {
             }
         }
         assert(isFullWidth !== undefined);
-        if (navItem.columnLayoutElement) {
+        if (navItem.isColumnLayoutElement) {
             assert(navItem.level === 1 || navItem.level === 4);
             var navItemColumnEntry = __assign(__assign({}, navItem), { navItemChilds: [] });
             navItemsColumnEntries.push(navItemColumnEntry);

package/dist/renderer/getStyleColumnLayout.js

@@ -25,7 +25,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 export { getStyleColumnLayout };
 export { determineColumnLayoutEntries };
 import { css } from '../utils/css';
-import { assert, isBrowser } from '../utils/server';
+import { assert, assertUsage, isBrowser } from '../utils/server';
 assert(!isBrowser());
 var columnWidthMin = 300;
 var columnWidthMax = 350;
@@ -68,18 +68,27 @@ function determineColumnLayoutEntries(navItems) {
                 columns = [];
             }
         }
-        if (!isFullWidth
-            ? navItem.level === 1
-            : (navItem.level === 4 && navItemsWithLength[i - 1].level !== 1) || isFullWidthBegin) {
+        var navItemPrevious = navItemsWithLength[i - 1];
+        var navItemNext = navItemsWithLength[i + 1];
+        if (!isFullWidth ? navItem.level === 1 : (navItem.level === 4 && navItemPrevious.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].columnLayoutElement = true;
+            var numberOfHeadings = navItem.numberOfHeadings;
+            assert(numberOfHeadings !== null);
+            if (isFullWidthBegin) {
+                assert(navItem.level === 1);
+                assertUsage(navItemNext && navItemNext.level === 4, 
+                // We can lift this requirement, but it isn't trivial to implement.
+                'level-1 headings with menuModalFullWidth need to be followed by a level-4 heading');
+                assert(navItemNext.numberOfHeadings);
+                numberOfHeadings = navItemNext.numberOfHeadings;
+            }
+            columns.push(numberOfHeadings);
+            navItems[i].isColumnLayoutElement = true;
         }
     });
     columnLayouts.push(columns);

package/navigation/Navigation.tsx

@@ -19,7 +19,7 @@ type NavItem = {
   menuModalFullWidth?: true
 }
 type NavItemAll = NavItem & {
-  columnLayoutElement?: true
+  isColumnLayoutElement?: true
 }
 function NavigationContent(props: {
   navItems: NavItem[]
@@ -143,7 +143,7 @@ function groupByColumnLayout(navItems: NavItemComputed[]) {
       }
     }
     assert(isFullWidth !== undefined)
-    if (navItem.columnLayoutElement) {
+    if (navItem.isColumnLayoutElement) {
       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.8.0",
+  "version": "0.8.1",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",

package/renderer/getStyleColumnLayout.ts

@@ -12,7 +12,7 @@ export { determineColumnLayoutEntries }
 
 import { type NavItemAll } from '../navigation/Navigation'
 import { css } from '../utils/css'
-import { assert, isBrowser } from '../utils/server'
+import { assert, assertUsage, isBrowser } from '../utils/server'
 assert(!isBrowser())
 const columnWidthMin = 300
 const columnWidthMax = 350
@@ -60,19 +60,30 @@ function determineColumnLayoutEntries(navItems: NavItemAll[]): { columnLayouts:
         columns = []
       }
     }
+    const navItemPrevious = navItemsWithLength[i - 1]
+    const navItemNext = navItemsWithLength[i + 1]
     if (
-      !isFullWidth
-        ? navItem.level === 1
-        : (navItem.level === 4 && navItemsWithLength[i - 1]!.level !== 1) || isFullWidthBegin
+      !isFullWidth ? navItem.level === 1 : (navItem.level === 4 && navItemPrevious!.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].columnLayoutElement = true
+      let { numberOfHeadings } = navItem
+      assert(numberOfHeadings !== null)
+      if (isFullWidthBegin) {
+        assert(navItem.level === 1)
+        assertUsage(
+          navItemNext && navItemNext.level === 4,
+          // We can lift this requirement, but it isn't trivial to implement.
+          'level-1 headings with menuModalFullWidth need to be followed by a level-4 heading',
+        )
+        assert(navItemNext.numberOfHeadings)
+        numberOfHeadings = navItemNext.numberOfHeadings
+      }
+      columns.push(numberOfHeadings)
+      navItems[i].isColumnLayoutElement = true
     }
   })
   columnLayouts.push(columns)