Skip to content

Pass generated key to Children.map/forEach #1982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chenglou wants to merge 1 commit into from
+61 −58
Closed

Pass generated key to Children.map/forEach #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/utils/ReactChildren.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ PooledClass.addPoolingTo(ForEachBookKeeping, twoArgumentPooler);
function forEachSingleChild(traverseContext, child, name, i) {
var forEachBookKeeping = traverseContext;
forEachBookKeeping.forEachFunction.call(
forEachBookKeeping.forEachContext, child, i);
forEachBookKeeping.forEachContext, child, i, name);
}

/**
Expand Down Expand Up @@ -97,8 +97,12 @@ function mapSingleChildIntoContext(traverseContext, child, name, i) {
);

if (keyUnique) {
var mappedChild =
mapBookKeeping.mapFunction.call(mapBookKeeping.mapContext, child, i);
var mappedChild = mapBookKeeping.mapFunction.call(
mapBookKeeping.mapContext,
child,
i,
name
);
mapResult[name] = mappedChild;
}
}
Expand Down
109 changes: 54 additions & 55 deletions src/utils/__tests__/ReactChildren-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,18 @@ describe('ReactChildren', function() {
});

var simpleKid = <span key="simple" />;
var mappedKey = '.$simple';

// First pass children into a component to fully simulate what happens when
// using structures that arrive from transforms.

var instance = <div>{simpleKid}</div>;
ReactChildren.forEach(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(simpleKid, 0);
expect(callback).toHaveBeenCalledWith(simpleKid, 0, mappedKey);
callback.reset();
var mappedChildren = ReactChildren.map(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(simpleKid, 0);
expect(mappedChildren[Object.keys(mappedChildren)[0]]).toBe(simpleKid);
expect(callback).toHaveBeenCalledWith(simpleKid, 0, mappedKey);
expect(mappedChildren[mappedKey]).toBe(simpleKid);
});

it('should treat single arrayless child as being in array', function() {
Expand All @@ -55,12 +56,14 @@ describe('ReactChildren', function() {

var simpleKid = <span />;
var instance = <div>{simpleKid}</div>;
var mappedKey = '.0';

ReactChildren.forEach(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(simpleKid, 0);
expect(callback).toHaveBeenCalledWith(simpleKid, 0, mappedKey);
callback.reset();
var mappedChildren = ReactChildren.map(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(simpleKid, 0);
expect(mappedChildren[Object.keys(mappedChildren)[0]]).toBe(simpleKid);
expect(callback).toHaveBeenCalledWith(simpleKid, 0, mappedKey);
expect(mappedChildren[mappedKey]).toBe(simpleKid);
});

it('should treat single child in array as expected', function() {
Expand All @@ -70,12 +73,14 @@ describe('ReactChildren', function() {

var simpleKid = <span />;
var instance = <div>{[simpleKid]}</div>;
var mappedKey = '.0';

ReactChildren.forEach(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(simpleKid, 0);
expect(callback).toHaveBeenCalledWith(simpleKid, 0, mappedKey);
callback.reset();
var mappedChildren = ReactChildren.map(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(simpleKid, 0);
expect(mappedChildren[Object.keys(mappedChildren)[0]]).toBe(simpleKid);
expect(callback).toHaveBeenCalledWith(simpleKid, 0, mappedKey);
expect(mappedChildren[mappedKey]).toBe(simpleKid);
});

it('should pass key to returned component', function() {
Expand Down Expand Up @@ -137,47 +142,39 @@ describe('ReactChildren', function() {
index === 3 ? threeMapped : fourMapped;
});

var instance = (
<div>
{zero}
{one}
{two}
{three}
{four}
</div>
);
var instance = <div>{zero}{one}{two}{three}{four}</div>;
var mappedKeys = ['.$keyZero', '.1', '.$keyTwo', '.3', '.$keyFour'];

ReactChildren.forEach(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(zero, 0);
expect(callback).toHaveBeenCalledWith(one, 1);
expect(callback).toHaveBeenCalledWith(two, 2);
expect(callback).toHaveBeenCalledWith(three, 3);
expect(callback).toHaveBeenCalledWith(four, 4);
expect(callback).toHaveBeenCalledWith(zero, 0, mappedKeys[0]);
expect(callback).toHaveBeenCalledWith(one, 1, mappedKeys[1]);
expect(callback).toHaveBeenCalledWith(two, 2, mappedKeys[2]);
expect(callback).toHaveBeenCalledWith(three, 3, mappedKeys[3]);
expect(callback).toHaveBeenCalledWith(four, 4, mappedKeys[4]);
callback.reset();

var mappedChildren =
ReactChildren.map(instance.props.children, callback);
var mappedKeys = Object.keys(mappedChildren);
var actualMappedKeys = Object.keys(mappedChildren);

expect(callback.calls.length).toBe(5);
expect(mappedKeys.length).toBe(5);
expect(actualMappedKeys.length).toBe(5);
// Keys default to indices.
expect(mappedKeys).toEqual(
['.$keyZero', '.1', '.$keyTwo', '.3', '.$keyFour']
);
expect(actualMappedKeys).toEqual(mappedKeys);

expect(callback).toHaveBeenCalledWith(zero, 0);
expect(callback).toHaveBeenCalledWith(zero, 0, mappedKeys[0]);
expect(mappedChildren[mappedKeys[0]]).toBe(zeroMapped);

expect(callback).toHaveBeenCalledWith(one, 1);
expect(callback).toHaveBeenCalledWith(one, 1, mappedKeys[1]);
expect(mappedChildren[mappedKeys[1]]).toBe(oneMapped);

expect(callback).toHaveBeenCalledWith(two, 2);
expect(callback).toHaveBeenCalledWith(two, 2, mappedKeys[2]);
expect(mappedChildren[mappedKeys[2]]).toBe(twoMapped);

expect(callback).toHaveBeenCalledWith(three, 3);
expect(callback).toHaveBeenCalledWith(three, 3, mappedKeys[3]);
expect(mappedChildren[mappedKeys[3]]).toBe(threeMapped);

expect(callback).toHaveBeenCalledWith(four, 4);
expect(callback).toHaveBeenCalledWith(four, 4, mappedKeys[4]);
expect(mappedChildren[mappedKeys[4]]).toBe(fourMapped);
});

Expand Down Expand Up @@ -220,45 +217,47 @@ describe('ReactChildren', function() {
}</div>
);

ReactChildren.forEach(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(zero, 0);
expect(callback).toHaveBeenCalledWith(one, 1);
expect(callback).toHaveBeenCalledWith(two, 2);
expect(callback).toHaveBeenCalledWith(three, 3);
expect(callback).toHaveBeenCalledWith(four, 4);
expect(callback).toHaveBeenCalledWith(five, 5);
callback.reset();

var mappedChildren = ReactChildren.map(instance.props.children, callback);
var mappedKeys = Object.keys(mappedChildren);
expect(callback.calls.length).toBe(6);
expect(mappedKeys.length).toBe(6);
// Keys default to indices.
expect(mappedKeys).toEqual([
var mappedKeys = [
'.0:$firstHalfKey:0:$keyZero',
'.0:$firstHalfKey:0:1',
'.0:$firstHalfKey:0:$keyTwo',
'.0:$secondHalfKey:0:0',
'.0:$secondHalfKey:0:$keyFour',
'.0:$keyFive:$keyFiveInner'
]);
];

ReactChildren.forEach(instance.props.children, callback);
expect(callback).toHaveBeenCalledWith(zero, 0, mappedKeys[0]);
expect(callback).toHaveBeenCalledWith(one, 1, mappedKeys[1]);
expect(callback).toHaveBeenCalledWith(two, 2, mappedKeys[2]);
expect(callback).toHaveBeenCalledWith(three, 3, mappedKeys[3]);
expect(callback).toHaveBeenCalledWith(four, 4, mappedKeys[4]);
expect(callback).toHaveBeenCalledWith(five, 5, mappedKeys[5]);
callback.reset();

var mappedChildren = ReactChildren.map(instance.props.children, callback);
var actualMappedKeys = Object.keys(mappedChildren);
expect(callback.calls.length).toBe(6);
expect(actualMappedKeys.length).toBe(6);
// Keys default to indices.
expect(actualMappedKeys).toEqual(mappedKeys);

expect(callback).toHaveBeenCalledWith(zero, 0);
expect(callback).toHaveBeenCalledWith(zero, 0, mappedKeys[0]);
expect(mappedChildren[mappedKeys[0]]).toBe(zeroMapped);

expect(callback).toHaveBeenCalledWith(one, 1);
expect(callback).toHaveBeenCalledWith(one, 1, mappedKeys[1]);
expect(mappedChildren[mappedKeys[1]]).toBe(oneMapped);

expect(callback).toHaveBeenCalledWith(two, 2);
expect(callback).toHaveBeenCalledWith(two, 2, mappedKeys[2]);
expect(mappedChildren[mappedKeys[2]]).toBe(twoMapped);

expect(callback).toHaveBeenCalledWith(three, 3);
expect(callback).toHaveBeenCalledWith(three, 3, mappedKeys[3]);
expect(mappedChildren[mappedKeys[3]]).toBe(threeMapped);

expect(callback).toHaveBeenCalledWith(four, 4);
expect(callback).toHaveBeenCalledWith(four, 4, mappedKeys[4]);
expect(mappedChildren[mappedKeys[4]]).toBe(fourMapped);

expect(callback).toHaveBeenCalledWith(five, 5);
expect(callback).toHaveBeenCalledWith(five, 5, mappedKeys[5]);
expect(mappedChildren[mappedKeys[5]]).toBe(fiveMapped);
});

Expand Down