Support transitioning between old e-graphs

egraphs-good · Oct 12, 2024 · 1ad47e1 · 1ad47e1
1 parent 1cef5e4
commit 1ad47e1
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 84 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "egraph-visualizer",
-  "version": "1.4.2",
+  "version": "2.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/saulshanabrook/egraph-visualizer.git"

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,8 +1,8 @@
-import { useState } from "react";
+import { useCallback, useState } from "react";
 import Monaco from "./Monaco";
 import { Visualizer } from "./Visualizer";
 import { defaultCode, defaultExample, fetchExample } from "./examples";
-import { useQuery } from "@tanstack/react-query";
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
 
 function App() {
   const [example, setExample] = useState<string>(defaultExample);
@@ -12,18 +12,43 @@ function App() {
     staleTime: Infinity,
     retry: false,
     retryOnMount: false,
+    placeholderData: keepPreviousData,
   });
-  const [modifiedCode, setModifiedCode] = useState<string | null>(null);
-  const currentCode = modifiedCode ?? exampleQuery.data;
+  const [modifications, setModifications] = useState<{ initial: string; updates: string[] }>({ initial: defaultCode, updates: [] });
+
+  const data = exampleQuery.data || defaultExample;
+  const addModification = useCallback(
+    (change: string) => {
+      const updates = modifications.initial === data ? modifications.updates : [];
+
+      setModifications({
+        initial: data,
+        updates: [...updates, change],
+      });
+    },
+    [data, modifications.initial, modifications.updates]
+  );
+  const egraphs = [data];
+  const modificationsUpToDate = modifications.initial === exampleQuery.data;
+  if (modificationsUpToDate) {
+    egraphs.push(...modifications.updates);
+  }
+  //
   return (
     <>
       <div className="flex min-h-screen">
         <div className="flex w-1/3 resize-x overflow-auto">
-          <Monaco setModifiedCode={setModifiedCode} exampleQuery={exampleQuery} example={example} setExample={setExample} />
+          <Monaco
+            addModification={addModification}
+            initialCode={egraphs[0]}
+            exampleQuery={exampleQuery}
+            example={example}
+            setExample={setExample}
+          />
         </div>
 
         <div className="flex w-2/3">
-          <Visualizer egraph={currentCode || defaultCode} />
+          <Visualizer egraphs={egraphs} />
         </div>
       </div>
       <footer className="p-2 fixed bottom-0 min-w-full text-xs text-gray-500 text-right dark:text-gray-400">

diff --git a/src/Monaco.tsx b/src/Monaco.tsx
@@ -9,30 +9,33 @@ import { Loading } from "./Loading";
 
 function Monaco({
   exampleQuery,
-  setModifiedCode,
+  addModification,
+  initialCode,
   example,
   setExample,
 }: {
   exampleQuery: UseQueryResult<string, Error>;
-  setModifiedCode: (code: string | null) => void;
+  initialCode: string;
+  addModification: (code: string) => void;
   example: string;
+
   setExample: (example: string) => void;
 }) {
+  // locally modified code that is only saved when the user clicks "Update"
   const [code, setCode] = useState<string | null>(null);
   const handlePresetChange = useCallback(
     (preset: Key) => {
       setExample(preset as string);
       setCode(null);
-      setModifiedCode(null);
     },
-    [setExample, setModifiedCode]
+    [setExample, setCode]
   );
 
-  const currentValue = code || exampleQuery.data;
+  const currentValue = code || initialCode;
 
   const handleUpdate = useCallback(() => {
-    setModifiedCode(currentValue || null);
-  }, [currentValue, setModifiedCode]);
+    addModification(currentValue);
+  }, [currentValue, addModification]);
 
   return (
     <div className="flex flex-col h-full w-full">

diff --git a/src/Visualizer.tsx b/src/Visualizer.tsx
@@ -49,6 +49,7 @@ import { keepPreviousData, QueryClientProvider, useQuery } from "@tanstack/react
 import { FlowClass, FlowEdge, FlowNode, layoutGraph, PreviousLayout, SelectedNode } from "./layout";
 import { queryClient } from "./queryClient";
 import { Loading } from "./Loading";
+import { Slider, SliderOutput, SliderTack } from "./react-aria-components-tailwind-starter/src/slider";
 
 export function EClassNode({ data, selected }: NodeProps<FlowClass>) {
   return (
@@ -392,114 +393,122 @@ function LayoutFlow({
     <>
       {layoutQuery.isFetching ? <Loading /> : <></>}
       <SetSelectedNodeContext.Provider value={setSelectedNode}>
-        <Rendering
-          nodes={nodes}
-          edges={edges}
-          nodeToEdges={nodeToEdges}
-          edgeToNodes={edgeToNodes}
-          selectedNode={selectedNode}
-          elkJSON={elkJSON}
-          useInteractiveLayout={useInteractiveLayout}
-          setUseInteractiveLayout={setUseInteractiveLayout}
-          mergeEdges={mergeEdges}
-          setMergeEdges={setMergeEdges}
-        />
+        <ReactFlowProvider>
+          <Rendering
+            nodes={nodes}
+            edges={edges}
+            nodeToEdges={nodeToEdges}
+            edgeToNodes={edgeToNodes}
+            selectedNode={selectedNode}
+            elkJSON={elkJSON}
+            useInteractiveLayout={useInteractiveLayout}
+            setUseInteractiveLayout={setUseInteractiveLayout}
+            mergeEdges={mergeEdges}
+            setMergeEdges={setMergeEdges}
+          />
+        </ReactFlowProvider>
       </SetSelectedNodeContext.Provider>
     </>
   );
 }
 
-export function Visualizer({ egraph, height = null, resize = false }: { egraph: string; height?: string | null; resize?: boolean }) {
-  const [outerElem, setOuterElem] = useState<HTMLDivElement | null>(null);
-  const [innerElem, setInnerElem] = useState<HTMLDivElement | null>(null);
+function SelectSider({ length, onSelect, selected }: { length: number; onSelect: (index: number) => void; selected: number }) {
+  return (
+    <div className={`absolute top-0 left-0 p-4 z-50 backdrop-blur-sm ${length > 1 ? "" : "opacity-0"}`}>
+      <Slider
+        minValue={0}
+        maxValue={length - 1}
+        onChange={onSelect}
+        value={selected}
+        aria-label="Select which egraph to display from the history"
+      >
+        <div className="flex flex-1 items-end">
+          <div className="flex flex-1 flex-col">
+            <SliderOutput className="self-center">
+              {({ state }) => {
+                return (
+                  <span className="text-sm">
+                    {state.getThumbValueLabel(0)} / {length - 1}
+                  </span>
+                );
+              }}
+            </SliderOutput>
+            <div className="flex flex-1 items-center gap-3">
+              <SliderTack thumbLabels={["volume"]} />
+            </div>
+          </div>
+        </div>
+      </Slider>
+    </div>
+  );
+}
 
+export function Visualizer({ egraphs, height = null, resize = false }: { egraphs: string[]; height?: string | null; resize?: boolean }) {
   const [rootElem, setRootElem] = useState<HTMLDivElement | null>(null);
 
-  const aspectRatio = useMemo(() => {
-    if (rootElem) {
-      return rootElem.clientWidth / rootElem.clientHeight;
-    }
-  }, [rootElem]);
+  const [outerElem, setOuterElem] = useState<HTMLDivElement | null>(null);
+  const [innerElem, setInnerElem] = useState<HTMLDivElement | null>(null);
+  const aspectRatio = rootElem ? rootElem.clientWidth / rootElem.clientHeight : null;
+
+  // If we are at null, then use the last item in the list
+  // if the last selection was for a list of egraphs that no longer exists, then use the last item in the list
+  const [selected, setSelected] = useState<null | { egraphs: string[]; index: number }>(null);
+  const actualSelected = selected && selected.egraphs === egraphs ? selected.index : egraphs.length - 1;
+  const onSelect = useCallback(
+    (index: number) => {
+      setSelected({ egraphs, index });
+    },
+    [setSelected, egraphs]
+  );
+
   return (
     <div className={`w-full relative ${resize ? "resize-y" : ""}`} style={{ height: height || "100%" }} ref={setRootElem}>
       {/* Hidden node to measure text size  */}
       <div className="invisible absolute">
         <ENode outerRef={setOuterElem} innerRef={setInnerElem} />
       </div>
-      <ReactFlowProvider>
-        {outerElem && innerElem && aspectRatio && (
-          <LayoutFlow aspectRatio={aspectRatio} egraph={egraph} outerElem={outerElem} innerElem={innerElem} />
-        )}
-      </ReactFlowProvider>
+      <SelectSider length={egraphs.length} onSelect={onSelect} selected={actualSelected} />
+      {outerElem && innerElem && aspectRatio && (
+        <LayoutFlow aspectRatio={aspectRatio} egraph={egraphs[actualSelected]} outerElem={outerElem} innerElem={innerElem} />
+      )}
     </div>
   );
 }
 
 // Put these both in one file, so its emitted as a single chunk and anywidget doesn't have to import another file
 
-function VisualizerWithTransition({
-  initialEgraph,
-  registerChangeEGraph,
-  resize,
-  height,
-}: {
-  initialEgraph: string;
-  registerChangeEGraph: (setEgraph: (egraph: string) => void) => void;
-  resize?: boolean;
-  height?: string;
-}) {
-  const [egraph, setEgraph] = useState(initialEgraph);
-  useEffect(() => {
-    registerChangeEGraph(setEgraph);
-  }, [registerChangeEGraph, setEgraph]);
-  return (
-    <QueryClientProvider client={queryClient}>
-      <Visualizer egraph={egraph} height={height} resize={resize} />
-    </QueryClientProvider>
-  );
-}
-
 /// Render anywidget model to the given element
 // Must be named `render` to work as an anywidget module
 // https://anywidget.dev/en/afm/#lifecycle-methods
 // eslint-disable-next-line react-refresh/only-export-components
 export function render({ model, el }: { el: HTMLElement; model: AnyModel }) {
+  // only render once with data, dont support updating widget yet
   const root = createRoot(el);
-  let callback: () => void;
-  const registerChangeEGraph = (setEgraph: (egraph: string) => void) => {
-    callback = () => setEgraph(model.get("egraph"));
-    model.on("change:egraph", callback);
-  };
+  // let callback: () => void;
+  // const registerChangeEGraph = (setEgraph: (egraph: string) => void) => {
+  // callback = () => setEgraph(model.get("egraph"));
+  // model.on("change:egraph", callback);
+  // };
   root.render(
-    <VisualizerWithTransition initialEgraph={model.get("egraph")} registerChangeEGraph={registerChangeEGraph} height="600px" resize />
+    <QueryClientProvider client={queryClient}>
+      <Visualizer egraphs={model.get("egraphs")} height="600px" resize />
+    </QueryClientProvider>
   );
 
   return () => {
-    model.off("change:egraph", callback);
+    // model.off("change:egraph", callback);
     root.unmount();
   };
 }
 
 /// Mount the visualizer to the given element
-/// Call `render` to render a new egraph
+/// Call `render` to render a new list of egraphs
 /// Call `unmount` to unmount the visualizer
 // eslint-disable-next-line react-refresh/only-export-components
-export function mount(element: HTMLElement): { render: (egraph: string) => void; unmount: () => void } {
+export function mount(element: HTMLElement): { render: (egraphs: string[]) => void; unmount: () => void } {
   const root = createRoot(element);
-  let setEgraph: null | ((egraph: string) => void) = null;
-  function render(egraph: string) {
-    if (setEgraph) {
-      setEgraph(egraph);
-    } else {
-      root.render(
-        <VisualizerWithTransition
-          initialEgraph={egraph}
-          registerChangeEGraph={(setEgraph_) => {
-            setEgraph = setEgraph_;
-          }}
-        />
-      );
-    }
+  function render(egraphs: string[]) {
+    root.render(<Visualizer egraphs={egraphs} />);
   }
 
   function unmount() {