make labels more explicit, and label styles per-node

u we finally see "match" instead of "m" in expert mode can we remove "always show labels"? Signed-off-by: George Thomas <[email protected]>
hackworthltd · Apr 9, 2024 · d1d9593 · d1d9593
1 parent f4a3ceb
commit d1d9593
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 36 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -44,7 +44,6 @@ const App = (): JSX.Element => {
   const devToolsMaxHeight = 500;
   const [devOpts, setDevOpts] = useState<DevOptions>({
     showIDs: false,
-    inlineLabels: false,
     alwaysShowLabels: true,
   });
 
@@ -134,16 +133,6 @@ const DevMenu = (p: { opts: DevOptions; set: (opts: DevOptions) => void }) => (
       />
       <label htmlFor="alwaysShowLabels">always show labels</label>
     </div>
-    <div>
-      <input
-        type="checkbox"
-        id="inlineLabels"
-        checked={p.opts.inlineLabels}
-        onChange={(e) => p.set({ ...p.opts, inlineLabels: e.target.checked })}
-        className="mr-1"
-      />
-      <label htmlFor="inlineLabels">inline labels</label>
-    </div>
   </div>
 );
 

diff --git a/src/components/Edit/index.tsx b/src/components/Edit/index.tsx
@@ -48,7 +48,6 @@ import {
 } from "@/primer-api";
 import {
   defaultTreeReactFlowProps,
-  inlineTreeReactFlowProps,
   ScrollToDef,
 } from "@/components/TreeReactFlow";
 import { Mode } from "../Toolbar";
@@ -58,7 +57,6 @@ const initialLevel: Level = "Expert";
 
 export type DevOptions = {
   showIDs: boolean;
-  inlineLabels: boolean;
   alwaysShowLabels: boolean;
 };
 
@@ -287,9 +285,7 @@ const AppNoError = ({
     .sort((a, b) => cmpName(a.name, b.name))
     .map((d) => d.name.baseName);
 
-  const treeProps = p.devOpts.inlineLabels
-    ? inlineTreeReactFlowProps
-    : defaultTreeReactFlowProps;
+  const treeProps = defaultTreeReactFlowProps;
 
   return (
     <div className="grid h-[100dvh] grid-cols-[auto_20rem]">

diff --git a/src/components/TreeReactFlow/TreeReactFlow.stories.tsx b/src/components/TreeReactFlow/TreeReactFlow.stories.tsx
@@ -1,7 +1,6 @@
 import { ComponentStory, ComponentMeta } from "@storybook/react";
 import {
   defaultTreeReactFlowProps,
-  inlineTreeReactFlowProps,
   TreeReactFlow,
   TreeReactFlowProps,
 } from "./";
@@ -361,20 +360,3 @@ export const OddAndEvenMiscStyles: ComponentStory<typeof TreeReactFlow> = (
       contents: { def: def5.name, node: { nodeType: "BodyNode", meta: 5 } },
     },
   });
-export const OddAndEvenInline: ComponentStory<typeof TreeReactFlow> = (
-  args: TreeReactFlowProps
-) =>
-  treeSized({
-    ...inlineTreeReactFlowProps,
-    ...args,
-    defs: oddEvenTrees.map(([baseName, term]) => ({
-      name: { qualifiedModule: [], baseName },
-      term,
-      type_: emptyTypeTree(baseName),
-    })),
-    typeDefs: [],
-    selection: {
-      tag: "SelectionDef",
-      contents: { def: def5.name, node: { nodeType: "BodyNode", meta: 5 } },
-    },
-  });
diff --git a/src/components/TreeReactFlow/index.tsx b/src/components/TreeReactFlow/index.tsx
@@ -96,9 +96,7 @@ type ReactFlowParams = {
 };
 
 /** These properties are needed to construct nodes, but are invariant across all nodes. */
-export type NodeStyle = "corner" | "inline";
 type NodeParams = {
-  style: NodeStyle;
   nodeWidth: number;
   nodeHeight: number;
   boxPadding: number;