Merge pull request #450 from open-rpc/fix/method-expanded-guardds

fix: method expanded guards

Author: shanejonas

src/Methods/Methods.test.tsx

@@ -60,6 +60,38 @@ it("doesnt render collapsed contents", () => {
   ReactDOM.unmountComponentAtNode(div);
 });
 
+it("doesnt render collapsed contents with empty uiSchema", () => {
+  const div = document.createElement("div");
+  const schema = {
+    methods: [
+      {
+        params: [{
+          name: "foobarz",
+        }],
+      },
+    ],
+  };
+  ReactDOM.render(<Methods schema={schema as any} uiSchema={{}}/>, div);
+  expect(div.innerHTML.includes("foobarz")).toBe(false);
+  ReactDOM.unmountComponentAtNode(div);
+});
+
+it("doesnt render collapsed contents with empty uiSchema.methods", () => {
+  const div = document.createElement("div");
+  const schema = {
+    methods: [
+      {
+        params: [{
+          name: "foobarz",
+        }],
+      },
+    ],
+  };
+  ReactDOM.render(<Methods schema={schema as any} uiSchema={{methods: {}}}/>, div);
+  expect(div.innerHTML.includes("foobarz")).toBe(false);
+  ReactDOM.unmountComponentAtNode(div);
+});
+
 it("renders collapsed contents with defaultExpanded from uiSchema", () => {
   const div = document.createElement("div");
   const schema = {

src/Methods/Methods.tsx

@@ -72,8 +72,13 @@ class Methods extends Component<IProps> {
             id={method.name}
             key={i + method.name}
             TransitionProps={{ unmountOnExit: disableTransitionProps ? false : true }}
-            defaultExpanded={uiSchema && (uiSchema.methods["ui:defaultExpanded"] === true || uiSchema.methods["ui:defaultExpanded"][method.name] === true)}
-          >
+            defaultExpanded={
+              uiSchema &&
+              uiSchema.methods &&
+              (uiSchema.methods["ui:defaultExpanded"] === true ||
+                (uiSchema.methods["ui:defaultExpanded"] && uiSchema.methods["ui:defaultExpanded"][method.name] === true)
+              )
+            }>
             <ExpansionPanelSummary expandIcon={<ExpandMoreIcon />}>
               <Typography key={method.name} className={classes.heading}>{method.name}</Typography>
               <Typography key={method.summary} className={classes.secondaryHeading}>{method.summary}</Typography>