minor fixes based on code review

packages/toc/src/generators/notebookgenerator/index.ts

@@ -19,12 +19,13 @@ import { TableOfContents } from '../../toc';
 import { NotebookGeneratorOptionsManager } from './optionsmanager';
 
 import {
-  getRenderedHTMLHeadings,
+  generateNumbering,
   getMarkdownHeadings,
   isDOM,
   isMarkdown,
   INotebookHeading,
-  INotebookHeadingTypes
+  INotebookHeadingTypes,
+  sanitizerOptions
 } from '../shared';
 
 /**
@@ -150,7 +151,7 @@ export function createNotebookGenerator(
             };
             let lastLevel = Private.getLastLevel(headings);
             let numbering = options.numbering;
-            let renderedHeadings = getRenderedHTMLHeadings(
+            let renderedHeadings = Private.getRenderedHTMLHeadings(
               outputWidget.node,
               onClickFactory,
               sanitizer,
@@ -254,7 +255,7 @@ export function createNotebookGenerator(
             };
             let numbering = options.numbering;
             let lastLevel = Private.getLastLevel(headings);
-            let renderedHeadings = getRenderedHTMLHeadings(
+            let renderedHeadings = Private.getRenderedHTMLHeadings(
               cell.node,
               onClickFactory,
               sanitizer,
@@ -488,3 +489,75 @@ namespace Private {
     return headings;
   }
 }
+
+namespace Private {
+  /**
+   * Given an HTML element, generate ToC headings
+   * by finding all the headers and making IHeading objects for them.
+   */
+  export function getRenderedHTMLHeadings(
+    node: HTMLElement,
+    onClickFactory: (el: Element) => (() => void),
+    sanitizer: ISanitizer,
+    numberingDict: any,
+    lastLevel: number,
+    needNumbering = false,
+    cellRef?: Cell
+  ): INotebookHeading[] {
+    let headings: INotebookHeading[] = [];
+    let headingNodes = node.querySelectorAll('h1, h2, h3, h4, h5, h6, p');
+    if (headingNodes.length > 0) {
+      let markdownCell = headingNodes[0];
+      if (markdownCell.nodeName.toLowerCase() === 'p') {
+        if (markdownCell.innerHTML) {
+          let html = sanitizer.sanitize(
+            markdownCell.innerHTML,
+            sanitizerOptions
+          );
+          html = html.replace('¶', '');
+          headings.push({
+            level: lastLevel + 1,
+            html: html,
+            text: markdownCell.textContent ? markdownCell.textContent : '',
+            onClick: onClickFactory(markdownCell),
+            type: INotebookHeadingTypes.markdown,
+            cellRef: cellRef,
+            hasChild: true
+          });
+        }
+      } else {
+        const heading = headingNodes[0];
+        const level = parseInt(heading.tagName[1]);
+        const text = heading.textContent ? heading.textContent : '';
+        let shallHide = !needNumbering;
+        if (heading.getElementsByClassName('numbering-entry').length > 0) {
+          heading.removeChild(
+            heading.getElementsByClassName('numbering-entry')[0]
+          );
+        }
+        let html = sanitizer.sanitize(heading.innerHTML, sanitizerOptions);
+        html = html.replace('¶', ''); // Remove the anchor symbol.
+        const onClick = onClickFactory(heading);
+        let numbering = generateNumbering(numberingDict, level);
+        let numberingElement =
+          '<span class="numbering-entry" ' +
+          (shallHide ? ' hidden="true"' : '') +
+          '>' +
+          numbering +
+          '</span>';
+        heading.innerHTML = numberingElement + html;
+        headings.push({
+          level,
+          text,
+          numbering,
+          html,
+          onClick,
+          type: INotebookHeadingTypes.header,
+          cellRef: cellRef,
+          hasChild: true
+        });
+      }
+    }
+    return headings;
+  }
+}

packages/toc/src/generators/shared.ts

@@ -1,4 +1,3 @@
-import { ISanitizer } from '@jupyterlab/apputils';
 import { Cell } from '@jupyterlab/cells';
 import { IHeading } from '../toc';
 
@@ -47,73 +46,6 @@ export function generateNumbering(numberingDict: any, level: number) {
   return numbering;
 }
 
-/**
- * Given an HTML element, generate ToC headings
- * by finding all the headers and making IHeading objects for them.
- */
-export function getRenderedHTMLHeadings(
-  node: HTMLElement,
-  onClickFactory: (el: Element) => (() => void),
-  sanitizer: ISanitizer,
-  numberingDict: any,
-  lastLevel: number,
-  needNumbering = false,
-  cellRef?: Cell
-): INotebookHeading[] {
-  let headings: INotebookHeading[] = [];
-  let headingNodes = node.querySelectorAll('h1, h2, h3, h4, h5, h6, p');
-  if (headingNodes.length > 0) {
-    let markdownCell = headingNodes[0];
-    if (markdownCell.nodeName.toLowerCase() === 'p') {
-      if (markdownCell.innerHTML) {
-        let html = sanitizer.sanitize(markdownCell.innerHTML, sanitizerOptions);
-        html = html.replace('¶', '');
-        headings.push({
-          level: lastLevel + 1,
-          html: html,
-          text: markdownCell.textContent ? markdownCell.textContent : '',
-          onClick: onClickFactory(markdownCell),
-          type: INotebookHeadingTypes.markdown,
-          cellRef: cellRef,
-          hasChild: true
-        });
-      }
-    } else {
-      const heading = headingNodes[0];
-      const level = parseInt(heading.tagName[1]);
-      const text = heading.textContent ? heading.textContent : '';
-      let shallHide = !needNumbering;
-      if (heading.getElementsByClassName('numbering-entry').length > 0) {
-        heading.removeChild(
-          heading.getElementsByClassName('numbering-entry')[0]
-        );
-      }
-      let html = sanitizer.sanitize(heading.innerHTML, sanitizerOptions);
-      html = html.replace('¶', ''); // Remove the anchor symbol.
-      const onClick = onClickFactory(heading);
-      let numbering = generateNumbering(numberingDict, level);
-      let numberingElement =
-        '<span class="numbering-entry" ' +
-        (shallHide ? ' hidden="true"' : '') +
-        '>' +
-        numbering +
-        '</span>';
-      heading.innerHTML = numberingElement + html;
-      headings.push({
-        level,
-        text,
-        numbering,
-        html,
-        onClick,
-        type: INotebookHeadingTypes.header,
-        cellRef: cellRef,
-        hasChild: true
-      });
-    }
-  }
-  return headings;
-}
-
 /**
  * Given a string of markdown, get the markdown headings
  * in that string.

packages/toc/style/index.css

@@ -38,7 +38,7 @@
   flex-direction: column;
   background: var(--jp-layout-color1);
   color: var(--jp-ui-font-color1);
-  /* font-size: var(--jp-ui-font-size0);  */
+  font-size: var(--jp-ui-font-size0);
   height: 100%;
 }