@brillout/docpress 0.7.2 → 0.7.3

package/dist/navigation/Navigation.js

@@ -34,11 +34,11 @@ function NavigationMask() {
 }
 function NavigationContent(props) {
     var navItemsWithComputed = addComputedProps(props.navItems, props.currentUrl);
-    var navItemsGrouped = groupByLevel1(navItemsWithComputed);
+    var navItemsGrouped = groupByLevelMin(navItemsWithComputed);
     return (React.createElement("div", { id: props.id, className: "navigation-content" },
-        React.createElement("div", { className: "nav-column", style: { position: 'relative' } }, navItemsGrouped.map(function (navItemLevel1, i) { return (React.createElement("div", { className: "nav-items-level-1-group", key: i },
-            React.createElement(NavItemComponent, { navItem: navItemLevel1 }),
-            navItemLevel1.navItemChilds.map(function (navItem, j) { return (React.createElement(NavItemComponent, { navItem: navItem, key: j })); }))); }))));
+        React.createElement("div", { className: "nav-column", style: { position: 'relative' } }, navItemsGrouped.map(function (navItemGroup, i) { return (React.createElement("div", { className: "nav-items-group", key: i },
+            React.createElement(NavItemComponent, { navItem: navItemGroup }),
+            navItemGroup.navItemChilds.map(function (navItem, j) { return (React.createElement(NavItemComponent, { navItem: navItem, key: j })); }))); }))));
 }
 function NavItemComponent(_a) {
     var _b;
@@ -62,16 +62,16 @@ function NavItemComponent(_a) {
     return (React.createElement("a", { className: [
             'nav-item',
             'nav-item-level-' + navItem.level,
-            navItem.isActive && ' is-active',
-            navItem.isActiveFirst && ' is-active-first',
-            navItem.isActiveLast && ' is-active-last',
+            navItem.url && navItem.isActive && ' is-active',
+            navItem.url && navItem.isActiveFirst && ' is-active-first',
+            navItem.url && navItem.isActiveLast && ' is-active-last',
             navItem.isFirstOfItsKind && 'nav-item-first-of-its-kind',
             navItem.isLastOfItsKind && 'nav-item-last-of-its-kind',
         ]
             .filter(Boolean)
             .join(' '), href: (_b = navItem.url) !== null && _b !== void 0 ? _b : undefined }, titleInNavJsx));
 }
-function groupByLevel1(navItems) {
+function groupByLevelMin(navItems) {
     var navItemsGrouped = [];
     var levelMin = Math.min.apply(Math, navItems.map(function (h) { return h.level; }));
     navItems.forEach(function (navItem) {

package/dist/utils/assert.js

@@ -8,13 +8,13 @@ if (isBrowser()) {
     console.log([
         '[@brillout/docpress] DEV MODE',
         isDevMode() ? 'enabled' : 'disabled',
-        !isLocalhost() && 'run window.toggleDevMode() to toggle DEV MODE',
+        !isLocalhost() && '— run window.toggleDevMode() to toggle DEV MODE',
     ]
         .filter(Boolean)
         .join(' '));
     if (isDevMode()) {
         window.onerror = function (err) {
-            alert(err);
+            window.alert(err);
             window.onerror = null;
         };
     }
@@ -35,9 +35,6 @@ function assert(condition, debugInfo) {
         errMsg += ' Debug info: ' + String(debugInfo);
     }
     var err = new Error(errMsg);
-    if (isBrowser() && isDevMode()) {
-        window.alert(err.stack);
-    }
     throw err;
 }
 function assertUsage(condition, msg) {
@@ -45,9 +42,6 @@ function assertUsage(condition, msg) {
         return;
     }
     var err = new Error('[DocPress][Wrong Usage] ' + msg);
-    if (isBrowser() && isDevMode()) {
-        window.alert(err.stack);
-    }
     throw err;
 }
 function isBrowser() {
@@ -77,8 +71,10 @@ function assertWarning(condition, msg) {
         return;
     }
     msg = '[DocPress][Warning] ' + msg;
-    console.warn(msg);
     if (isBrowser() && isDevMode()) {
-        window.alert(msg);
+        throw new Error(msg);
+    }
+    else {
+        console.warn(msg);
     }
 }

package/navigation/Navigation-items.css

@@ -22,7 +22,7 @@
   padding-right: 4px;
   text-decoration: none;
 }
-.nav-column:first-of-type > .nav-items-level-1-group:first-of-type > .nav-item-level-1:first-of-type {
+.nav-column:first-of-type > .nav-items-group:first-of-type > .nav-item-level-1:first-of-type {
   margin-top: 20px;
 }
 .nav-item-level-1 {

package/navigation/Navigation-layout.css

@@ -118,7 +118,7 @@ html.navigation-fullscreen .navigation-content > .nav-column {
   flex-grow: 1;
   max-width: 350px;
 }
-html.navigation-fullscreen .nav-column > .nav-items-level-1-group:first-child > .nav-item-level-1:first-child {
+html.navigation-fullscreen .nav-column > .nav-items-group:first-child > .nav-item-level-1:first-child {
   margin-top: 0px;
 }
 html.navigation-fullscreen {

package/navigation/Navigation.tsx

@@ -37,7 +37,6 @@ function Navigation({
             </>
           )}
           <NavigationContent id="navigation-content-main" navItems={navItemsAll} currentUrl={currentUrl} />
-          {/* <ScrollOverlay /> */}
           <NavigationFullscreenClose />
         </div>
       </div>
@@ -69,15 +68,15 @@ function NavigationContent(props: {
   currentUrl: string
 }) {
   const navItemsWithComputed = addComputedProps(props.navItems, props.currentUrl)
-  const navItemsGrouped = groupByLevel1(navItemsWithComputed)
+  const navItemsGrouped = groupByLevelMin(navItemsWithComputed)
 
   return (
     <div id={props.id} className="navigation-content">
       <div className="nav-column" style={{ position: 'relative' }}>
-        {navItemsGrouped.map((navItemLevel1, i) => (
-          <div className="nav-items-level-1-group" key={i}>
-            <NavItemComponent navItem={navItemLevel1} />
-            {navItemLevel1.navItemChilds.map((navItem, j) => (
+        {navItemsGrouped.map((navItemGroup, i) => (
+          <div className="nav-items-group" key={i}>
+            <NavItemComponent navItem={navItemGroup} />
+            {navItemGroup.navItemChilds.map((navItem, j) => (
               <NavItemComponent navItem={navItem} key={j} />
             ))}
           </div>
@@ -115,9 +114,9 @@ function NavItemComponent({
       className={[
         'nav-item',
         'nav-item-level-' + navItem.level,
-        navItem.isActive && ' is-active',
-        navItem.isActiveFirst && ' is-active-first',
-        navItem.isActiveLast && ' is-active-last',
+        navItem.url && navItem.isActive && ' is-active',
+        navItem.url && navItem.isActiveFirst && ' is-active-first',
+        navItem.url && navItem.isActiveLast && ' is-active-last',
         navItem.isFirstOfItsKind && 'nav-item-first-of-its-kind',
         navItem.isLastOfItsKind && 'nav-item-last-of-its-kind',
       ]
@@ -131,8 +130,8 @@ function NavItemComponent({
   )
 }
 
-function groupByLevel1<T extends { level: number }>(navItems: T[]) {
-  const navItemsGrouped: (T & { navItemChilds: T[] })[] = []
+function groupByLevelMin(navItems: NavItemComputed[]) {
+  const navItemsGrouped: (NavItemComputed & { navItemChilds: NavItemComputed[] })[] = []
   const levelMin: number = Math.min(...navItems.map((h) => h.level))
   navItems.forEach((navItem) => {
     if (navItem.level === levelMin) {

package/navigation/navigation-fullscreen/initNavigationFullscreen.ts

@@ -39,7 +39,7 @@ function hideNavigationFullScreen() {
 
 function updateColumnWidth() {
   const navMinWidth = 299
-  const navH1Groups = Array.from(document.querySelectorAll('#navigation-content-main .nav-items-level-1-group'))
+  const navH1Groups = Array.from(document.querySelectorAll('#navigation-content-main .nav-items-group'))
   const numberOfColumnsMax = navH1Groups.length
 
   const widthAvailable = getViewportWidth()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "type": "module",
   "scripts": {
     "======== Build": "",

package/renderer/onRenderClient.tsx

@@ -19,9 +19,13 @@ import { addFeatureClickHandlers, addTwitterWidgets } from '../components/Featur
 initOnLinkClick()
 
 let root: ReactDOM.Root
-function onRenderClient(pageContext: PageContextClient) {
+let renderPromiseResolve: () => void
+async function onRenderClient(pageContext: PageContextClient) {
   // TODO: stop using any
   const pageContextResolved: PageContextResolved = (pageContext as any).pageContextResolved
+  const renderPromise = new Promise<void>((r) => {
+    renderPromiseResolve = r
+  })
   let page = getPageElement(pageContext, pageContextResolved)
   page = <OnRenderDoneHook>{page}</OnRenderDoneHook>
   const container = document.getElementById('page-view')!
@@ -33,10 +37,10 @@ function onRenderClient(pageContext: PageContextClient) {
     }
     root.render(page)
   }
-
   if (!pageContext.isHydration) {
     applyHead(pageContext)
   }
+  await renderPromise
 }
 
 function applyHead(pageContext: PageContextClient) {
@@ -54,6 +58,7 @@ function onRenderDone() {
   addFeatureClickHandlers()
   addTwitterWidgets()
   setHydrationIsFinished()
+  renderPromiseResolve()
 }
 
 function OnRenderDoneHook({ children }: { children: React.ReactNode }) {

package/utils/assert.ts

@@ -10,14 +10,14 @@ if (isBrowser()) {
     [
       '[@brillout/docpress] DEV MODE',
       isDevMode() ? 'enabled' : 'disabled',
-      !isLocalhost() && 'run window.toggleDevMode() to toggle DEV MODE',
+      !isLocalhost() && '— run window.toggleDevMode() to toggle DEV MODE',
     ]
       .filter(Boolean)
       .join(' '),
   )
   if (isDevMode()) {
     window.onerror = (err) => {
-      alert(err)
+      window.alert(err)
       window.onerror = null
     }
   }
@@ -39,9 +39,6 @@ function assert(condition: unknown, debugInfo?: unknown): asserts condition {
     errMsg += ' Debug info: ' + String(debugInfo)
   }
   const err = new Error(errMsg)
-  if (isBrowser() && isDevMode()) {
-    window.alert(err.stack)
-  }
   throw err
 }
 
@@ -50,9 +47,6 @@ function assertUsage(condition: unknown, msg: string): asserts condition {
     return
   }
   const err = new Error('[DocPress][Wrong Usage] ' + msg)
-  if (isBrowser() && isDevMode()) {
-    window.alert(err.stack)
-  }
   throw err
 }
 
@@ -81,8 +75,9 @@ function assertWarning(condition: unknown, msg: string): asserts condition {
     return
   }
   msg = '[DocPress][Warning] ' + msg
-  console.warn(msg)
   if (isBrowser() && isDevMode()) {
-    window.alert(msg)
+    throw new Error(msg)
+  } else {
+    console.warn(msg)
   }
 }