Skip to content
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

issue #18943 - SectionSeparatorComponent and ItemSeparatorComponent s… #26933

Closed
wants to merge 3 commits into from
Closed

issue #18943 - SectionSeparatorComponent and ItemSeparatorComponent s… #26933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f57952
issue #18943 - SectionSeparatorComponent and ItemSeparatorComponent s…
dy93 Oct 21, 2019
db263df
issue #18943 - Fix test fail
dy93 Oct 21, 2019
9e60972
Merge remote-tracking branch 'src/master'
dy93 Oct 28, 2019
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
7 changes: 5 additions & 2 deletions Libraries/Lists/VirtualizedSectionList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ class VirtualizedSectionList<
section={info.section}
trailingItem={info.trailingItem}
trailingSection={info.trailingSection}
inverted={!!this.props.inverted}
/>
);
}
Expand Down Expand Up @@ -435,6 +436,7 @@ type ItemWithSeparatorProps = $ReadOnly<{|
onUpdateSeparator: (cellKey: string, newProps: Object) => void,
prevCellKey?: ?string,
renderItem: Function,
inverted: boolean,
|}>;

type ItemWithSeparatorState = {
Expand Down Expand Up @@ -534,6 +536,7 @@ class ItemWithSeparator extends React.Component<
item,
index,
section,
inverted,
} = this.props;
const element = this.props.renderItem({
item,
Expand All @@ -552,9 +555,9 @@ class ItemWithSeparator extends React.Component<
* error found when Flow v0.89 was deployed. To see the error, delete
* this comment and run Flow. */
<View>
{leadingSeparator}
{!inverted ? leadingSeparator : separator}
{element}
{separator}
{!inverted ? separator : leadingSeparator}
</View>
) : (
element
Expand Down
8 changes: 4 additions & 4 deletions Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,10 +751,10 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
}
>
<View>
<separator />
<item
value="0"
/>
<separator />
</View>
</View>
<View
Expand All @@ -774,10 +774,10 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
}
>
<View>
<separator />
<item
value="1"
/>
<separator />
</View>
</View>
<View
Expand All @@ -797,10 +797,10 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
}
>
<View>
<separator />
<item
value="2"
/>
<separator />
</View>
</View>
<View
Expand All @@ -820,10 +820,10 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
}
>
<View>
<separator />
<item
value="3"
/>
<separator />
</View>
</View>
<View
Expand Down