Merge branch 'main' into web-layout
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"prepare": "is-ci || husky install",
|
||||
"postinstall": "patch-package",
|
||||
"postinstall": "patch-package && yarn intl:compile",
|
||||
"prebuild": "expo prebuild --clean",
|
||||
"android": "expo run:android",
|
||||
"ios": "expo run:ios",
|
||||
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
getModerationOpts,
|
||||
useModerationOpts,
|
||||
} from './preferences'
|
||||
import {isInvalidHandle} from '#/lib/strings/handles'
|
||||
|
||||
const DEFAULT_MOD_OPTS = getModerationOpts({
|
||||
userDid: '',
|
||||
@@ -119,7 +120,7 @@ function prefixMatch(
|
||||
prefix: string,
|
||||
info: AppBskyActorDefs.ProfileViewBasic,
|
||||
): boolean {
|
||||
if (info.handle.includes(prefix)) {
|
||||
if (!isInvalidHandle(info.handle) && info.handle.includes(prefix)) {
|
||||
return true
|
||||
}
|
||||
if (info.displayName?.toLocaleLowerCase().includes(prefix)) {
|
||||
|
||||
@@ -144,7 +144,7 @@ export async function submit({
|
||||
}
|
||||
|
||||
export function is13(state: CreateAccountState) {
|
||||
return getAge(state.birthDate) >= 18
|
||||
return getAge(state.birthDate) >= 13
|
||||
}
|
||||
|
||||
export function is18(state: CreateAccountState) {
|
||||
|
||||
@@ -452,7 +452,7 @@ export const ComposePost = observer(function ComposePost({
|
||||
<OpenCameraBtn gallery={gallery} />
|
||||
</>
|
||||
) : null}
|
||||
{isDesktop ? <EmojiPickerButton /> : null}
|
||||
{!isMobile ? <EmojiPickerButton /> : null}
|
||||
<View style={s.flex1} />
|
||||
<SelectLangBtn />
|
||||
<CharProgress count={graphemeLength} />
|
||||
|
||||
@@ -134,7 +134,7 @@ const MentionList = forwardRef<MentionListRef, SuggestionProps>(
|
||||
return true
|
||||
}
|
||||
|
||||
if (event.key === 'Enter') {
|
||||
if (event.key === 'Enter' || event.key === 'Tab') {
|
||||
enterHandler()
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ export function EmojiPicker({close}: {close: () => void}) {
|
||||
return (await import('./EmojiPickerData.json')).default
|
||||
}}
|
||||
onEmojiSelect={onInsert}
|
||||
autoFocus={false}
|
||||
autoFocus={true}
|
||||
/>
|
||||
</View>
|
||||
</TouchableWithoutFeedback>
|
||||
|
||||
@@ -80,6 +80,7 @@ export function Component({image}: Props) {
|
||||
source={{
|
||||
uri: image.cropped?.path ?? image.path,
|
||||
}}
|
||||
contentFit="contain"
|
||||
accessible={true}
|
||||
accessibilityIgnoresInvertColors
|
||||
/>
|
||||
|
||||
@@ -88,6 +88,7 @@ function ListImpl<ItemT>(
|
||||
{...props}
|
||||
contentOffset={contentOffset}
|
||||
refreshControl={refreshControl}
|
||||
scrollIndicatorInsets={{right: 1}}
|
||||
onScroll={scrollHandler}
|
||||
scrollEventThrottle={1}
|
||||
style={style}
|
||||
|
||||
@@ -493,6 +493,7 @@ export function FeedsScreen(_props: Props) {
|
||||
onEndReached={onEndReached}
|
||||
// @ts-ignore our .web version only -prf
|
||||
desktopFixedHeight
|
||||
scrollIndicatorInsets={{right: 1}}
|
||||
/>
|
||||
|
||||
{hasSession && (
|
||||
|
||||
@@ -39,6 +39,7 @@ import {truncateAndInvalidate} from '#/state/queries/util'
|
||||
import {Text} from '#/view/com/util/text/Text'
|
||||
import {usePalette} from 'lib/hooks/usePalette'
|
||||
import {isNative} from '#/platform/detection'
|
||||
import {isInvalidHandle} from '#/lib/strings/handles'
|
||||
|
||||
interface SectionRef {
|
||||
scrollToTop: () => void
|
||||
@@ -231,7 +232,7 @@ function ProfileScreenLoaded({
|
||||
track('ProfileScreen:PressCompose')
|
||||
const mention =
|
||||
profile.handle === currentAccount?.handle ||
|
||||
profile.handle === 'handle.invalid'
|
||||
isInvalidHandle(profile.handle)
|
||||
? undefined
|
||||
: profile.handle
|
||||
openComposer({mention})
|
||||
|
||||
@@ -46,6 +46,7 @@ import {useComposerControls} from '#/state/shell/composer'
|
||||
import {useFetchHandle} from '#/state/queries/handle'
|
||||
import {emitSoftReset} from '#/state/events'
|
||||
import {NavSignupCard} from '#/view/shell/NavSignupCard'
|
||||
import {isInvalidHandle} from '#/lib/strings/handles'
|
||||
|
||||
function ProfileCard() {
|
||||
const {currentAccount} = useSession()
|
||||
@@ -221,7 +222,7 @@ function ComposeBtn() {
|
||||
if (
|
||||
!handle ||
|
||||
handle === currentAccount?.handle ||
|
||||
handle === 'handle.invalid'
|
||||
isInvalidHandle(handle)
|
||||
)
|
||||
return undefined
|
||||
|
||||
|
||||
Reference in New Issue
Block a user