Lazy load ViewShot (#5517)
* lazy one spot * lazy signup * fix type * tweak type, fix missing viewshot type * only import type oops
This commit is contained in:
@@ -1,14 +1,19 @@
|
||||
import React from 'react'
|
||||
import {View} from 'react-native'
|
||||
import ViewShot from 'react-native-view-shot'
|
||||
import type ViewShot from 'react-native-view-shot'
|
||||
|
||||
import {useAvatar} from '#/screens/Onboarding/StepProfile/index'
|
||||
import {atoms as a} from '#/alf'
|
||||
|
||||
const LazyViewShot = React.lazy(
|
||||
// @ts-expect-error dynamic import
|
||||
() => import('react-native-view-shot/src/index'),
|
||||
)
|
||||
|
||||
const SIZE_MULTIPLIER = 5
|
||||
|
||||
export interface PlaceholderCanvasRef {
|
||||
capture: () => Promise<string>
|
||||
capture: () => Promise<string | undefined>
|
||||
}
|
||||
|
||||
// This component is supposed to be invisible to the user. We only need this for ViewShot to have something to
|
||||
@@ -16,7 +21,7 @@ export interface PlaceholderCanvasRef {
|
||||
export const PlaceholderCanvas = React.forwardRef<PlaceholderCanvasRef, {}>(
|
||||
function PlaceholderCanvas({}, ref) {
|
||||
const {avatar} = useAvatar()
|
||||
const viewshotRef = React.useRef()
|
||||
const viewshotRef = React.useRef<ViewShot>(null)
|
||||
const Icon = avatar.placeholder.component
|
||||
|
||||
const styles = React.useMemo(
|
||||
@@ -32,13 +37,16 @@ export const PlaceholderCanvas = React.forwardRef<PlaceholderCanvasRef, {}>(
|
||||
)
|
||||
|
||||
React.useImperativeHandle(ref, () => ({
|
||||
// @ts-ignore this library doesn't have types
|
||||
capture: viewshotRef.current.capture,
|
||||
capture: async () => {
|
||||
if (viewshotRef.current?.capture) {
|
||||
return await viewshotRef.current.capture()
|
||||
}
|
||||
},
|
||||
}))
|
||||
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
<ViewShot
|
||||
<LazyViewShot
|
||||
// @ts-ignore this library doesn't have types
|
||||
ref={viewshotRef}
|
||||
options={{
|
||||
@@ -60,7 +68,7 @@ export const PlaceholderCanvas = React.forwardRef<PlaceholderCanvasRef, {}>(
|
||||
style={{color: 'white'}}
|
||||
/>
|
||||
</View>
|
||||
</ViewShot>
|
||||
</LazyViewShot>
|
||||
</View>
|
||||
)
|
||||
},
|
||||
|
||||
@@ -10,13 +10,13 @@ import {msg, Trans} from '@lingui/macro'
|
||||
import {useLingui} from '@lingui/react'
|
||||
|
||||
import {useAnalytics} from '#/lib/analytics/analytics'
|
||||
import {usePhotoLibraryPermission} from '#/lib/hooks/usePermissions'
|
||||
import {compressIfNeeded} from '#/lib/media/manip'
|
||||
import {openCropper} from '#/lib/media/picker'
|
||||
import {getDataUriSize} from '#/lib/media/util'
|
||||
import {useRequestNotificationsPermission} from '#/lib/notifications/notifications'
|
||||
import {logEvent, useGate} from '#/lib/statsig/statsig'
|
||||
import {usePhotoLibraryPermission} from 'lib/hooks/usePermissions'
|
||||
import {compressIfNeeded} from 'lib/media/manip'
|
||||
import {openCropper} from 'lib/media/picker'
|
||||
import {getDataUriSize} from 'lib/media/util'
|
||||
import {useRequestNotificationsPermission} from 'lib/notifications/notifications'
|
||||
import {isNative, isWeb} from 'platform/detection'
|
||||
import {isNative, isWeb} from '#/platform/detection'
|
||||
import {
|
||||
DescriptionText,
|
||||
OnboardingControls,
|
||||
@@ -132,6 +132,10 @@ export function StepProfile() {
|
||||
|
||||
const onContinue = React.useCallback(async () => {
|
||||
let imageUri = avatar?.image?.path
|
||||
|
||||
// In the event that view-shot didn't load in time and the user pressed continue, this will just be undefined
|
||||
// and the default avatar will be used. We don't want to block getting through create if this fails for some
|
||||
// reason
|
||||
if (!imageUri || avatar.useCreatedAvatar) {
|
||||
imageUri = await canvasRef.current?.capture()
|
||||
}
|
||||
|
||||
@@ -51,13 +51,15 @@ export type OnboardingAction =
|
||||
| {
|
||||
type: 'setProfileStepResults'
|
||||
isCreatedAvatar: boolean
|
||||
image?: OnboardingState['profileStepResults']['image']
|
||||
imageUri: string
|
||||
image: OnboardingState['profileStepResults']['image'] | undefined
|
||||
imageUri: string | undefined
|
||||
imageMime: string
|
||||
creatorState?: {
|
||||
emoji: Emoji
|
||||
backgroundColor: AvatarColor
|
||||
}
|
||||
creatorState:
|
||||
| {
|
||||
emoji: Emoji
|
||||
backgroundColor: AvatarColor
|
||||
}
|
||||
| undefined
|
||||
}
|
||||
|
||||
export type ApiResponseMap = {
|
||||
|
||||
Reference in New Issue
Block a user