chore: un-generic panel display components

Author: tstirrat15

src/components/FullPlayground.tsx

@@ -77,7 +77,6 @@ import { ShareLoader } from "./ShareLoader";
 import { ValidateButton } from "./ValidationButton";
 import { Panel, useSummaryStyles } from "./panels/base/common";
 import { ReflexedPanelDisplay } from "./panels/base/reflexed";
-import { PlaygroundPanelLocation } from "./panels/panels";
 import { ProblemsPanel, ProblemsSummary } from "./panels/problems";
 import { TerminalPanel, TerminalSummary } from "./panels/terminal";
 import { ValidationPanel, ValidationSummary } from "./panels/validation";
@@ -1104,31 +1103,31 @@ const TabLabelWithCount = (props: {
   );
 };
 
-const panels: Panel<PlaygroundPanelLocation>[] = [
+const panels: Panel[] = [
   {
     id: "problems",
-    summary: ProblemsSummary,
-    content: ProblemsPanel,
+    Summary: ProblemsSummary,
+    Content: ProblemsPanel,
   },
   {
     id: "watches",
-    summary: WatchesSummary,
-    content: WatchesPanel,
+    Summary: WatchesSummary,
+    Content: WatchesPanel,
   },
   {
     id: "visualizer",
-    summary: VisualizerSummary,
-    content: VisualizerPanel,
+    Summary: VisualizerSummary,
+    Content: VisualizerPanel,
   },
   {
     id: "validation",
-    summary: ValidationSummary,
-    content: ValidationPanel,
+    Summary: ValidationSummary,
+    Content: ValidationPanel,
   },
   {
     id: "terminal",
-    summary: TerminalSummary,
-    content: TerminalPanel,
+    Summary: TerminalSummary,
+    Content: TerminalPanel,
   },
 ];
 

src/components/panels/base/common.tsx

@@ -1,12 +1,14 @@
+import { type ReactNode } from 'react'
 import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
 import "react-reflex/styles.css";
 import { DataStore } from "../../../services/datastore";
 import { Services } from "../../../services/services";
+import { ReflexedPanelLocation } from '../types';
 
 /**
  * Panel defines a single panel found in the panel display component.
  */
-export interface Panel<L extends string> {
+export interface Panel {
   /**
    * id is the unique ID for the panel. Must be stable across loads.
    */
@@ -15,29 +17,29 @@ export interface Panel<L extends string> {
   /**
    * summary is the React tag to render for displaying the summary of the panel.
    */
-  summary: (props: PanelSummaryProps<L>) => JSX.Element;
+  Summary: (props: PanelSummaryProps) => ReactNode;
 
   /**
    * content is the React tag to render for displaying the contents of the panel.
    */
-  content: (props: PanelProps<L>) => JSX.Element;
+  Content: (props: PanelProps) => ReactNode;
 }
 
 /**
  * PanelProps are the props passed to all panels content tags.
  */
-export interface PanelProps<L extends string> {
+export interface PanelProps {
   datastore: DataStore;
   services: Services;
-  location: L;
+  location: ReflexedPanelLocation;
 }
 
 /**
  * PanelSummaryProps are the props passed to all panel summary tags.
  */
-export interface PanelSummaryProps<L extends string> {
+export interface PanelSummaryProps {
   services: Services;
-  location: L;
+  location: ReflexedPanelLocation;
 }
 
 /**

src/components/panels/base/components.tsx

@@ -13,15 +13,16 @@ import { DataStore } from "../../../services/datastore";
 import { Services } from "../../../services/services";
 import { Panel, useSummaryStyles } from "./common";
 import { LocationData, PanelsCoordinator } from "./coordinator";
+import { ReflexedPanelLocation } from "../types";
 
 export const SUMMARY_BAR_HEIGHT = 48; // Pixels
 
 /**
  * PanelSummaryBar is the summary bar displayed when a panel display is closed.
  */
-export function PanelSummaryBar<L extends string>(props: {
-  location: L;
-  coordinator: PanelsCoordinator<L>;
+export function PanelSummaryBar(props: {
+  location: ReflexedPanelLocation;
+  coordinator: PanelsCoordinator;
   services: Services;
   disabled?: boolean | undefined;
   overrideSummaryDisplay?: ReactNode;
@@ -45,10 +46,10 @@ export function PanelSummaryBar<L extends string>(props: {
       >
         {props.overrideSummaryDisplay !== undefined &&
           props.overrideSummaryDisplay}
-        {panels.map((panel: Panel<L>) => {
+        {panels.map((panel: Panel) => {
           // NOTE: Using this as a tag here is important for React's state system. Otherwise,
           // it'll run hooks outside of the normal flow, which breaks things.
-          const Summary = panel.summary;
+          const Summary = panel.Summary;
           return (
             <Button
               key={panel.id}
@@ -114,10 +115,10 @@ const TOOLBAR_HEIGHT = 48; // Pixels
 /**
  * PanelDisplay displays the panels in a specific location.
  */
-export function PanelDisplay<L extends string>(
+export function PanelDisplay(
   props: {
-    location: L;
-    coordinator: PanelsCoordinator<L>;
+    location: ReflexedPanelLocation;
+    coordinator: PanelsCoordinator;
     datastore: DataStore;
     services: Services;
   } & {
@@ -159,14 +160,13 @@ export function PanelDisplay<L extends string>(
             aria-label="Tabs"
             variant="fullWidth"
           >
-            {panels.map((panel: Panel<L>) => {
+            {panels.map(({id, Summary }: Panel) => {
               // NOTE: Using this as a tag here is important for React's state system. Otherwise,
               // it'll run hooks outside of the normal flow, which breaks things.
-              const Summary = panel.summary;
               return (
                 <Tab
-                  key={`tab-${panel.id}`}
-                  value={panel.id}
+                  key={id}
+                  value={id}
                   label={<Summary {...props} />}
                 />
               );
@@ -175,7 +175,7 @@ export function PanelDisplay<L extends string>(
 
           <span>
             {currentTabName &&
-              coordinator.listLocations().map((locData: LocationData<L>) => {
+              coordinator.listLocations().map((locData: LocationData) => {
                 if (locData.location === props.location) {
                   return <div key={locData.location} />;
                 }
@@ -215,27 +215,26 @@ export function PanelDisplay<L extends string>(
         </Toolbar>
       </AppBar>
 
-      {panels.map((panel: Panel<L>) => {
+      {panels.map(({id, Content }: Panel) => {
         // NOTE: Using this as a tag here is important for React's state system. Otherwise,
         // it'll run hooks outside of the normal flow, which breaks things.
-        const Content = panel.content;
         const height =
           (props.dimensions?.height ?? 0 >= 48)
             ? (props.dimensions?.height ?? 0) - 48
             : "auto";
 
         return (
           <TabPanel
-            key={`panel-${panel.id}`}
-            index={panel.id}
+            key={id}
+            index={id}
             value={currentTabName}
             style={{
               overflow: "auto",
               height: height || "auto",
               position: "relative",
             }}
           >
-            {currentTabName === panel.id && <Content {...contentProps} />}
+            {currentTabName === id && <Content {...contentProps} />}
           </TabPanel>
         );
       })}