Merge pull request #449 from open-rpc/feat/per-method-default-expanded

feat: per method default expanded uiSchema

Author: shanejonas

src/Methods/Methods.test.tsx

@@ -85,6 +85,62 @@ it("renders collapsed contents with defaultExpanded from uiSchema", () => {
   ReactDOM.unmountComponentAtNode(div);
 });
 
+it("renders collapsed contents with defaultExpanded with the method from uiSchema", () => {
+  const div = document.createElement("div");
+  const schema = {
+    methods: [
+      {
+        name: "foomethod",
+        params: [{
+          name: "foobarz",
+        }],
+      },
+    ],
+  };
+  const uiSchema = {
+    links: {
+    },
+    methods: {
+      "ui:defaultExpanded": {
+        foomethod: true,
+      },
+    },
+    params: {
+    },
+  };
+  ReactDOM.render(<Methods uiSchema={uiSchema} schema={schema as any} disableTransitionProps={true} />, div);
+  expect(div.innerHTML.includes("aria-expanded=\"true\"")).toBe(true);
+  ReactDOM.unmountComponentAtNode(div);
+});
+
+it("doesnt render collapsed contents with wrong method name and defaultExpanded with method", () => {
+  const div = document.createElement("div");
+  const uiSchema = {
+    links: {
+    },
+    methods: {
+      "ui:defaultExpanded": {
+        foomethod: true,
+      },
+    },
+    params: {
+    },
+  };
+  const schema = {
+    methods: [
+      {
+        name: "foomethod2",
+        params: [{
+          name: "foobarz",
+        }],
+      },
+    ],
+  };
+  ReactDOM.render(<Methods uiSchema={uiSchema} schema={schema as any} />, div);
+  expect(div.innerHTML.includes("foobarz")).toBe(false);
+  ReactDOM.unmountComponentAtNode(div);
+});
+
 it("renders collapsed contents with disableTransitionProps", () => {
   const div = document.createElement("div");
   const schema = {

src/Methods/Methods.tsx

@@ -69,9 +69,10 @@ class Methods extends Component<IProps> {
         <Typography variant="h3" gutterBottom>Methods</Typography>
         {schema.methods.map((method, i) => (
           <ExpansionPanel
+            id={method.name}
             key={i + method.name}
             TransitionProps={{ unmountOnExit: disableTransitionProps ? false : true }}
-            defaultExpanded={uiSchema && uiSchema.methods["ui:defaultExpanded"]}
+            defaultExpanded={uiSchema && (uiSchema.methods["ui:defaultExpanded"] === true || uiSchema.methods["ui:defaultExpanded"][method.name] === true)}
           >
             <ExpansionPanelSummary expandIcon={<ExpandMoreIcon />}>
               <Typography key={method.name} className={classes.heading}>{method.name}</Typography>
@@ -89,7 +90,7 @@ class Methods extends Component<IProps> {
                   uiSchema={uiSchema}
                   source={method.description}
                   className={classes.description}
-                  />
+                />
               </ExpansionPanelDetails>
             }
             {method.params && method.params.length > 0 &&