[Stepper] Prevent overriding Step's props (#13188)

* Override step props over internal state of stepper * add a unit test
mui · Oct 10, 2018 · 9085831 · 9085831
1 parent f11ae66
commit 9085831
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/material-ui/src/Stepper/Stepper.js b/packages/material-ui/src/Stepper/Stepper.js
@@ -84,7 +84,7 @@ function Stepper(props) {
           key: index, // eslint-disable-line react/no-array-index-key
           ...state,
         }),
-      React.cloneElement(step, { ...controlProps, ...step.props, ...state }),
+      React.cloneElement(step, { ...controlProps, ...state, ...step.props }),
     ];
   });
 

diff --git a/packages/material-ui/src/Stepper/Stepper.test.js b/packages/material-ui/src/Stepper/Stepper.test.js
@@ -199,4 +199,17 @@ describe('<Stepper />', () => {
     );
     assert.strictEqual(wrapper.find(Step).length, 1);
   });
+
+  it('should be able to force a state', () => {
+    const wrapper = shallow(
+      <Stepper>
+        <Step className="child-0" />
+        <Step className="child-1" active />
+        <Step className="child-2" />
+      </Stepper>,
+    );
+    assert.strictEqual(wrapper.find('.child-0').props().active, true);
+    assert.strictEqual(wrapper.find('.child-1').props().active, true);
+    assert.strictEqual(wrapper.find('.child-2').props().active, false);
+  });
 });