Page MenuHomePhabricator
Files F3371357

D9133.id31049.diff
No OneTemporary
Actions

D9133.id31049.diff
View Options

diff --git a/native/chat/chat-thread-list.react.js b/native/chat/chat-thread-list.react.js
--- a/native/chat/chat-thread-list.react.js
+++ b/native/chat/chat-thread-list.react.js
@@ -83,7 +83,7 @@
];
/* eslint-disable import/no-named-as-default-member */
-const { Value, Node, interpolateNode } = Animated;
+const { Value, Node, interpolateNode, useValue } = Animated;
/* eslint-enable import/no-named-as-default-member */
type Item =
@@ -126,6 +126,9 @@
+setOpenedSwipeableID: SetState<string>,
+numItemsToDisplay: number,
+setNumItemsToDisplay: SetState<number>,
+ +searchCancelButtonOpen: Value,
+ +searchCancelButtonProgress: Node,
+ +searchCancelButtonOffset: Node,
};
class ChatThreadList extends React.PureComponent<Props> {
@@ -133,20 +136,9 @@
flatList: ?FlatList<Item>;
scrollPos = 0;
clearNavigationBlurListener: ?() => mixed;
- searchCancelButtonOpen: Value = new Value(0);
- searchCancelButtonProgress: Node;
- searchCancelButtonOffset: Node;
constructor(props: Props) {
super(props);
- this.searchCancelButtonProgress = animateTowards(
- this.searchCancelButtonOpen,
- 100,
- );
- this.searchCancelButtonOffset = interpolateNode(
- this.searchCancelButtonProgress,
- { inputRange: [0, 1], outputRange: [0, 56] },
- );
}
componentDidMount() {
@@ -207,9 +199,9 @@
const wasActiveOrActivating =
prevSearchStatus === 'active' || prevSearchStatus === 'activating';
if (isActiveOrActivating && !wasActiveOrActivating) {
- this.searchCancelButtonOpen.setValue(1);
+ this.props.searchCancelButtonOpen.setValue(1);
} else if (!isActiveOrActivating && wasActiveOrActivating) {
- this.searchCancelButtonOpen.setValue(0);
+ this.props.searchCancelButtonOpen.setValue(0);
}
const { flatList } = this;
@@ -269,7 +261,7 @@
renderSearch(additionalProps?: $Shape<React.ElementConfig<typeof Search>>) {
const animatedSearchBoxStyle: AnimatedStyleObj = {
- marginRight: this.searchCancelButtonOffset,
+ marginRight: this.props.searchCancelButtonOffset,
};
const searchBoxStyle = [
this.props.styles.searchBox,
@@ -277,7 +269,7 @@
];
const buttonStyle = [
this.props.styles.cancelSearchButtonText,
- { opacity: this.searchCancelButtonProgress },
+ { opacity: this.props.searchCancelButtonProgress },
];
return (
<View style={this.props.styles.searchContainer}>
@@ -636,6 +628,20 @@
const [openedSwipeableID, setOpenedSwipeableID] = React.useState<string>('');
const [numItemsToDisplay, setNumItemsToDisplay] = React.useState<number>(25);
+ const searchCancelButtonOpen: Value = useValue(0);
+ const searchCancelButtonProgress: Node = React.useMemo(
+ () => animateTowards(searchCancelButtonOpen, 100),
+ [searchCancelButtonOpen],
+ );
+ const searchCancelButtonOffset: Node = React.useMemo(
+ () =>
+ interpolateNode(searchCancelButtonProgress, {
+ inputRange: [0, 1],
+ outputRange: [0, 56],
+ }),
+ [searchCancelButtonProgress],
+ );
+
return (
<ChatThreadList
navigation={navigation}
@@ -662,6 +668,9 @@
setOpenedSwipeableID={setOpenedSwipeableID}
numItemsToDisplay={numItemsToDisplay}
setNumItemsToDisplay={setNumItemsToDisplay}
+ searchCancelButtonOpen={searchCancelButtonOpen}
+ searchCancelButtonProgress={searchCancelButtonProgress}
+ searchCancelButtonOffset={searchCancelButtonOffset}
/>
);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 4:38 AM (21 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2587469
Default Alt Text
D9133.id31049.diff (3 KB)

Event Timeline