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,18 +1,23 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {View} from 'react-native'
|
import {View} from 'react-native'
|
||||||
import QRCode from 'react-native-qrcode-styled'
|
import QRCode from 'react-native-qrcode-styled'
|
||||||
import ViewShot from 'react-native-view-shot'
|
import type ViewShot from 'react-native-view-shot'
|
||||||
import {AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
|
import {AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
|
||||||
import {Trans} from '@lingui/macro'
|
import {Trans} from '@lingui/macro'
|
||||||
|
|
||||||
import {isWeb} from 'platform/detection'
|
import {isWeb} from '#/platform/detection'
|
||||||
import {Logo} from 'view/icons/Logo'
|
import {Logo} from '#/view/icons/Logo'
|
||||||
import {Logotype} from 'view/icons/Logotype'
|
import {Logotype} from '#/view/icons/Logotype'
|
||||||
import {useTheme} from '#/alf'
|
import {useTheme} from '#/alf'
|
||||||
import {atoms as a} from '#/alf'
|
import {atoms as a} from '#/alf'
|
||||||
import {LinearGradientBackground} from '#/components/LinearGradientBackground'
|
import {LinearGradientBackground} from '#/components/LinearGradientBackground'
|
||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
|
|
||||||
|
const LazyViewShot = React.lazy(
|
||||||
|
// @ts-expect-error dynamic import
|
||||||
|
() => import('react-native-view-shot/src/index'),
|
||||||
|
)
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
starterPack: AppBskyGraphDefs.StarterPackView
|
starterPack: AppBskyGraphDefs.StarterPackView
|
||||||
link: string
|
link: string
|
||||||
@@ -29,7 +34,7 @@ export const QrCode = React.forwardRef<ViewShot, Props>(function QrCode(
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ViewShot ref={ref}>
|
<LazyViewShot ref={ref}>
|
||||||
<LinearGradientBackground
|
<LinearGradientBackground
|
||||||
style={[
|
style={[
|
||||||
{width: 300, minHeight: 390},
|
{width: 300, minHeight: 390},
|
||||||
@@ -79,7 +84,7 @@ export const QrCode = React.forwardRef<ViewShot, Props>(function QrCode(
|
|||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</LinearGradientBackground>
|
</LinearGradientBackground>
|
||||||
</ViewShot>
|
</LazyViewShot>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {View} from 'react-native'
|
import {View} from 'react-native'
|
||||||
import ViewShot from 'react-native-view-shot'
|
import type ViewShot from 'react-native-view-shot'
|
||||||
import {requestMediaLibraryPermissionsAsync} from 'expo-image-picker'
|
import {requestMediaLibraryPermissionsAsync} from 'expo-image-picker'
|
||||||
import {createAssetAsync} from 'expo-media-library'
|
import {createAssetAsync} from 'expo-media-library'
|
||||||
import * as Sharing from 'expo-sharing'
|
import * as Sharing from 'expo-sharing'
|
||||||
@@ -8,9 +8,9 @@ import {AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
|
|||||||
import {msg, Trans} from '@lingui/macro'
|
import {msg, Trans} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
|
|
||||||
|
import {logEvent} from '#/lib/statsig/statsig'
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {logEvent} from 'lib/statsig/statsig'
|
import {isNative, isWeb} from '#/platform/detection'
|
||||||
import {isNative, isWeb} from 'platform/detection'
|
|
||||||
import * as Toast from '#/view/com/util/Toast'
|
import * as Toast from '#/view/com/util/Toast'
|
||||||
import {atoms as a} from '#/alf'
|
import {atoms as a} from '#/alf'
|
||||||
import {Button, ButtonText} from '#/components/Button'
|
import {Button, ButtonText} from '#/components/Button'
|
||||||
@@ -153,46 +153,54 @@ export function QrCodeDialog({
|
|||||||
<Dialog.ScrollableInner
|
<Dialog.ScrollableInner
|
||||||
label={_(msg`Create a QR code for a starter pack`)}>
|
label={_(msg`Create a QR code for a starter pack`)}>
|
||||||
<View style={[a.flex_1, a.align_center, a.gap_5xl]}>
|
<View style={[a.flex_1, a.align_center, a.gap_5xl]}>
|
||||||
{!link ? (
|
<React.Suspense fallback={<Loading />}>
|
||||||
<View style={[a.align_center, a.p_xl]}>
|
{!link ? (
|
||||||
<Loader size="xl" />
|
<Loading />
|
||||||
</View>
|
) : (
|
||||||
) : (
|
<>
|
||||||
<>
|
<QrCode starterPack={starterPack} link={link} ref={ref} />
|
||||||
<QrCode starterPack={starterPack} link={link} ref={ref} />
|
{isProcessing ? (
|
||||||
{isProcessing ? (
|
<View>
|
||||||
<View>
|
<Loader size="xl" />
|
||||||
<Loader size="xl" />
|
</View>
|
||||||
</View>
|
) : (
|
||||||
) : (
|
<View
|
||||||
<View
|
style={[a.w_full, a.gap_md, isWeb && [a.flex_row_reverse]]}>
|
||||||
style={[a.w_full, a.gap_md, isWeb && [a.flex_row_reverse]]}>
|
<Button
|
||||||
<Button
|
label={_(msg`Copy QR code`)}
|
||||||
label={_(msg`Copy QR code`)}
|
variant="solid"
|
||||||
variant="solid"
|
color="secondary"
|
||||||
color="secondary"
|
size="small"
|
||||||
size="small"
|
onPress={isWeb ? onCopyPress : onSharePress}>
|
||||||
onPress={isWeb ? onCopyPress : onSharePress}>
|
<ButtonText>
|
||||||
<ButtonText>
|
{isWeb ? <Trans>Copy</Trans> : <Trans>Share</Trans>}
|
||||||
{isWeb ? <Trans>Copy</Trans> : <Trans>Share</Trans>}
|
</ButtonText>
|
||||||
</ButtonText>
|
</Button>
|
||||||
</Button>
|
<Button
|
||||||
<Button
|
label={_(msg`Save QR code`)}
|
||||||
label={_(msg`Save QR code`)}
|
variant="solid"
|
||||||
variant="solid"
|
color="secondary"
|
||||||
color="secondary"
|
size="small"
|
||||||
size="small"
|
onPress={onSavePress}>
|
||||||
onPress={onSavePress}>
|
<ButtonText>
|
||||||
<ButtonText>
|
<Trans>Save</Trans>
|
||||||
<Trans>Save</Trans>
|
</ButtonText>
|
||||||
</ButtonText>
|
</Button>
|
||||||
</Button>
|
</View>
|
||||||
</View>
|
)}
|
||||||
)}
|
</>
|
||||||
</>
|
)}
|
||||||
)}
|
</React.Suspense>
|
||||||
</View>
|
</View>
|
||||||
</Dialog.ScrollableInner>
|
</Dialog.ScrollableInner>
|
||||||
</Dialog.Outer>
|
</Dialog.Outer>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function Loading() {
|
||||||
|
return (
|
||||||
|
<View style={[a.align_center, a.p_xl]}>
|
||||||
|
<Loader size="xl" />
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,14 +1,19 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {View} from 'react-native'
|
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 {useAvatar} from '#/screens/Onboarding/StepProfile/index'
|
||||||
import {atoms as a} from '#/alf'
|
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
|
const SIZE_MULTIPLIER = 5
|
||||||
|
|
||||||
export interface PlaceholderCanvasRef {
|
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
|
// 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, {}>(
|
export const PlaceholderCanvas = React.forwardRef<PlaceholderCanvasRef, {}>(
|
||||||
function PlaceholderCanvas({}, ref) {
|
function PlaceholderCanvas({}, ref) {
|
||||||
const {avatar} = useAvatar()
|
const {avatar} = useAvatar()
|
||||||
const viewshotRef = React.useRef()
|
const viewshotRef = React.useRef<ViewShot>(null)
|
||||||
const Icon = avatar.placeholder.component
|
const Icon = avatar.placeholder.component
|
||||||
|
|
||||||
const styles = React.useMemo(
|
const styles = React.useMemo(
|
||||||
@@ -32,13 +37,16 @@ export const PlaceholderCanvas = React.forwardRef<PlaceholderCanvasRef, {}>(
|
|||||||
)
|
)
|
||||||
|
|
||||||
React.useImperativeHandle(ref, () => ({
|
React.useImperativeHandle(ref, () => ({
|
||||||
// @ts-ignore this library doesn't have types
|
capture: async () => {
|
||||||
capture: viewshotRef.current.capture,
|
if (viewshotRef.current?.capture) {
|
||||||
|
return await viewshotRef.current.capture()
|
||||||
|
}
|
||||||
|
},
|
||||||
}))
|
}))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<ViewShot
|
<LazyViewShot
|
||||||
// @ts-ignore this library doesn't have types
|
// @ts-ignore this library doesn't have types
|
||||||
ref={viewshotRef}
|
ref={viewshotRef}
|
||||||
options={{
|
options={{
|
||||||
@@ -60,7 +68,7 @@ export const PlaceholderCanvas = React.forwardRef<PlaceholderCanvasRef, {}>(
|
|||||||
style={{color: 'white'}}
|
style={{color: 'white'}}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
</ViewShot>
|
</LazyViewShot>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -10,13 +10,13 @@ import {msg, Trans} from '@lingui/macro'
|
|||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
|
|
||||||
import {useAnalytics} from '#/lib/analytics/analytics'
|
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 {logEvent, useGate} from '#/lib/statsig/statsig'
|
||||||
import {usePhotoLibraryPermission} from 'lib/hooks/usePermissions'
|
import {isNative, isWeb} from '#/platform/detection'
|
||||||
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 {
|
import {
|
||||||
DescriptionText,
|
DescriptionText,
|
||||||
OnboardingControls,
|
OnboardingControls,
|
||||||
@@ -132,6 +132,10 @@ export function StepProfile() {
|
|||||||
|
|
||||||
const onContinue = React.useCallback(async () => {
|
const onContinue = React.useCallback(async () => {
|
||||||
let imageUri = avatar?.image?.path
|
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) {
|
if (!imageUri || avatar.useCreatedAvatar) {
|
||||||
imageUri = await canvasRef.current?.capture()
|
imageUri = await canvasRef.current?.capture()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,13 +51,15 @@ export type OnboardingAction =
|
|||||||
| {
|
| {
|
||||||
type: 'setProfileStepResults'
|
type: 'setProfileStepResults'
|
||||||
isCreatedAvatar: boolean
|
isCreatedAvatar: boolean
|
||||||
image?: OnboardingState['profileStepResults']['image']
|
image: OnboardingState['profileStepResults']['image'] | undefined
|
||||||
imageUri: string
|
imageUri: string | undefined
|
||||||
imageMime: string
|
imageMime: string
|
||||||
creatorState?: {
|
creatorState:
|
||||||
emoji: Emoji
|
| {
|
||||||
backgroundColor: AvatarColor
|
emoji: Emoji
|
||||||
}
|
backgroundColor: AvatarColor
|
||||||
|
}
|
||||||
|
| undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
export type ApiResponseMap = {
|
export type ApiResponseMap = {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import * as EmailValidator from 'email-validator'
|
|||||||
import type tldts from 'tldts'
|
import type tldts from 'tldts'
|
||||||
|
|
||||||
import {logEvent} from '#/lib/statsig/statsig'
|
import {logEvent} from '#/lib/statsig/statsig'
|
||||||
|
import {isEmailMaybeInvalid} from '#/lib/strings/email'
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {isEmailMaybeInvalid} from 'lib/strings/email'
|
|
||||||
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
|
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
|
||||||
import {is13, is18, useSignupContext} from '#/screens/Signup/state'
|
import {is13, is18, useSignupContext} from '#/screens/Signup/state'
|
||||||
import {Policies} from '#/screens/Signup/StepInfo/Policies'
|
import {Policies} from '#/screens/Signup/StepInfo/Policies'
|
||||||
@@ -59,6 +59,9 @@ export function StepInfo({
|
|||||||
import('tldts/dist/index.cjs.min.js').then(tldts => {
|
import('tldts/dist/index.cjs.min.js').then(tldts => {
|
||||||
tldtsRef.current = tldts
|
tldtsRef.current = tldts
|
||||||
})
|
})
|
||||||
|
// This will get used in the avatar creator a few steps later, so lets preload it now
|
||||||
|
// @ts-expect-error - valid path
|
||||||
|
import('react-native-view-shot/src/index')
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const onNextPress = () => {
|
const onNextPress = () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user