mirror of https://github.com/tooot-app/app
Fixed #67
This commit is contained in:
parent
e1f95ea2b2
commit
f9f9b783e3
|
@ -23,7 +23,7 @@ const HeaderCenter = React.memo(
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
() => true
|
(prev, next) => prev.content === next.content
|
||||||
)
|
)
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
|
|
|
@ -340,6 +340,12 @@ const ScreenCompose: React.FC<ScreenComposeProp> = ({
|
||||||
[totalTextCount, composeState]
|
[totalTextCount, composeState]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const headerContent = useMemo(() => {
|
||||||
|
return `${totalTextCount} / ${maxTootChars}${
|
||||||
|
__DEV__ ? ` Dirty: ${composeState.dirty.toString()}` : ''
|
||||||
|
}`
|
||||||
|
}, [totalTextCount, maxTootChars, composeState.dirty])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<KeyboardAvoidingView
|
<KeyboardAvoidingView
|
||||||
style={styles.base}
|
style={styles.base}
|
||||||
|
@ -358,26 +364,26 @@ const ScreenCompose: React.FC<ScreenComposeProp> = ({
|
||||||
name='Screen-Compose-Root'
|
name='Screen-Compose-Root'
|
||||||
component={ComposeRoot}
|
component={ComposeRoot}
|
||||||
options={{
|
options={{
|
||||||
|
...Platform.select({
|
||||||
|
ios: {
|
||||||
|
headerTitle: headerContent,
|
||||||
|
headerTitleStyle: {
|
||||||
|
fontWeight:
|
||||||
|
totalTextCount > maxTootChars
|
||||||
|
? StyleConstants.Font.Weight.Bold
|
||||||
|
: StyleConstants.Font.Weight.Normal,
|
||||||
|
fontSize: StyleConstants.Font.Size.M
|
||||||
|
},
|
||||||
|
headerTintColor:
|
||||||
|
totalTextCount > maxTootChars
|
||||||
|
? theme.red
|
||||||
|
: theme.secondary
|
||||||
|
},
|
||||||
|
android: {
|
||||||
|
headerCenter: () => <HeaderCenter content={headerContent} />
|
||||||
|
}
|
||||||
|
}),
|
||||||
headerLeft,
|
headerLeft,
|
||||||
headerTitle: `${totalTextCount} / ${maxTootChars}${
|
|
||||||
__DEV__ ? ` Dirty: ${composeState.dirty.toString()}` : ''
|
|
||||||
}`,
|
|
||||||
headerTitleStyle: {
|
|
||||||
fontWeight:
|
|
||||||
totalTextCount > maxTootChars
|
|
||||||
? StyleConstants.Font.Weight.Bold
|
|
||||||
: StyleConstants.Font.Weight.Normal,
|
|
||||||
fontSize: StyleConstants.Font.Size.M
|
|
||||||
},
|
|
||||||
headerTintColor:
|
|
||||||
totalTextCount > maxTootChars ? theme.red : theme.secondary,
|
|
||||||
headerCenter: () => (
|
|
||||||
<HeaderCenter
|
|
||||||
content={`${totalTextCount} / ${maxTootChars}${
|
|
||||||
__DEV__ ? ` Dirty: ${composeState.dirty.toString()}` : ''
|
|
||||||
}`}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
headerRight
|
headerRight
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import AttachmentVideo from '@components/Timeline/Shared/Attachment/Video'
|
import AttachmentVideo from '@components/Timeline/Shared/Attachment/Video'
|
||||||
import { StyleConstants } from '@utils/styles/constants'
|
import { StyleConstants } from '@utils/styles/constants'
|
||||||
import { useTheme } from '@utils/styles/ThemeManager'
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
import React, { useContext, useMemo } from 'react'
|
import React, { useContext, useMemo, useRef } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { ScrollView, StyleSheet, Text, TextInput, View } from 'react-native'
|
import { ScrollView, StyleSheet, Text, TextInput, View } from 'react-native'
|
||||||
import ComposeContext from '../utils/createContext'
|
import ComposeContext from '../utils/createContext'
|
||||||
|
@ -55,8 +55,10 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const scrollViewRef = useRef<ScrollView>(null)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollView>
|
<ScrollView ref={scrollViewRef}>
|
||||||
{mediaDisplay}
|
{mediaDisplay}
|
||||||
<View style={styles.altTextContainer}>
|
<View style={styles.altTextContainer}>
|
||||||
<Text style={[styles.altTextInputHeading, { color: theme.primary }]}>
|
<Text style={[styles.altTextInputHeading, { color: theme.primary }]}>
|
||||||
|
@ -67,6 +69,7 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
|
||||||
styles.altTextInput,
|
styles.altTextInput,
|
||||||
{ borderColor: theme.border, color: theme.primary }
|
{ borderColor: theme.border, color: theme.primary }
|
||||||
]}
|
]}
|
||||||
|
onFocus={() => scrollViewRef.current?.scrollToEnd()}
|
||||||
autoCapitalize='none'
|
autoCapitalize='none'
|
||||||
autoCorrect={false}
|
autoCorrect={false}
|
||||||
maxLength={1500}
|
maxLength={1500}
|
||||||
|
|
|
@ -4,7 +4,13 @@ import { useSearchQuery } from '@utils/queryHooks/search'
|
||||||
import { StyleConstants } from '@utils/styles/constants'
|
import { StyleConstants } from '@utils/styles/constants'
|
||||||
import { useTheme } from '@utils/styles/ThemeManager'
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
import { forEach, groupBy, sortBy } from 'lodash'
|
import { forEach, groupBy, sortBy } from 'lodash'
|
||||||
import React, { useCallback, useContext, useEffect, useMemo } from 'react'
|
import React, {
|
||||||
|
useCallback,
|
||||||
|
useContext,
|
||||||
|
useEffect,
|
||||||
|
useMemo,
|
||||||
|
useRef
|
||||||
|
} from 'react'
|
||||||
import { FlatList, Image, StyleSheet, View } from 'react-native'
|
import { FlatList, Image, StyleSheet, View } from 'react-native'
|
||||||
import { Circle } from 'react-native-animated-spinkit'
|
import { Circle } from 'react-native-animated-spinkit'
|
||||||
import ComposeActions from './Root/Actions'
|
import ComposeActions from './Root/Actions'
|
||||||
|
@ -30,90 +36,93 @@ const prefetchEmojis = (
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const ComposeRoot: React.FC = () => {
|
const ComposeRoot = React.memo(
|
||||||
const { theme } = useTheme()
|
() => {
|
||||||
|
const { theme } = useTheme()
|
||||||
|
|
||||||
const { composeState, composeDispatch } = useContext(ComposeContext)
|
const { composeState, composeDispatch } = useContext(ComposeContext)
|
||||||
|
|
||||||
const { isFetching, data, refetch } = useSearchQuery({
|
const { isFetching, data, refetch } = useSearchQuery({
|
||||||
type:
|
type:
|
||||||
composeState.tag?.type === 'accounts' ||
|
composeState.tag?.type === 'accounts' ||
|
||||||
composeState.tag?.type === 'hashtags'
|
composeState.tag?.type === 'hashtags'
|
||||||
? composeState.tag.type
|
? composeState.tag.type
|
||||||
: undefined,
|
: undefined,
|
||||||
term: composeState.tag?.text.substring(1),
|
term: composeState.tag?.text.substring(1),
|
||||||
options: { enabled: false }
|
options: { enabled: false }
|
||||||
})
|
})
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (
|
if (
|
||||||
(composeState.tag?.type === 'accounts' ||
|
(composeState.tag?.type === 'accounts' ||
|
||||||
composeState.tag?.type === 'hashtags') &&
|
composeState.tag?.type === 'hashtags') &&
|
||||||
composeState.tag?.text
|
composeState.tag?.text
|
||||||
) {
|
) {
|
||||||
refetch()
|
refetch()
|
||||||
}
|
}
|
||||||
}, [composeState.tag])
|
}, [composeState.tag])
|
||||||
|
|
||||||
const { data: emojisData } = useEmojisQuery({})
|
const { data: emojisData } = useEmojisQuery({})
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (emojisData && emojisData.length) {
|
if (emojisData && emojisData.length) {
|
||||||
let sortedEmojis: { title: string; data: Mastodon.Emoji[] }[] = []
|
let sortedEmojis: { title: string; data: Mastodon.Emoji[] }[] = []
|
||||||
forEach(
|
forEach(
|
||||||
groupBy(sortBy(emojisData, ['category', 'shortcode']), 'category'),
|
groupBy(sortBy(emojisData, ['category', 'shortcode']), 'category'),
|
||||||
(value, key) => sortedEmojis.push({ title: key, data: value })
|
(value, key) => sortedEmojis.push({ title: key, data: value })
|
||||||
)
|
)
|
||||||
composeDispatch({
|
composeDispatch({
|
||||||
type: 'emoji',
|
type: 'emoji',
|
||||||
payload: { ...composeState.emoji, emojis: sortedEmojis }
|
payload: { ...composeState.emoji, emojis: sortedEmojis }
|
||||||
})
|
})
|
||||||
prefetchEmojis(sortedEmojis)
|
prefetchEmojis(sortedEmojis)
|
||||||
}
|
}
|
||||||
}, [emojisData])
|
}, [emojisData])
|
||||||
|
|
||||||
const listEmpty = useMemo(() => {
|
const listEmpty = useMemo(() => {
|
||||||
if (isFetching) {
|
if (isFetching) {
|
||||||
return (
|
return (
|
||||||
<View key='listEmpty' style={styles.loading}>
|
<View key='listEmpty' style={styles.loading}>
|
||||||
<Circle
|
<Circle
|
||||||
size={StyleConstants.Font.Size.M * 1.25}
|
size={StyleConstants.Font.Size.M * 1.25}
|
||||||
color={theme.secondary}
|
color={theme.secondary}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}, [isFetching])
|
}, [isFetching])
|
||||||
|
|
||||||
const listItem = useCallback(
|
const listItem = useCallback(
|
||||||
({ item }) => (
|
({ item }) => (
|
||||||
<ComposeRootSuggestion
|
<ComposeRootSuggestion
|
||||||
item={item}
|
item={item}
|
||||||
composeState={composeState}
|
composeState={composeState}
|
||||||
composeDispatch={composeDispatch}
|
composeDispatch={composeDispatch}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
[composeState]
|
[composeState]
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.base}>
|
<View style={styles.base}>
|
||||||
<FlatList
|
<FlatList
|
||||||
renderItem={listItem}
|
renderItem={listItem}
|
||||||
ListEmptyComponent={listEmpty}
|
ListEmptyComponent={listEmpty}
|
||||||
keyboardShouldPersistTaps='handled'
|
keyboardShouldPersistTaps='always'
|
||||||
ListHeaderComponent={ComposeRootHeader}
|
ListHeaderComponent={ComposeRootHeader}
|
||||||
ListFooterComponent={ComposeRootFooter}
|
ListFooterComponent={ComposeRootFooter}
|
||||||
ItemSeparatorComponent={ComponentSeparator}
|
ItemSeparatorComponent={ComponentSeparator}
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
data={data ? data[composeState.tag?.type] : undefined}
|
data={data ? data[composeState.tag?.type] : undefined}
|
||||||
keyExtractor={() => Math.random().toString()}
|
keyExtractor={() => Math.random().toString()}
|
||||||
/>
|
/>
|
||||||
<ComposeActions />
|
<ComposeActions />
|
||||||
<ComposeDrafts />
|
<ComposeDrafts />
|
||||||
<ComposePosting />
|
<ComposePosting />
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
},
|
||||||
|
() => true
|
||||||
|
)
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
base: {
|
base: {
|
||||||
|
|
|
@ -246,7 +246,7 @@ const ComposeAttachments: React.FC = () => {
|
||||||
snapToAlignment='center'
|
snapToAlignment='center'
|
||||||
renderItem={renderAttachment}
|
renderItem={renderAttachment}
|
||||||
snapToOffsets={snapToOffsets}
|
snapToOffsets={snapToOffsets}
|
||||||
keyboardShouldPersistTaps='handled'
|
keyboardShouldPersistTaps='always'
|
||||||
showsHorizontalScrollIndicator={false}
|
showsHorizontalScrollIndicator={false}
|
||||||
data={composeState.attachments.uploads}
|
data={composeState.attachments.uploads}
|
||||||
keyExtractor={item =>
|
keyExtractor={item =>
|
||||||
|
|
|
@ -76,7 +76,7 @@ const ComposeEmojis: React.FC = () => {
|
||||||
<View style={styles.base}>
|
<View style={styles.base}>
|
||||||
<SectionList
|
<SectionList
|
||||||
horizontal
|
horizontal
|
||||||
keyboardShouldPersistTaps='handled'
|
keyboardShouldPersistTaps='always'
|
||||||
sections={composeState.emoji.emojis || []}
|
sections={composeState.emoji.emojis || []}
|
||||||
keyExtractor={item => item.shortcode}
|
keyExtractor={item => item.shortcode}
|
||||||
renderSectionHeader={listHeader}
|
renderSectionHeader={listHeader}
|
||||||
|
|
|
@ -46,7 +46,7 @@ const ComposeSpoilerInput: React.FC = () => {
|
||||||
})
|
})
|
||||||
}}
|
}}
|
||||||
ref={composeState.textInputFocus.refs.spoiler}
|
ref={composeState.textInputFocus.refs.spoiler}
|
||||||
scrollEnabled
|
scrollEnabled={false}
|
||||||
onFocus={() =>
|
onFocus={() =>
|
||||||
composeDispatch({
|
composeDispatch({
|
||||||
type: 'textInputFocus',
|
type: 'textInputFocus',
|
||||||
|
|
|
@ -52,7 +52,7 @@ const ComposeTextInput: React.FC = () => {
|
||||||
})
|
})
|
||||||
}}
|
}}
|
||||||
ref={composeState.textInputFocus.refs.text}
|
ref={composeState.textInputFocus.refs.text}
|
||||||
scrollEnabled
|
scrollEnabled={false}
|
||||||
>
|
>
|
||||||
<Text>{composeState.text.formatted}</Text>
|
<Text>{composeState.text.formatted}</Text>
|
||||||
</TextInput>
|
</TextInput>
|
||||||
|
|
|
@ -54,7 +54,7 @@ const ScreenMeSwitchRoot: React.FC = () => {
|
||||||
const instanceActive = useSelector(getInstanceActive)
|
const instanceActive = useSelector(getInstanceActive)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollView style={styles.base} keyboardShouldPersistTaps='handled'>
|
<ScrollView style={styles.base} keyboardShouldPersistTaps='always'>
|
||||||
<View style={[styles.firstSection, { borderBottomColor: theme.border }]}>
|
<View style={[styles.firstSection, { borderBottomColor: theme.border }]}>
|
||||||
<Text style={[styles.header, { color: theme.primary }]}>
|
<Text style={[styles.header, { color: theme.primary }]}>
|
||||||
{t('content.existing')}
|
{t('content.existing')}
|
||||||
|
|
Loading…
Reference in New Issue