diff --git a/frontend/layout/lib/TileLayout.tsx b/frontend/layout/lib/TileLayout.tsx index 5bea213f..b4bc200a 100644 --- a/frontend/layout/lib/TileLayout.tsx +++ b/frontend/layout/lib/TileLayout.tsx @@ -264,7 +264,7 @@ const DisplayNode = ({ layoutModel, layoutNode, contents }: DisplayNodeProps) => className={clsx("tile-node", { dragging: isDragging, magnified: layoutModel.treeState.magnifiedNodeId === layoutNode.id, - "last-magnified": addlProps.isLastMagnifiedNode, + "last-magnified": addlProps?.isLastMagnifiedNode, })} ref={tileNodeRef} id={layoutNode.id} diff --git a/frontend/layout/lib/layoutAtom.ts b/frontend/layout/lib/layoutAtom.ts index 39fc160a..1599a15f 100644 --- a/frontend/layout/lib/layoutAtom.ts +++ b/frontend/layout/lib/layoutAtom.ts @@ -16,7 +16,7 @@ function getLayoutStateAtomFromTab(tabAtom: Atom, get: Getter): WritableWav export function withLayoutTreeStateAtomFromTab(tabAtom: Atom): WritableLayoutTreeStateAtom { if (layoutStateAtomMap.has(tabAtom)) { - console.log("found atom"); + // console.log("found atom"); return layoutStateAtomMap.get(tabAtom); } const generationAtom = atom(1); @@ -25,7 +25,7 @@ export function withLayoutTreeStateAtomFromTab(tabAtom: Atom): WritableLayo const stateAtom = getLayoutStateAtomFromTab(tabAtom, get); if (!stateAtom) return; const layoutStateData = get(stateAtom); - console.log("layoutStateData", layoutStateData); + // console.log("layoutStateData", layoutStateData); const layoutTreeState: LayoutTreeState = { rootNode: layoutStateData?.rootnode, magnifiedNodeId: layoutStateData?.magnifiednodeid, @@ -36,10 +36,10 @@ export function withLayoutTreeStateAtomFromTab(tabAtom: Atom): WritableLayo (get, set, value) => { if (get(generationAtom) < value.generation) { const stateAtom = getLayoutStateAtomFromTab(tabAtom, get); - console.log("setting new atom val", value); + // console.log("setting new atom val", value); if (!stateAtom) return; const waveObjVal = get(stateAtom); - console.log("waveObjVal", waveObjVal); + // console.log("waveObjVal", waveObjVal); waveObjVal.rootnode = value.rootNode; waveObjVal.magnifiednodeid = value.magnifiedNodeId; set(generationAtom, value.generation); diff --git a/frontend/layout/lib/layoutModel.ts b/frontend/layout/lib/layoutModel.ts index fa3c1689..a35e8619 100644 --- a/frontend/layout/lib/layoutModel.ts +++ b/frontend/layout/lib/layoutModel.ts @@ -365,10 +365,10 @@ export class LayoutModel { * Gets normalized dimensions for the TileLayout container. * @returns The normalized dimensions for the TileLayout container. */ - function getBoundingRect(): Dimensions { + const getBoundingRect: () => Dimensions = () => { const boundingRect = this.displayContainerRef.current.getBoundingClientRect(); return { top: 0, left: 0, width: boundingRect.width, height: boundingRect.height }; - } + }; if (!node.children?.length) { // console.log("adding node to leafs", node); diff --git a/frontend/layout/lib/layoutModelHooks.ts b/frontend/layout/lib/layoutModelHooks.ts index aba99307..2b6c3dc4 100644 --- a/frontend/layout/lib/layoutModelHooks.ts +++ b/frontend/layout/lib/layoutModelHooks.ts @@ -1,6 +1,6 @@ import { globalStore, WOS } from "@/app/store/global"; import useResizeObserver from "@react-hook/resize-observer"; -import { atom, Atom, useAtomValue } from "jotai"; +import { Atom, useAtomValue } from "jotai"; import { useEffect, useState } from "react"; import { withLayoutTreeStateAtomFromTab } from "./layoutAtom"; import { LayoutModel } from "./layoutModel"; @@ -15,7 +15,6 @@ export function getLayoutModelForTab(tabAtom: Atom): LayoutModel { if (layoutModelMap.has(tabId)) { const layoutModel = layoutModelMap.get(tabData.oid); if (layoutModel) { - if (!layoutModel.generationAtom) layoutModel.generationAtom = atom(0); return layoutModel; } }