Remove NEW from vars and functions that were introduced during refact…

…oring
gnomearcy · Jul 29, 2022 · aacd3bf · aacd3bf
1 parent 0c4e1b7
commit aacd3bf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/src/components/DisplayedDocument/DisplayedDocument.ts b/src/components/DisplayedDocument/DisplayedDocument.ts
@@ -23,8 +23,8 @@ import { getDocumentMovementHelpers } from './documentMovement';
 import {
     hackSetLocallyGlobal,
     onCanvasClick,
+    renderDocument,
     resetClickableRegions,
-    NEWrenderDocument,
 } from './layout';
 
 interface Attrs {
@@ -37,8 +37,6 @@ interface Attrs {
 
 /**
  * A component to render the user's document in a <canvas> element
- *
- * @returns An object to be consumed by m()
  */
 function DisplayedDocument(): m.Component<Attrs> {
     const documentMovementHelpers = getDocumentMovementHelpers({
@@ -88,9 +86,8 @@ function DisplayedDocument(): m.Component<Attrs> {
             hackSetLocallyGlobal(ctx, fontSize, currentDocDimensions);
 
             const rootNodeId = documentState.getRootNodeId();
-//            renderDocument(rootNodeId, vnode.attrs.documentDimensions);
 
-            NEWrenderDocument({
+            renderDocument({
                 localCtx: ctx,
                 localFontSize: fontSize,
                 localCurrentDocDimensions: currentDocDimensions,
@@ -147,9 +144,8 @@ function DisplayedDocument(): m.Component<Attrs> {
             hackSetLocallyGlobal(ctx, fontSize, currentDocDimensions);
 
             const rootNodeId = documentState.getRootNodeId();
-            // renderDocument(rootNodeId, vnode.attrs.documentDimensions);
 
-            NEWrenderDocument({
+            renderDocument({
                 localCtx: ctx,
                 localFontSize: fontSize,
                 localCurrentDocDimensions: currentDocDimensions,

diff --git a/src/components/DisplayedDocument/layout.ts b/src/components/DisplayedDocument/layout.ts
@@ -90,15 +90,15 @@ export function hackSetLocallyGlobal(
     currentDocDimensions = localCurrentDocDimensions;
 }
 
-interface NEWAllNodesRenderInfo {
+interface AllNodesRenderInfo {
     renderInfo: {
         dimensions: Dimensions;
         renderNode: (parentConnectorCoordinates: Coordinates) => RectangularRegion;
     };
     heightIncludingChildren: number;
 }
 
-interface NEWRenderDocumentArgs {
+interface renderDocumentArgs {
     localCtx: CanvasRenderingContext2D,
     localFontSize: number;
     localCurrentDocDimensions: { width: number, height: number };
@@ -109,21 +109,21 @@ interface NEWRenderDocumentArgs {
 /**
  * Render the doc
  */
-export function NEWrenderDocument({
+export function renderDocument({
     localCtx,
     localFontSize,
     localCurrentDocDimensions,
     rootNodeId,
     canvasDimensions,
-}: NEWRenderDocumentArgs) {
+}: renderDocumentArgs) {
     ctx = localCtx;
     fontSize = localFontSize;
     currentDocDimensions = localCurrentDocDimensions;
 
-    const allNodesRenderInfo = new Map<number, NEWAllNodesRenderInfo>();
-    NEWcalculateAllNodesRenderInfo(allNodesRenderInfo, rootNodeId);
+    const allNodesRenderInfo = new Map<number, AllNodesRenderInfo>();
+    calculateAllNodesRenderInfo(allNodesRenderInfo, rootNodeId);
 
-    NEWrenderNodesRecursively(
+    renderNodesRecursively(
         allNodesRenderInfo,
         rootNodeId,
         {
@@ -133,8 +133,8 @@ export function NEWrenderDocument({
     );
 }
 
-function NEWcalculateAllNodesRenderInfo(
-    allNodesRenderInfo: Map<number, NEWAllNodesRenderInfo>,
+function calculateAllNodesRenderInfo(
+    allNodesRenderInfo: Map<number, AllNodesRenderInfo>,
     nodeId: number,
 ) {
     const nodeIsSelected = documentState.getSelectedNodeId() === nodeId;
@@ -154,8 +154,8 @@ function NEWcalculateAllNodesRenderInfo(
     if (documentState.getChildrenVisible(nodeId)) {
         const childIds = documentState.getNodeChildIds(nodeId);
         childIds.forEach((childId) => {
-            NEWcalculateAllNodesRenderInfo(allNodesRenderInfo, childId);
-            totalChildrenHeight += NEWsafeGetRenderInfo(
+            calculateAllNodesRenderInfo(allNodesRenderInfo, childId);
+            totalChildrenHeight += safeGetRenderInfo(
                 allNodesRenderInfo,
                 childId,
             ).heightIncludingChildren;
@@ -178,12 +178,12 @@ function NEWcalculateAllNodesRenderInfo(
     );
 }
 
-function NEWrenderNodesRecursively(
-    allNodesRenderInfo: Map<number, NEWAllNodesRenderInfo>,
+function renderNodesRecursively(
+    allNodesRenderInfo: Map<number, AllNodesRenderInfo>,
     nodeId: number,
     coordinates: Coordinates,
 ) {
-    const renderInfo = NEWsafeGetRenderInfo(allNodesRenderInfo, nodeId);
+    const renderInfo = safeGetRenderInfo(allNodesRenderInfo, nodeId);
     const childrenVisible = documentState.getChildrenVisible(nodeId);
     const rectangularRegion = renderInfo.renderInfo.renderNode(coordinates);
 
@@ -230,7 +230,7 @@ function NEWrenderNodesRecursively(
             let childY = topOfChildrenRegion;
 
             childIds.forEach((childId) => {
-                const { heightIncludingChildren } = NEWsafeGetRenderInfo(
+                const { heightIncludingChildren } = safeGetRenderInfo(
                     allNodesRenderInfo,
                     childId,
                 );
@@ -250,7 +250,7 @@ function NEWrenderNodesRecursively(
                     },
                 );
 
-                NEWrenderNodesRecursively(
+                renderNodesRecursively(
                     allNodesRenderInfo,
                     childId,
                     {
@@ -265,15 +265,15 @@ function NEWrenderNodesRecursively(
     }
 }
 
-function NEWsafeGetRenderInfo(
-    allNodesRenderInfo: Map<number, NEWAllNodesRenderInfo>,
+function safeGetRenderInfo(
+    allNodesRenderInfo: Map<number, AllNodesRenderInfo>,
     nodeId: number,
 ) {
     const renderInfo = allNodesRenderInfo.get(nodeId);
     if (renderInfo !== undefined) return renderInfo;
 
     throw new Error(
-        `NEWsafeGetRenderInfo: nodeId '${nodeId}' is not present`,
+        `safeGetRenderInfo: nodeId '${nodeId}' is not present`,
     );
 }