mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
463af23753
Summary: This is the Javascript-only changes from D34518929 (https://github.com/facebook/react-native/commit/dd6325bafe1a539d348f3710e717a6344576b859), split out for push safety. Original summary and test plan below: This issue fixes [30977][17] . The Pull Request was previously published by [intergalacticspacehighway][13] with [31666][19]. The solution consists of: 1. Adding Javascript logic in the [FlatList][14], SectionList, VirtualizedList components to provide accessibility information (row and column position) for each cell in the method [renderItem][20] as a fourth parameter [accessibilityCollectionItem][21]. The information is saved on the native side in the AccessibilityNodeInfo and announced by TalkBack when changing row, column, or page ([video example][12]). The prop accessibilityCollectionItem is available in the View component which wraps each FlatList cell. 2. Adding Java logic in [ReactScrollView.java][16] and HorizontalScrollView to announce pages with TalkBack when scrolling up/down. The missing AOSP logic in [ScrollView.java][10] (see also the [GridView][11] example) is responsible for announcing Page Scrolling with TalkBack. Relevant Links: x [Additional notes on this PR][18] x [discussion on the additional container View around each FlatList cell][22] x [commit adding prop getCellsInItemCount to VirtualizedList][23] ## Changelog [Android] [Added] - Accessibility announcement for list and grid in FlatList Pull Request resolved: https://github.com/facebook/react-native/pull/33180 Test Plan: [1]. TalkBack announces pages and cells with Horizontal Flatlist in the Paper Renderer ([link][1]) [2]. TalkBack announces pages and cells with Vertical Flatlist in the Paper Renderer ([link][2]) [3]. `FlatList numColumns={undefined}` Should not trigger Runtime Error NoSuchKey exception columnCount when enabling TalkBack. ([link][3]) [4]. TalkBack announces pages and cells with Nested Horizontal Flatlist in the rn-tester app ([link][4]) [1]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/6#issuecomment-1050452894 [2]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/6#issuecomment-1050462465 [3]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/6#issuecomment-1032340879 [4]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/6#issuecomment-1050618308 [10]:https://github.com/aosp-mirror/platform_frameworks_base/blob/1ac46f932ef88a8f96d652580d8105e361ffc842/core/java/android/widget/AdapterView.java#L1027-L1029 "GridView.java method responsible for calling setFromIndex and setToIndex" [11]:https://github.com/fabriziobertoglio1987/react-native-notes/issues/6#issuecomment-1042518901 "test case on Android GridView" [12]:https://github.com/fabriziobertoglio1987/react-native-notes/issues/6#issuecomment-1050452894 "TalkBack announces pages and cells with Horizontal Flatlist in the Paper Renderer" [13]:https://github.com/intergalacticspacehighway "github intergalacticspacehighway" [14]:https://github.com/fabriziobertoglio1987/react-native/blob/80acf523a4410adac8005d5c9472fb87f78e12ee/Libraries/Lists/FlatList.js#L617-L636 "FlatList accessibilityCollectionItem" [16]:https://github.com/fabriziobertoglio1987/react-native/blob/5706bd7d3ee35dca48f85322a2bdcaec0bce2c85/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java#L183-L184 "logic added to ReactScrollView.java" [17]: https://github.com/facebook/react-native/issues/30977 [18]: https://github.com/fabriziobertoglio1987/react-native-notes/issues/6 [19]: https://github.com/facebook/react-native/pull/31666 [20]: https://reactnative.dev/docs/next/flatlist#required-renderitem "FlatList renderItem documentation" [21]: https://github.com/fabriziobertoglio1987/react-native/commit/75147359c5d070406ebbe488c57c3cd94c08c19d "commit that introduces fourth param accessibilityCollectionItem in callback renderItem" [22]: https://github.com/facebook/react-native/pull/33180#discussion_r826748664 "discussion on the additional container View around each FlatList cell" [23]: https://github.com/fabriziobertoglio1987/react-native/commit/d50fd1a68112f40f4be3ac3aa4d67f96df33e387 "commit adding prop getCellsInItemCount to VirtualizedList" Reviewed By: lunaleaps Differential Revision: D37668064 Pulled By: blavalla fbshipit-source-id: 7ba4068405fdcb9823d0daed2d8c36f0a56dbf0f
627 lines
19 KiB
JavaScript
627 lines
19 KiB
JavaScript
/**
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*
|
|
* @flow
|
|
* @format
|
|
*/
|
|
|
|
import type {ViewToken} from './ViewabilityHelper';
|
|
import type {AccessibilityCollectionItem} from './VirtualizedListProps';
|
|
import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils';
|
|
import invariant from 'invariant';
|
|
import * as React from 'react';
|
|
import {View, VirtualizedList} from 'react-native';
|
|
|
|
type Item = any;
|
|
|
|
export type SectionBase<SectionItemT> = {
|
|
/**
|
|
* The data for rendering items in this section.
|
|
*/
|
|
data: $ReadOnlyArray<SectionItemT>,
|
|
/**
|
|
* Optional key to keep track of section re-ordering. If you don't plan on re-ordering sections,
|
|
* the array index will be used by default.
|
|
*/
|
|
key?: string,
|
|
// Optional props will override list-wide props just for this section.
|
|
renderItem?: ?(info: {
|
|
item: SectionItemT,
|
|
index: number,
|
|
section: SectionBase<SectionItemT>,
|
|
separators: {
|
|
highlight: () => void,
|
|
unhighlight: () => void,
|
|
updateProps: (select: 'leading' | 'trailing', newProps: Object) => void,
|
|
...
|
|
},
|
|
...
|
|
}) => null | React.Element<any>,
|
|
ItemSeparatorComponent?: ?React.ComponentType<any>,
|
|
keyExtractor?: (item: SectionItemT, index?: ?number) => string,
|
|
...
|
|
};
|
|
|
|
type RequiredProps<SectionT: SectionBase<any>> = {|
|
|
sections: $ReadOnlyArray<SectionT>,
|
|
|};
|
|
|
|
type OptionalProps<SectionT: SectionBase<any>> = {|
|
|
/**
|
|
* Default renderer for every item in every section.
|
|
*/
|
|
renderItem?: (info: {
|
|
item: Item,
|
|
index: number,
|
|
section: SectionT,
|
|
separators: {
|
|
highlight: () => void,
|
|
unhighlight: () => void,
|
|
updateProps: (select: 'leading' | 'trailing', newProps: Object) => void,
|
|
...
|
|
},
|
|
...
|
|
}) => null | React.Element<any>,
|
|
/**
|
|
* Rendered at the top of each section. These stick to the top of the `ScrollView` by default on
|
|
* iOS. See `stickySectionHeadersEnabled`.
|
|
*/
|
|
renderSectionHeader?: ?(info: {
|
|
section: SectionT,
|
|
...
|
|
}) => null | React.Element<any>,
|
|
/**
|
|
* Rendered at the bottom of each section.
|
|
*/
|
|
renderSectionFooter?: ?(info: {
|
|
section: SectionT,
|
|
...
|
|
}) => null | React.Element<any>,
|
|
/**
|
|
* Rendered at the top and bottom of each section (note this is different from
|
|
* `ItemSeparatorComponent` which is only rendered between items). These are intended to separate
|
|
* sections from the headers above and below and typically have the same highlight response as
|
|
* `ItemSeparatorComponent`. Also receives `highlighted`, `[leading/trailing][Item/Separator]`,
|
|
* and any custom props from `separators.updateProps`.
|
|
*/
|
|
SectionSeparatorComponent?: ?React.ComponentType<any>,
|
|
/**
|
|
* Makes section headers stick to the top of the screen until the next one pushes it off. Only
|
|
* enabled by default on iOS because that is the platform standard there.
|
|
*/
|
|
stickySectionHeadersEnabled?: boolean,
|
|
onEndReached?: ?({distanceFromEnd: number, ...}) => void,
|
|
|};
|
|
|
|
type VirtualizedListProps = React.ElementConfig<typeof VirtualizedList>;
|
|
|
|
export type Props<SectionT> = {|
|
|
...RequiredProps<SectionT>,
|
|
...OptionalProps<SectionT>,
|
|
...$Diff<
|
|
VirtualizedListProps,
|
|
{
|
|
renderItem: $PropertyType<VirtualizedListProps, 'renderItem'>,
|
|
data: $PropertyType<VirtualizedListProps, 'data'>,
|
|
...
|
|
},
|
|
>,
|
|
|};
|
|
export type ScrollToLocationParamsType = {|
|
|
animated?: ?boolean,
|
|
itemIndex: number,
|
|
sectionIndex: number,
|
|
viewOffset?: number,
|
|
viewPosition?: number,
|
|
|};
|
|
|
|
type State = {childProps: VirtualizedListProps, ...};
|
|
|
|
/**
|
|
* Right now this just flattens everything into one list and uses VirtualizedList under the
|
|
* hood. The only operation that might not scale well is concatting the data arrays of all the
|
|
* sections when new props are received, which should be plenty fast for up to ~10,000 items.
|
|
*/
|
|
class VirtualizedSectionList<
|
|
SectionT: SectionBase<any>,
|
|
> extends React.PureComponent<Props<SectionT>, State> {
|
|
scrollToLocation(params: ScrollToLocationParamsType) {
|
|
let index = params.itemIndex;
|
|
for (let i = 0; i < params.sectionIndex; i++) {
|
|
index += this.props.getItemCount(this.props.sections[i].data) + 2;
|
|
}
|
|
let viewOffset = params.viewOffset || 0;
|
|
if (this._listRef == null) {
|
|
return;
|
|
}
|
|
if (params.itemIndex > 0 && this.props.stickySectionHeadersEnabled) {
|
|
const frame = this._listRef.__getFrameMetricsApprox(
|
|
index - params.itemIndex,
|
|
this._listRef.props,
|
|
);
|
|
viewOffset += frame.length;
|
|
}
|
|
const toIndexParams = {
|
|
...params,
|
|
viewOffset,
|
|
index,
|
|
};
|
|
// $FlowFixMe[incompatible-use]
|
|
this._listRef.scrollToIndex(toIndexParams);
|
|
}
|
|
|
|
getListRef(): ?React.ElementRef<typeof VirtualizedList> {
|
|
return this._listRef;
|
|
}
|
|
|
|
render(): React.Node {
|
|
const {
|
|
ItemSeparatorComponent, // don't pass through, rendered with renderItem
|
|
SectionSeparatorComponent,
|
|
renderItem: _renderItem,
|
|
renderSectionFooter,
|
|
renderSectionHeader,
|
|
sections: _sections,
|
|
stickySectionHeadersEnabled,
|
|
...passThroughProps
|
|
} = this.props;
|
|
|
|
const listHeaderOffset = this.props.ListHeaderComponent ? 1 : 0;
|
|
|
|
const stickyHeaderIndices = this.props.stickySectionHeadersEnabled
|
|
? []
|
|
: undefined;
|
|
|
|
let itemCount = 0;
|
|
for (const section of this.props.sections) {
|
|
// Track the section header indices
|
|
if (stickyHeaderIndices != null) {
|
|
stickyHeaderIndices.push(itemCount + listHeaderOffset);
|
|
}
|
|
|
|
// Add two for the section header and footer.
|
|
itemCount += 2;
|
|
itemCount += this.props.getItemCount(section.data);
|
|
}
|
|
const renderItem = this._renderItem(itemCount);
|
|
|
|
return (
|
|
<VirtualizedList
|
|
{...passThroughProps}
|
|
keyExtractor={this._keyExtractor}
|
|
stickyHeaderIndices={stickyHeaderIndices}
|
|
renderItem={renderItem}
|
|
data={this.props.sections}
|
|
getItem={(sections, index) =>
|
|
this._getItem(this.props, sections, index)
|
|
}
|
|
getItemCount={() => itemCount}
|
|
onViewableItemsChanged={
|
|
this.props.onViewableItemsChanged
|
|
? this._onViewableItemsChanged
|
|
: undefined
|
|
}
|
|
ref={this._captureRef}
|
|
/>
|
|
);
|
|
}
|
|
|
|
_getItem(
|
|
props: Props<SectionT>,
|
|
sections: ?$ReadOnlyArray<Item>,
|
|
index: number,
|
|
): ?Item {
|
|
if (!sections) {
|
|
return null;
|
|
}
|
|
let itemIdx = index - 1;
|
|
for (let i = 0; i < sections.length; i++) {
|
|
const section = sections[i];
|
|
const sectionData = section.data;
|
|
const itemCount = props.getItemCount(sectionData);
|
|
if (itemIdx === -1 || itemIdx === itemCount) {
|
|
// We intend for there to be overflow by one on both ends of the list.
|
|
// This will be for headers and footers. When returning a header or footer
|
|
// item the section itself is the item.
|
|
return section;
|
|
} else if (itemIdx < itemCount) {
|
|
// If we are in the bounds of the list's data then return the item.
|
|
return props.getItem(sectionData, itemIdx);
|
|
} else {
|
|
itemIdx -= itemCount + 2; // Add two for the header and footer
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
_keyExtractor = (item: Item, index: number) => {
|
|
const info = this._subExtractor(index);
|
|
return (info && info.key) || String(index);
|
|
};
|
|
|
|
_subExtractor(index: number): ?{
|
|
section: SectionT,
|
|
// Key of the section or combined key for section + item
|
|
key: string,
|
|
// Relative index within the section
|
|
index: ?number,
|
|
// True if this is the section header
|
|
header?: ?boolean,
|
|
leadingItem?: ?Item,
|
|
leadingSection?: ?SectionT,
|
|
trailingItem?: ?Item,
|
|
trailingSection?: ?SectionT,
|
|
...
|
|
} {
|
|
let itemIndex = index;
|
|
const {getItem, getItemCount, keyExtractor, sections} = this.props;
|
|
for (let i = 0; i < sections.length; i++) {
|
|
const section = sections[i];
|
|
const sectionData = section.data;
|
|
const key = section.key || String(i);
|
|
itemIndex -= 1; // The section adds an item for the header
|
|
if (itemIndex >= getItemCount(sectionData) + 1) {
|
|
itemIndex -= getItemCount(sectionData) + 1; // The section adds an item for the footer.
|
|
} else if (itemIndex === -1) {
|
|
return {
|
|
section,
|
|
key: key + ':header',
|
|
index: null,
|
|
header: true,
|
|
trailingSection: sections[i + 1],
|
|
};
|
|
} else if (itemIndex === getItemCount(sectionData)) {
|
|
return {
|
|
section,
|
|
key: key + ':footer',
|
|
index: null,
|
|
header: false,
|
|
trailingSection: sections[i + 1],
|
|
};
|
|
} else {
|
|
const extractor =
|
|
section.keyExtractor || keyExtractor || defaultKeyExtractor;
|
|
return {
|
|
section,
|
|
key:
|
|
key + ':' + extractor(getItem(sectionData, itemIndex), itemIndex),
|
|
index: itemIndex,
|
|
leadingItem: getItem(sectionData, itemIndex - 1),
|
|
leadingSection: sections[i - 1],
|
|
trailingItem: getItem(sectionData, itemIndex + 1),
|
|
trailingSection: sections[i + 1],
|
|
};
|
|
}
|
|
}
|
|
}
|
|
|
|
_convertViewable = (viewable: ViewToken): ?ViewToken => {
|
|
invariant(viewable.index != null, 'Received a broken ViewToken');
|
|
const info = this._subExtractor(viewable.index);
|
|
if (!info) {
|
|
return null;
|
|
}
|
|
const keyExtractorWithNullableIndex = info.section.keyExtractor;
|
|
const keyExtractorWithNonNullableIndex =
|
|
this.props.keyExtractor || defaultKeyExtractor;
|
|
const key =
|
|
keyExtractorWithNullableIndex != null
|
|
? keyExtractorWithNullableIndex(viewable.item, info.index)
|
|
: keyExtractorWithNonNullableIndex(viewable.item, info.index ?? 0);
|
|
|
|
return {
|
|
...viewable,
|
|
index: info.index,
|
|
key,
|
|
section: info.section,
|
|
};
|
|
};
|
|
|
|
_onViewableItemsChanged = ({
|
|
viewableItems,
|
|
changed,
|
|
}: {
|
|
viewableItems: Array<ViewToken>,
|
|
changed: Array<ViewToken>,
|
|
...
|
|
}) => {
|
|
const onViewableItemsChanged = this.props.onViewableItemsChanged;
|
|
if (onViewableItemsChanged != null) {
|
|
onViewableItemsChanged({
|
|
viewableItems: viewableItems
|
|
.map(this._convertViewable, this)
|
|
.filter(Boolean),
|
|
changed: changed.map(this._convertViewable, this).filter(Boolean),
|
|
});
|
|
}
|
|
};
|
|
|
|
_renderItem =
|
|
(listItemCount: number) =>
|
|
// eslint-disable-next-line react/no-unstable-nested-components
|
|
({
|
|
item,
|
|
index,
|
|
accessibilityCollectionItem,
|
|
}: {
|
|
item: Item,
|
|
index: number,
|
|
accessibilityCollectionItem: AccessibilityCollectionItem,
|
|
...
|
|
}) => {
|
|
const info = this._subExtractor(index);
|
|
if (!info) {
|
|
return null;
|
|
}
|
|
const infoIndex = info.index;
|
|
if (infoIndex == null) {
|
|
const {section} = info;
|
|
if (info.header === true) {
|
|
const {renderSectionHeader} = this.props;
|
|
return renderSectionHeader ? renderSectionHeader({section}) : null;
|
|
} else {
|
|
const {renderSectionFooter} = this.props;
|
|
return renderSectionFooter ? renderSectionFooter({section}) : null;
|
|
}
|
|
} else {
|
|
const renderItem = info.section.renderItem || this.props.renderItem;
|
|
const SeparatorComponent = this._getSeparatorComponent(
|
|
index,
|
|
info,
|
|
listItemCount,
|
|
);
|
|
invariant(renderItem, 'no renderItem!');
|
|
return (
|
|
<ItemWithSeparator
|
|
SeparatorComponent={SeparatorComponent}
|
|
LeadingSeparatorComponent={
|
|
infoIndex === 0 ? this.props.SectionSeparatorComponent : undefined
|
|
}
|
|
accessibilityCollectionItem={accessibilityCollectionItem}
|
|
cellKey={info.key}
|
|
index={infoIndex}
|
|
item={item}
|
|
leadingItem={info.leadingItem}
|
|
leadingSection={info.leadingSection}
|
|
prevCellKey={(this._subExtractor(index - 1) || {}).key}
|
|
// Callback to provide updateHighlight for this item
|
|
setSelfHighlightCallback={this._setUpdateHighlightFor}
|
|
setSelfUpdatePropsCallback={this._setUpdatePropsFor}
|
|
// Provide child ability to set highlight/updateProps for previous item using prevCellKey
|
|
updateHighlightFor={this._updateHighlightFor}
|
|
updatePropsFor={this._updatePropsFor}
|
|
renderItem={renderItem}
|
|
section={info.section}
|
|
trailingItem={info.trailingItem}
|
|
trailingSection={info.trailingSection}
|
|
inverted={!!this.props.inverted}
|
|
/>
|
|
);
|
|
}
|
|
};
|
|
|
|
_updatePropsFor = (cellKey: string, value: any) => {
|
|
const updateProps = this._updatePropsMap[cellKey];
|
|
if (updateProps != null) {
|
|
updateProps(value);
|
|
}
|
|
};
|
|
|
|
_updateHighlightFor = (cellKey: string, value: boolean) => {
|
|
const updateHighlight = this._updateHighlightMap[cellKey];
|
|
if (updateHighlight != null) {
|
|
updateHighlight(value);
|
|
}
|
|
};
|
|
|
|
_setUpdateHighlightFor = (
|
|
cellKey: string,
|
|
updateHighlightFn: ?(boolean) => void,
|
|
) => {
|
|
if (updateHighlightFn != null) {
|
|
this._updateHighlightMap[cellKey] = updateHighlightFn;
|
|
} else {
|
|
delete this._updateHighlightFor[cellKey];
|
|
}
|
|
};
|
|
|
|
_setUpdatePropsFor = (cellKey: string, updatePropsFn: ?(boolean) => void) => {
|
|
if (updatePropsFn != null) {
|
|
this._updatePropsMap[cellKey] = updatePropsFn;
|
|
} else {
|
|
delete this._updatePropsMap[cellKey];
|
|
}
|
|
};
|
|
|
|
_getSeparatorComponent(
|
|
index: number,
|
|
info?: ?Object,
|
|
listItemCount: number,
|
|
): ?React.ComponentType<any> {
|
|
info = info || this._subExtractor(index);
|
|
if (!info) {
|
|
return null;
|
|
}
|
|
const ItemSeparatorComponent =
|
|
info.section.ItemSeparatorComponent || this.props.ItemSeparatorComponent;
|
|
const {SectionSeparatorComponent} = this.props;
|
|
const isLastItemInList = index === listItemCount - 1;
|
|
const isLastItemInSection =
|
|
info.index === this.props.getItemCount(info.section.data) - 1;
|
|
if (SectionSeparatorComponent && isLastItemInSection) {
|
|
return SectionSeparatorComponent;
|
|
}
|
|
if (ItemSeparatorComponent && !isLastItemInSection && !isLastItemInList) {
|
|
return ItemSeparatorComponent;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
_updateHighlightMap: {[string]: (boolean) => void} = {};
|
|
_updatePropsMap: {[string]: void | (boolean => void)} = {};
|
|
_listRef: ?React.ElementRef<typeof VirtualizedList>;
|
|
_captureRef = (ref: null | React$ElementRef<Class<VirtualizedList>>) => {
|
|
this._listRef = ref;
|
|
};
|
|
}
|
|
|
|
type ItemWithSeparatorCommonProps = $ReadOnly<{|
|
|
leadingItem: ?Item,
|
|
leadingSection: ?Object,
|
|
section: Object,
|
|
trailingItem: ?Item,
|
|
trailingSection: ?Object,
|
|
|}>;
|
|
|
|
type ItemWithSeparatorProps = $ReadOnly<{|
|
|
...ItemWithSeparatorCommonProps,
|
|
LeadingSeparatorComponent: ?React.ComponentType<any>,
|
|
SeparatorComponent: ?React.ComponentType<any>,
|
|
cellKey: string,
|
|
index: number,
|
|
item: Item,
|
|
setSelfHighlightCallback: (
|
|
cellKey: string,
|
|
updateFn: ?(boolean) => void,
|
|
) => void,
|
|
setSelfUpdatePropsCallback: (
|
|
cellKey: string,
|
|
updateFn: ?(boolean) => void,
|
|
) => void,
|
|
prevCellKey?: ?string,
|
|
updateHighlightFor: (prevCellKey: string, value: boolean) => void,
|
|
updatePropsFor: (prevCellKey: string, value: Object) => void,
|
|
renderItem: Function,
|
|
inverted: boolean,
|
|
accessibilityCollectionItem: AccessibilityCollectionItem,
|
|
|}>;
|
|
|
|
function ItemWithSeparator(props: ItemWithSeparatorProps): React.Node {
|
|
const {
|
|
LeadingSeparatorComponent,
|
|
// this is the trailing separator and is associated with this item
|
|
SeparatorComponent,
|
|
cellKey,
|
|
prevCellKey,
|
|
setSelfHighlightCallback,
|
|
updateHighlightFor,
|
|
setSelfUpdatePropsCallback,
|
|
updatePropsFor,
|
|
item,
|
|
index,
|
|
section,
|
|
inverted,
|
|
accessibilityCollectionItem,
|
|
} = props;
|
|
|
|
const [leadingSeparatorHiglighted, setLeadingSeparatorHighlighted] =
|
|
React.useState(false);
|
|
|
|
const [separatorHighlighted, setSeparatorHighlighted] = React.useState(false);
|
|
|
|
const [leadingSeparatorProps, setLeadingSeparatorProps] = React.useState({
|
|
leadingItem: props.leadingItem,
|
|
leadingSection: props.leadingSection,
|
|
section: props.section,
|
|
trailingItem: props.item,
|
|
trailingSection: props.trailingSection,
|
|
});
|
|
const [separatorProps, setSeparatorProps] = React.useState({
|
|
leadingItem: props.item,
|
|
leadingSection: props.leadingSection,
|
|
section: props.section,
|
|
trailingItem: props.trailingItem,
|
|
trailingSection: props.trailingSection,
|
|
});
|
|
|
|
React.useEffect(() => {
|
|
setSelfHighlightCallback(cellKey, setSeparatorHighlighted);
|
|
setSelfUpdatePropsCallback(cellKey, setSeparatorProps);
|
|
|
|
return () => {
|
|
setSelfUpdatePropsCallback(cellKey, null);
|
|
setSelfHighlightCallback(cellKey, null);
|
|
};
|
|
}, [
|
|
cellKey,
|
|
setSelfHighlightCallback,
|
|
setSeparatorProps,
|
|
setSelfUpdatePropsCallback,
|
|
]);
|
|
|
|
const separators = {
|
|
highlight: () => {
|
|
setLeadingSeparatorHighlighted(true);
|
|
setSeparatorHighlighted(true);
|
|
if (prevCellKey != null) {
|
|
updateHighlightFor(prevCellKey, true);
|
|
}
|
|
},
|
|
unhighlight: () => {
|
|
setLeadingSeparatorHighlighted(false);
|
|
setSeparatorHighlighted(false);
|
|
if (prevCellKey != null) {
|
|
updateHighlightFor(prevCellKey, false);
|
|
}
|
|
},
|
|
updateProps: (
|
|
select: 'leading' | 'trailing',
|
|
newProps: $Shape<ItemWithSeparatorCommonProps>,
|
|
) => {
|
|
if (select === 'leading') {
|
|
if (LeadingSeparatorComponent != null) {
|
|
setLeadingSeparatorProps({...leadingSeparatorProps, ...newProps});
|
|
} else if (prevCellKey != null) {
|
|
// update the previous item's separator
|
|
updatePropsFor(prevCellKey, {...leadingSeparatorProps, ...newProps});
|
|
}
|
|
} else if (select === 'trailing' && SeparatorComponent != null) {
|
|
setSeparatorProps({...separatorProps, ...newProps});
|
|
}
|
|
},
|
|
};
|
|
const element = props.renderItem({
|
|
item,
|
|
index,
|
|
section,
|
|
separators,
|
|
accessibilityCollectionItem,
|
|
});
|
|
const leadingSeparator = LeadingSeparatorComponent != null && (
|
|
<LeadingSeparatorComponent
|
|
highlighted={leadingSeparatorHiglighted}
|
|
{...leadingSeparatorProps}
|
|
/>
|
|
);
|
|
const separator = SeparatorComponent != null && (
|
|
<SeparatorComponent
|
|
highlighted={separatorHighlighted}
|
|
{...separatorProps}
|
|
/>
|
|
);
|
|
return leadingSeparator || separator ? (
|
|
<View>
|
|
{inverted === false ? leadingSeparator : separator}
|
|
{element}
|
|
{inverted === false ? separator : leadingSeparator}
|
|
</View>
|
|
) : (
|
|
element
|
|
);
|
|
}
|
|
|
|
/* $FlowFixMe[class-object-subtyping] added when improving typing for this
|
|
* parameters */
|
|
// $FlowFixMe[method-unbinding]
|
|
module.exports = (VirtualizedSectionList: React.AbstractComponent<
|
|
React.ElementConfig<typeof VirtualizedSectionList>,
|
|
$ReadOnly<{
|
|
getListRef: () => ?React.ElementRef<typeof VirtualizedList>,
|
|
scrollToLocation: (params: ScrollToLocationParamsType) => void,
|
|
...
|
|
}>,
|
|
>);
|