Fix: Slot onClick passes correct ID (#972)

Fixes #971

src/rsg-components/Slot/Slot.js

@@ -12,14 +12,15 @@ export default function Slot({ name, active, onlyActive, className, props = {} }
 	const rendered = fills.map((Fill, index) => {
 		// { id: 'pizza', render: ({ foo }) => <div>{foo}</div> }
 		const { id, render } = Fill;
+		let fillProps = props;
 		if (id && render) {
 			// Render only specified fill
 			if (onlyActive && id !== active) {
 				return null;
 			}
 
 			const { onClick } = props;
-			props = {
+			fillProps = {
 				...props,
 				name: id,
 				// Set active prop to active fill
@@ -32,7 +33,7 @@ export default function Slot({ name, active, onlyActive, className, props = {} }
 			Fill = render;
 		}
 
-		return <Fill key={index} {...props} />;
+		return <Fill key={index} {...fillProps} />;
 	});
 
 	const filtered = rendered.filter(Boolean);

src/rsg-components/Slot/Slot.spec.js

@@ -3,8 +3,14 @@ import Slot from './Slot';
 
 /* eslint-disable react/prop-types */
 
-const Button = ({ onClick }) => <button onClick={onClick}>1</button>;
-const Button2 = () => <button>2</button>;
+const Button = ({ name, onClick, children }) => (
+	<button name={name} onClick={onClick}>
+		{children}
+	</button>
+);
+
+const Button2 = props => <Button {...props}>2</Button>;
+
 const fillsWithIds = [
 	{
 		id: 'one',
@@ -74,12 +80,9 @@ it('should pass slot ID to onClick handler', () => {
 		},
 	});
 
-	actual
-		.find('button')
-		.first()
-		.simulate('click');
+	actual.find('button[name="two"]').simulate('click');
 
-	expect(onClick).toBeCalledWith('one', expect.any(Object));
+	expect(onClick).toBeCalledWith('two', expect.any(Object));
 });
 
 it('should return null if all slots render null', () => {