Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(native): make expo modules optional #3355

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(native): make expo modules optional #3355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9de5145
fix(native): make expo modules optional
CodyJasonBennett Sep 13, 2024
6015419
chore: cleanup
CodyJasonBennett Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions packages/fiber/src/native/Canvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
StyleSheet,
PixelRatio,
} from 'react-native'
import { ExpoWebGLRenderingContext, GLView } from 'expo-gl'
import { useContextBridge, FiberProvider } from 'its-fine'
import { SetBlock, Block, ErrorBoundary, useMutableCallback } from '../core/utils'
import { extend, createRoot, unmountComponentAtNode, RenderProps, ReconcilerRoot } from '../core'
Expand All @@ -25,6 +24,13 @@ export interface CanvasProps extends Omit<RenderProps<HTMLCanvasElement>, 'size'

export interface Props extends CanvasProps {}

// Lazily load expo-gl, so it's only required when Canvas is used
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that works.

try {
var GLView = require('expo-gl').GLView
} catch (_) {
//
}

/**
* A native canvas which accepts threejs elements as children.
* @see https://docs.pmnd.rs/react-three-fiber/api/canvas
Expand Down Expand Up @@ -85,7 +91,7 @@ const CanvasImpl = /*#__PURE__*/ React.forwardRef<View, Props>(

// Called on context create or swap
// https://github.com/pmndrs/react-three-fiber/pull/2297
const onContextCreate = React.useCallback((context: ExpoWebGLRenderingContext) => {
const onContextCreate = React.useCallback((context: WebGL2RenderingContext) => {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

types of optional dependencies can still be used.

const listeners = new Map<string, EventListener[]>()

const canvas = {
Expand Down Expand Up @@ -198,10 +204,11 @@ const CanvasImpl = /*#__PURE__*/ React.forwardRef<View, Props>(
// Overwrite onCreated to apply RN bindings
onCreated: (state: RootState) => {
// Bind render to RN bridge
const context = state.gl.getContext() as ExpoWebGLRenderingContext
const context = state.gl.getContext()
const renderFrame = state.gl.render.bind(state.gl)
state.gl.render = (scene: THREE.Scene, camera: THREE.Camera) => {
renderFrame(scene, camera)
// @ts-ignore
context.endFrameEXP()
}

Expand Down Expand Up @@ -238,6 +245,8 @@ const CanvasImpl = /*#__PURE__*/ React.forwardRef<View, Props>(
* @see https://docs.pmnd.rs/react-three-fiber/api/canvas
*/
export const Canvas = React.forwardRef<View, Props>(function CanvasWrapper(props, ref) {
if (!GLView) throw new Error('expo-gl must be installed to use Canvas!')

return (
<FiberProvider>
<CanvasImpl {...props} ref={ref} />
Expand Down
10 changes: 8 additions & 2 deletions packages/fiber/src/native/polyfills.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import * as THREE from 'three'
import { Image, NativeModules, Platform } from 'react-native'
import { Asset } from 'expo-asset'
import * as fs from 'expo-file-system'
import { fromByteArray } from 'base64-js'
import { Buffer } from 'buffer'

// Polyfill asset loading if expo modules are available
try {
var Asset = require('expo-asset').Asset
var fs = require('expo-file-system')
} catch (_) {
//
}

// http://stackoverflow.com/questions/105034
function uuidv4() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
Expand Down
Loading