A set of composer fixes (#1187)
* Don't insert a newline on cmd+entrl (close #1173) * Don't linkify selected text on url-paste (close #1149) * Disable the adult content controls if there is no media on the post (close #1169)zio/stable
parent
819340dd3c
commit
5e63d3164b
|
@ -102,6 +102,7 @@ export interface RepostModal {
|
|||
export interface SelfLabelModal {
|
||||
name: 'self-label'
|
||||
labels: string[]
|
||||
hasMedia: boolean
|
||||
onChange: (labels: string[]) => void
|
||||
}
|
||||
|
||||
|
|
|
@ -218,6 +218,7 @@ export const ComposePost = observer(function ComposePost({
|
|||
const selectTextInputPlaceholder = replyTo ? 'Write your reply' : `What's up?`
|
||||
|
||||
const canSelectImages = useMemo(() => gallery.size < 4, [gallery.size])
|
||||
const hasMedia = gallery.size > 0 || Boolean(extLink)
|
||||
|
||||
return (
|
||||
<KeyboardAvoidingView
|
||||
|
@ -236,7 +237,7 @@ export const ComposePost = observer(function ComposePost({
|
|||
<Text style={[pal.link, s.f18]}>Cancel</Text>
|
||||
</TouchableOpacity>
|
||||
<View style={s.flex1} />
|
||||
<LabelsBtn labels={labels} onChange={setLabels} />
|
||||
<LabelsBtn labels={labels} onChange={setLabels} hasMedia={hasMedia} />
|
||||
{isProcessing ? (
|
||||
<View style={styles.postBtn}>
|
||||
<ActivityIndicator />
|
||||
|
|
|
@ -11,9 +11,11 @@ import {isNative} from 'platform/detection'
|
|||
|
||||
export const LabelsBtn = observer(function LabelsBtn({
|
||||
labels,
|
||||
hasMedia,
|
||||
onChange,
|
||||
}: {
|
||||
labels: string[]
|
||||
hasMedia: boolean
|
||||
onChange: (v: string[]) => void
|
||||
}) {
|
||||
const pal = usePalette('default')
|
||||
|
@ -23,7 +25,7 @@ export const LabelsBtn = observer(function LabelsBtn({
|
|||
<Button
|
||||
type="default-light"
|
||||
testID="labelsBtn"
|
||||
style={styles.button}
|
||||
style={[styles.button, !hasMedia && styles.dimmed]}
|
||||
accessibilityLabel="Content warnings"
|
||||
accessibilityHint=""
|
||||
onPress={() => {
|
||||
|
@ -32,7 +34,7 @@ export const LabelsBtn = observer(function LabelsBtn({
|
|||
Keyboard.dismiss()
|
||||
}
|
||||
}
|
||||
store.shell.openModal({name: 'self-label', labels, onChange})
|
||||
store.shell.openModal({name: 'self-label', labels, hasMedia, onChange})
|
||||
}}>
|
||||
<ShieldExclamation style={pal.link} size={26} />
|
||||
{labels.length > 0 ? (
|
||||
|
@ -53,6 +55,9 @@ const styles = StyleSheet.create({
|
|||
paddingHorizontal: 14,
|
||||
marginRight: 4,
|
||||
},
|
||||
dimmed: {
|
||||
opacity: 0.4,
|
||||
},
|
||||
label: {
|
||||
maxWidth: 100,
|
||||
},
|
||||
|
|
|
@ -60,6 +60,7 @@ export const TextInput = React.forwardRef(
|
|||
Link.configure({
|
||||
protocols: ['http', 'https'],
|
||||
autolink: true,
|
||||
linkOnPaste: false,
|
||||
}),
|
||||
Mention.configure({
|
||||
HTMLAttributes: {
|
||||
|
@ -96,6 +97,7 @@ export const TextInput = React.forwardRef(
|
|||
onPressPublish(state)
|
||||
return state
|
||||
})
|
||||
return true
|
||||
}
|
||||
},
|
||||
},
|
||||
|
|
|
@ -16,9 +16,11 @@ export const snapPoints = ['50%']
|
|||
|
||||
export const Component = observer(function Component({
|
||||
labels,
|
||||
hasMedia,
|
||||
onChange,
|
||||
}: {
|
||||
labels: string[]
|
||||
hasMedia: boolean
|
||||
onChange: (labels: string[]) => void
|
||||
}) {
|
||||
const pal = usePalette('default')
|
||||
|
@ -74,6 +76,8 @@ export const Component = observer(function Component({
|
|||
</Button>
|
||||
) : null}
|
||||
</View>
|
||||
{hasMedia ? (
|
||||
<>
|
||||
<View style={s.flexRow}>
|
||||
<SelectableBtn
|
||||
testID="sexualLabelBtn"
|
||||
|
@ -114,6 +118,17 @@ export const Component = observer(function Component({
|
|||
<>If none are selected, suitable for all ages.</>
|
||||
)}
|
||||
</Text>
|
||||
</>
|
||||
) : (
|
||||
<View>
|
||||
<Text style={[pal.textLight]}>
|
||||
<Text type="md-bold" style={[pal.textLight]}>
|
||||
Not Applicable
|
||||
</Text>
|
||||
. This warning is only available for posts with media attached.
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
</ScrollView>
|
||||
|
||||
|
|
Loading…
Reference in New Issue