Page MenuHomePhorge
Files F32212758

D7773.1765143767.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D7773.1765143767.diff
View Options

diff --git a/native/chat/chat.react.js b/native/chat/chat.react.js
--- a/native/chat/chat.react.js
+++ b/native/chat/chat.react.js
@@ -68,7 +68,10 @@
type ScreenParamList,
type ChatParamList,
type ChatTopTabsParamList,
+ MessageSearchRouteName,
} from '../navigation/route-names.js';
+import MessageSearch from '../search/message-search.react.js';
+import SearchHeader from '../search/search-header.react.js';
import { useColors, useStyles } from '../themes/colors.js';
const unboundStyles = {
@@ -268,6 +271,14 @@
headerTitle: 'Delete chat',
headerBackTitleVisible: false,
};
+const messageSearchOptions = {
+ // eslint-disable-next-line react/display-name
+ headerTitle: () => <SearchHeader />,
+ headerBackTitleVisible: false,
+ headerTitleContainerStyle: {
+ width: '100%',
+ },
+};
const messageResultsScreenOptions = {
headerTitle: 'Pinned Messages',
headerBackTitleVisible: false,
@@ -385,6 +396,11 @@
component={MessageResultsScreen}
options={messageResultsScreenOptions}
/>
+ <Chat.Screen
+ name={MessageSearchRouteName}
+ component={MessageSearch}
+ options={messageSearchOptions}
+ />
</Chat.Navigator>
<MessageStorePruner />
<ThreadScreenPruner />
diff --git a/native/navigation/route-names.js b/native/navigation/route-names.js
--- a/native/navigation/route-names.js
+++ b/native/navigation/route-names.js
@@ -35,6 +35,7 @@
import type { VideoPlaybackModalParams } from '../media/video-playback-modal.react.js';
import type { CustomServerModalParams } from '../profile/custom-server-modal.react.js';
import type { RelationshipListItemTooltipModalParams } from '../profile/relationship-list-item-tooltip-modal.react.js';
+import type { MessageSearchParams } from '../search/message-search.react.js';
export const ActionResultModalRouteName = 'ActionResultModal';
export const AddUsersModalRouteName = 'AddUsersModal';
@@ -99,6 +100,7 @@
export const ConnectEthereumRouteName = 'ConnectEthereum';
export const ExistingEthereumAccountRouteName = 'ExistingEthereumAccount';
export const UsernameSelectionRouteName = 'UsernameSelection';
+export const MessageSearchRouteName = 'MessageSearch';
export type RootParamList = {
+LoggedOutModal: void,
@@ -163,6 +165,7 @@
+DeleteThread: DeleteThreadParams,
+FullScreenThreadMediaGallery: FullScreenThreadMediaGalleryParams,
+MessageResultsScreen: MessageResultsScreenParams,
+ +MessageSearch: MessageSearchParams,
};
export type ChatTopTabsParamList = {
diff --git a/native/search/message-search.react.js b/native/search/message-search.react.js
new file mode 100644
--- /dev/null
+++ b/native/search/message-search.react.js
@@ -0,0 +1,75 @@
+// @flow
+
+import invariant from 'invariant';
+import * as React from 'react';
+import { View } from 'react-native';
+
+import type { MessageInfo } from 'lib/types/message-types.js';
+import type { ThreadInfo } from 'lib/types/thread-types.js';
+
+import SearchFooter from './search-footer.react.js';
+import { MessageSearchContext } from './search-provider.react.js';
+import type { ChatNavigationProp } from '../chat/chat.react.js';
+import type { NavigationRoute } from '../navigation/route-names.js';
+import { useStyles } from '../themes/colors.js';
+
+export type MessageSearchParams = {
+ +threadInfo: ThreadInfo,
+};
+
+export type MessageSearchProps = {
+ +navigation: ChatNavigationProp<'MessageSearch'>,
+ +route: NavigationRoute<'MessageSearch'>,
+};
+
+function MessageSearch(props: MessageSearchProps): React.Node {
+ const searchContext = React.useContext(MessageSearchContext);
+ invariant(searchContext, 'searchContext should be set');
+ const { query, clearQuery } = searchContext;
+
+ React.useEffect(() => {
+ return props.navigation.addListener('beforeRemove', () => {
+ clearQuery();
+ });
+ }, [props.navigation, clearQuery]);
+
+ // eslint-disable-next-line no-unused-vars
+ const [lastID, setLastID] = React.useState();
+
+ // eslint-disable-next-line no-unused-vars
+ const [searchResults, setSearchResults] = React.useState([]);
+
+ // eslint-disable-next-line no-unused-vars
+ const appendSearchResults = React.useCallback(
+ (newMessages: $ReadOnlyArray<MessageInfo>) => {
+ setSearchResults(oldMessages => [...oldMessages, ...newMessages]);
+ },
+ [],
+ );
+
+ React.useEffect(() => {
+ setSearchResults([]);
+ setLastID(undefined);
+ }, [query]);
+
+ const styles = useStyles(unboundStyles);
+
+ if (query === '') {
+ return (
+ <View style={styles.content}>
+ <SearchFooter text="Your search results will appear here" />
+ </View>
+ );
+ }
+
+ return null;
+}
+
+const unboundStyles = {
+ content: {
+ height: '100%',
+ backgroundColor: 'panelBackground',
+ },
+};
+
+export default MessageSearch;

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 9:42 PM (22 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5845000
Default Alt Text
D7773.1765143767.diff (4 KB)

Event Timeline