expo-gl 15.1.2 → 15.1.4

package/CHANGELOG.md

@@ -10,6 +10,14 @@
 
 ### 💡 Others
 
+## 15.1.4 — 2025-04-25
+
+_This version does not introduce any user-facing changes._
+
+## 15.1.3 — 2025-04-21
+
+_This version does not introduce any user-facing changes._
+
 ## 15.1.2 — 2025-04-14
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -9,7 +9,7 @@ def reactNativeArchitectures() {
 }
 
 group = 'host.exp.exponent'
-version = '15.1.2'
+version = '15.1.4'
 
 android {
   if (rootProject.hasProperty("ndkPath")) {
@@ -22,7 +22,7 @@ android {
   namespace "expo.modules.gl"
   defaultConfig {
     versionCode 31
-    versionName "15.1.2"
+    versionName "15.1.4"
 
     externalNativeBuild {
       cmake {

package/build/Canvas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Canvas.d.ts","sourceRoot":"","sources":["../src/Canvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAmD,SAAS,EAAE,MAAM,cAAc,CAAC;AA2B1F,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAC1C,SAAS,GAAG;IACV,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;CACzC,CAwEF,CAAC;AAQF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"Canvas.d.ts","sourceRoot":"","sources":["../src/Canvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAmD,SAAS,EAAE,MAAM,cAAc,CAAC;AAgD1F,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAC1C,SAAS,GAAG;IACV,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;CACzC,CAmEF,CAAC;AAQF,eAAe,aAAa,CAAC"}

package/build/Canvas.js

@@ -21,45 +21,48 @@ function setRef(refProp, ref) {
         refProp.current = ref;
     }
 }
+function getSize({ size, ref }) {
+    if (size) {
+        return size;
+    }
+    else if (!ref.current || typeof window === 'undefined') {
+        return { width: 0, height: 0 };
+    }
+    const element = getElement(ref.current);
+    const { offsetWidth: width = 0, offsetHeight: height = 0 } = element;
+    return { width, height };
+}
 const Canvas = React.forwardRef((props, ref) => createElement('canvas', { ...props, ref }));
 const CanvasWrapper = ({ pointerEvents, children, style, ...props }) => {
     const [size, setSize] = React.useState(null);
     const ref = React.useRef(null);
     const _canvasRef = React.useRef(null);
-    function updateCanvasSize() {
+    const updateCanvasSize = React.useCallback(() => {
         const canvas = _canvasRef.current;
         if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement) {
-            const size = getSize();
+            const currentSize = getSize({
+                size,
+                ref,
+            });
             const scale = PixelRatio.get();
-            canvas.style.width = `${size.width}px`;
-            canvas.style.height = `${size.height}px`;
-            canvas.width = size.width * scale;
-            canvas.height = size.height * scale;
+            canvas.style.width = `${currentSize.width}px`;
+            canvas.style.height = `${currentSize.height}px`;
+            canvas.width = currentSize.width * scale;
+            canvas.height = currentSize.height * scale;
         }
-    }
-    function getSize() {
-        if (size) {
-            return size;
-        }
-        else if (!ref.current || typeof window === 'undefined') {
-            return { width: 0, height: 0 };
-        }
-        const element = getElement(ref.current);
-        const { offsetWidth: width = 0, offsetHeight: height = 0 } = element;
-        return { width, height };
-    }
-    const onLayout = (event) => {
+    }, [size?.width, size?.height]);
+    const onLayout = React.useCallback((event) => {
         const { nativeEvent: { layout: { width, height }, }, } = event;
-        if (width !== size?.width || height !== size.height) {
+        if (width !== size?.width || height !== size?.height) {
             setSize({ width, height });
             if (props.onLayout) {
                 props.onLayout(event);
             }
         }
-    };
+    }, [size?.width, size?.height, props.onLayout]);
     React.useEffect(() => {
         if (ref.current != null) {
-            setSize(getSize());
+            setSize(getSize({ size, ref }));
         }
     }, [ref]);
     React.useEffect(() => {

package/build/Canvas.js.map

@@ -1 +1 @@
-{"version":3,"file":"Canvas.js","sourceRoot":"","sources":["../src/Canvas.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport { findDOMNode } from 'react-dom';\nimport { LayoutChangeEvent, PixelRatio, StyleSheet, View, ViewProps } from 'react-native';\nimport createElement from 'react-native-web/dist/exports/createElement';\n\nfunction getElement(component: React.ReactInstance): React.ReactInstance | Element | null | Text {\n  try {\n    return findDOMNode(component);\n  } catch {\n    return component;\n  }\n}\n\nfunction setRef<T>(refProp: React.Ref<T>, ref: T | null) {\n  if (!refProp) return;\n\n  if (typeof refProp === 'function') {\n    refProp(ref);\n  } else if ('current' in refProp) {\n    // @ts-ignore\n    refProp.current = ref;\n  }\n}\n\nconst Canvas = React.forwardRef(\n  (props: React.ComponentProps<typeof View>, ref: React.Ref<HTMLCanvasElement>) =>\n    createElement('canvas', { ...props, ref })\n);\n\nconst CanvasWrapper: React.FunctionComponent<\n  ViewProps & {\n    canvasRef: React.Ref<HTMLCanvasElement>;\n  }\n> = ({ pointerEvents, children, style, ...props }) => {\n  const [size, setSize] = React.useState<{ width: number; height: number } | null>(null);\n\n  const ref = React.useRef<View>(null);\n  const _canvasRef = React.useRef<HTMLCanvasElement>(null);\n\n  function updateCanvasSize(): void {\n    const canvas = _canvasRef.current;\n    if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement) {\n      const size = getSize();\n      const scale = PixelRatio.get();\n\n      canvas.style.width = `${size.width}px`;\n      canvas.style.height = `${size.height}px`;\n\n      canvas.width = size.width * scale;\n      canvas.height = size.height * scale;\n    }\n  }\n\n  function getSize(): { width: number; height: number } {\n    if (size) {\n      return size;\n    } else if (!ref.current || typeof window === 'undefined') {\n      return { width: 0, height: 0 };\n    }\n    const element = getElement(ref.current);\n    const { offsetWidth: width = 0, offsetHeight: height = 0 } = element as HTMLElement;\n    return { width, height };\n  }\n\n  const onLayout = (event: LayoutChangeEvent) => {\n    const {\n      nativeEvent: {\n        layout: { width, height },\n      },\n    } = event;\n\n    if (width !== size?.width || height !== size.height) {\n      setSize({ width, height });\n\n      if (props.onLayout) {\n        props.onLayout(event);\n      }\n    }\n  };\n\n  React.useEffect(() => {\n    if (ref.current != null) {\n      setSize(getSize());\n    }\n  }, [ref]);\n\n  React.useEffect(() => {\n    updateCanvasSize();\n  }, [size]);\n\n  React.useEffect(() => {\n    const canvas = _canvasRef.current;\n    if (canvas) {\n      updateCanvasSize();\n    }\n    setRef(props.canvasRef, canvas);\n  }, [_canvasRef]);\n\n  return (\n    <View {...props} style={[styles.wrapper, style]} ref={ref} onLayout={onLayout}>\n      <Canvas ref={_canvasRef} pointerEvents={pointerEvents} style={StyleSheet.absoluteFill} />\n      {children}\n    </View>\n  );\n};\n\nconst styles = StyleSheet.create({\n  wrapper: {\n    pointerEvents: 'box-none',\n  },\n});\n\nexport default CanvasWrapper;\n"]}
+{"version":3,"file":"Canvas.js","sourceRoot":"","sources":["../src/Canvas.tsx"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport { findDOMNode } from 'react-dom';\nimport { LayoutChangeEvent, PixelRatio, StyleSheet, View, ViewProps } from 'react-native';\nimport createElement from 'react-native-web/dist/exports/createElement';\n\ninterface Size {\n  width: number;\n  height: number;\n}\n\ninterface GetSizeParams {\n  size: Size | null;\n  ref: React.RefObject<View | null>;\n}\n\nfunction getElement(component: React.ReactInstance): React.ReactInstance | Element | null | Text {\n  try {\n    return findDOMNode(component);\n  } catch {\n    return component;\n  }\n}\n\nfunction setRef<T>(refProp: React.Ref<T>, ref: T | null) {\n  if (!refProp) return;\n\n  if (typeof refProp === 'function') {\n    refProp(ref);\n  } else if ('current' in refProp) {\n    // @ts-ignore\n    refProp.current = ref;\n  }\n}\n\nfunction getSize({ size, ref }: GetSizeParams): Size {\n  if (size) {\n    return size;\n  } else if (!ref.current || typeof window === 'undefined') {\n    return { width: 0, height: 0 };\n  }\n  const element = getElement(ref.current);\n  const { offsetWidth: width = 0, offsetHeight: height = 0 } = element as HTMLElement;\n  return { width, height };\n}\n\nconst Canvas = React.forwardRef(\n  (props: React.ComponentProps<typeof View>, ref: React.Ref<HTMLCanvasElement>) =>\n    createElement('canvas', { ...props, ref })\n);\n\nconst CanvasWrapper: React.FunctionComponent<\n  ViewProps & {\n    canvasRef: React.Ref<HTMLCanvasElement>;\n  }\n> = ({ pointerEvents, children, style, ...props }) => {\n  const [size, setSize] = React.useState<Size | null>(null);\n\n  const ref = React.useRef<View>(null);\n  const _canvasRef = React.useRef<HTMLCanvasElement>(null);\n\n  const updateCanvasSize = React.useCallback(() => {\n    const canvas = _canvasRef.current;\n    if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement) {\n      const currentSize = getSize({\n        size,\n        ref,\n      });\n      const scale = PixelRatio.get();\n\n      canvas.style.width = `${currentSize.width}px`;\n      canvas.style.height = `${currentSize.height}px`;\n\n      canvas.width = currentSize.width * scale;\n      canvas.height = currentSize.height * scale;\n    }\n  }, [size?.width, size?.height]);\n\n  const onLayout = React.useCallback(\n    (event: LayoutChangeEvent) => {\n      const {\n        nativeEvent: {\n          layout: { width, height },\n        },\n      } = event;\n\n      if (width !== size?.width || height !== size?.height) {\n        setSize({ width, height });\n\n        if (props.onLayout) {\n          props.onLayout(event);\n        }\n      }\n    },\n    [size?.width, size?.height, props.onLayout]\n  );\n\n  React.useEffect(() => {\n    if (ref.current != null) {\n      setSize(getSize({ size, ref }));\n    }\n  }, [ref]);\n\n  React.useEffect(() => {\n    updateCanvasSize();\n  }, [size]);\n\n  React.useEffect(() => {\n    const canvas = _canvasRef.current;\n    if (canvas) {\n      updateCanvasSize();\n    }\n    setRef(props.canvasRef, canvas);\n  }, [_canvasRef]);\n\n  return (\n    <View {...props} style={[styles.wrapper, style]} ref={ref} onLayout={onLayout}>\n      <Canvas ref={_canvasRef} pointerEvents={pointerEvents} style={StyleSheet.absoluteFill} />\n      {children}\n    </View>\n  );\n};\n\nconst styles = StyleSheet.create({\n  wrapper: {\n    pointerEvents: 'box-none',\n  },\n});\n\nexport default CanvasWrapper;\n"]}

package/expo-module.config.json

@@ -9,7 +9,7 @@
     "publication": {
       "groupId": "host.exp.exponent",
       "artifactId": "expo.modules.gl",
-      "version": "15.1.2",
+      "version": "15.1.4",
       "repository": "local-maven-repo"
     }
   }

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.aar.md5

@@ -0,0 +1 @@
+6af6372bf2b5d9ea9227fbd0a61f63fb

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.aar.sha1

@@ -0,0 +1 @@
+5a6984fd505eea39466cc712b96ba496dd0d971f

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.aar.sha256

@@ -0,0 +1 @@
+ee7a402caaed9e705e0b231695992e58cc1b9a13c205745fc9754732542ac4d1

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.aar.sha512

@@ -0,0 +1 @@
+18e2f80fbf4225810cb66b18dd1e462c9a23c5f510018bd9a760c660a0c0d8b24a972971682a078b2a18a7caebb070239547dd2126e44ba2ff65d15bf55f5886

package/local-maven-repo/host/exp/exponent/expo.modules.gl/{15.1.2/expo.modules.gl-15.1.2.module → 15.1.4/expo.modules.gl-15.1.4.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.gl",
-    "version": "15.1.2",
+    "version": "15.1.4",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.gl-15.1.2.aar",
-          "url": "expo.modules.gl-15.1.2.aar",
-          "size": 1044041,
-          "sha512": "f91f6be8c66741bf857a39bfbbe858f34193ba0eb1cf2f00e0b48734bb5b2d7c43d2bfb5a6cffac2b01c28d3c958dbd6549334ff11e122dd9ed80bb5b75a7194",
-          "sha256": "6d8b8667da77b17356443b62170d2e4be9ecc56ab3d134456bb93334d0ea6584",
-          "sha1": "38f6d9e29f69a67ff7f07c60b7579c8215210c96",
-          "md5": "abbfb2cd09e7dc57d480c0d623e7fe90"
+          "name": "expo.modules.gl-15.1.4.aar",
+          "url": "expo.modules.gl-15.1.4.aar",
+          "size": 1044169,
+          "sha512": "18e2f80fbf4225810cb66b18dd1e462c9a23c5f510018bd9a760c660a0c0d8b24a972971682a078b2a18a7caebb070239547dd2126e44ba2ff65d15bf55f5886",
+          "sha256": "ee7a402caaed9e705e0b231695992e58cc1b9a13c205745fc9754732542ac4d1",
+          "sha1": "5a6984fd505eea39466cc712b96ba496dd0d971f",
+          "md5": "6af6372bf2b5d9ea9227fbd0a61f63fb"
         }
       ]
     },
@@ -53,13 +53,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.gl-15.1.2.aar",
-          "url": "expo.modules.gl-15.1.2.aar",
-          "size": 1044041,
-          "sha512": "f91f6be8c66741bf857a39bfbbe858f34193ba0eb1cf2f00e0b48734bb5b2d7c43d2bfb5a6cffac2b01c28d3c958dbd6549334ff11e122dd9ed80bb5b75a7194",
-          "sha256": "6d8b8667da77b17356443b62170d2e4be9ecc56ab3d134456bb93334d0ea6584",
-          "sha1": "38f6d9e29f69a67ff7f07c60b7579c8215210c96",
-          "md5": "abbfb2cd09e7dc57d480c0d623e7fe90"
+          "name": "expo.modules.gl-15.1.4.aar",
+          "url": "expo.modules.gl-15.1.4.aar",
+          "size": 1044169,
+          "sha512": "18e2f80fbf4225810cb66b18dd1e462c9a23c5f510018bd9a760c660a0c0d8b24a972971682a078b2a18a7caebb070239547dd2126e44ba2ff65d15bf55f5886",
+          "sha256": "ee7a402caaed9e705e0b231695992e58cc1b9a13c205745fc9754732542ac4d1",
+          "sha1": "5a6984fd505eea39466cc712b96ba496dd0d971f",
+          "md5": "6af6372bf2b5d9ea9227fbd0a61f63fb"
         }
       ]
     },
@@ -73,8 +73,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.gl-15.1.2-sources.jar",
-          "url": "expo.modules.gl-15.1.2-sources.jar",
+          "name": "expo.modules.gl-15.1.4-sources.jar",
+          "url": "expo.modules.gl-15.1.4-sources.jar",
           "size": 12381,
           "sha512": "1cab724074b050f7459a884ac9e98fbf2d009d8239810ca6384c5113f52dd33e5ac40a72ec7174b297e1b10521e56682d73f533715316be5be66ce0e482356d8",
           "sha256": "e8892c6837d1eb5093b2c3b063883d7511799b0e246940c5b70f1515cb4451cd",

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.module.md5

@@ -0,0 +1 @@
+0df8376a3ca879fbb44caf3a24737bf0

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.module.sha1

@@ -0,0 +1 @@
+cb91905b40d81fe170b4c6a307b3653a3744c060

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.module.sha256

@@ -0,0 +1 @@
+4052465f1b77c1815176d8444245c3d7a9bec3e5cdf3c2d255a9b4a231b8109f

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.module.sha512

@@ -0,0 +1 @@
+ba807448b0a25de618d328f06fc2ef66999a744d601e88a3bef6cc5cf7a71da64bc6f57903864d17be2a0f20a153c282ceb2589470b14a71745e2bed582bd302

package/local-maven-repo/host/exp/exponent/expo.modules.gl/{15.1.2/expo.modules.gl-15.1.2.pom → 15.1.4/expo.modules.gl-15.1.4.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.gl</artifactId>
-  <version>15.1.2</version>
+  <version>15.1.4</version>
   <packaging>aar</packaging>
   <name>expo.modules.gl</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.pom.md5

@@ -0,0 +1 @@
+89fcdbe99b326e1f11dee8b080e39662

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.pom.sha1

@@ -0,0 +1 @@
+2eb1d810df17c75455e815a5697d3aa894c91223

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.pom.sha256

@@ -0,0 +1 @@
+7f7435bc616d373f289af72a5e2f74b57b25bdffb034a7a65bb872218cc8045c

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.4/expo.modules.gl-15.1.4.pom.sha512

@@ -0,0 +1 @@
+8fd3e52b583b6da27115bd59a43c5fe9281afb2f328887630f44e1c5667c7c9ba788482b220622f7447fd431f2ef2edf48cf931f9f1b92d376f6d02e2a823fc3

package/local-maven-repo/host/exp/exponent/expo.modules.gl/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.gl</artifactId>
   <versioning>
-    <latest>15.1.2</latest>
-    <release>15.1.2</release>
+    <latest>15.1.4</latest>
+    <release>15.1.4</release>
     <versions>
-      <version>15.1.2</version>
+      <version>15.1.4</version>
     </versions>
-    <lastUpdated>20250414185044</lastUpdated>
+    <lastUpdated>20250425210750</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/host/exp/exponent/expo.modules.gl/maven-metadata.xml.md5

@@ -1 +1 @@
-915e35c32f05250645ac356c9c25d545
+1b9210c163a2241ff4f6baed9d33fee0

package/local-maven-repo/host/exp/exponent/expo.modules.gl/maven-metadata.xml.sha1

@@ -1 +1 @@
-909a90de70679aa7d0da2f22afffd6d0b2472edd
+53e34d49bfd57b6dc493121fff0d2daff7e629e3

package/local-maven-repo/host/exp/exponent/expo.modules.gl/maven-metadata.xml.sha256

@@ -1 +1 @@
-6b5e44c824beb53706e6354105311300f18e281e9bec2a6b13f31db847a29483
+c77e14c1ea8ce2ad9f38c50619f75f5254ee0cfe18a5720a5e972a18a06caeb2

package/local-maven-repo/host/exp/exponent/expo.modules.gl/maven-metadata.xml.sha512

@@ -1 +1 @@
-7441a91c16e30f187b51e8b8fef5262ade0908622ec49ea68631dabfae0324184e7627ca38651a38c8a5535128630f4d7c8ffee6ca2fce0bfbb99c802694d254
+215f41d473752c30f56692a1c45ce1945467cfdb586e982482e39a783aee611b36a5dc0ba3a2a384026f4eedf1ce587cee0033f507d612fc0fbb5cd45b4d3f9f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gl",
-  "version": "15.1.2",
+  "version": "15.1.4",
   "description": "Provides GLView that acts as OpenGL ES render target and gives GL context object implementing WebGL 2.0 specification.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -43,7 +43,7 @@
     "@types/invariant": "^2.2.33",
     "@types/offscreencanvas": "2019.6.4",
     "@types/webgl2": "^0.0.6",
-    "expo-module-scripts": "^4.1.2",
+    "expo-module-scripts": "^4.1.5",
     "react-test-renderer": "19.0.0"
   },
   "peerDependencies": {
@@ -57,5 +57,5 @@
       "optional": true
     }
   },
-  "gitHead": "cb9fdd93f76f28e2ace4f66080b2386d87239553"
+  "gitHead": "3cd208465df78e385ca9380531bbbfe33ca68e81"
 }

package/src/Canvas.tsx

@@ -3,6 +3,16 @@ import { findDOMNode } from 'react-dom';
 import { LayoutChangeEvent, PixelRatio, StyleSheet, View, ViewProps } from 'react-native';
 import createElement from 'react-native-web/dist/exports/createElement';
 
+interface Size {
+  width: number;
+  height: number;
+}
+
+interface GetSizeParams {
+  size: Size | null;
+  ref: React.RefObject<View | null>;
+}
+
 function getElement(component: React.ReactInstance): React.ReactInstance | Element | null | Text {
   try {
     return findDOMNode(component);
@@ -22,6 +32,17 @@ function setRef<T>(refProp: React.Ref<T>, ref: T | null) {
   }
 }
 
+function getSize({ size, ref }: GetSizeParams): Size {
+  if (size) {
+    return size;
+  } else if (!ref.current || typeof window === 'undefined') {
+    return { width: 0, height: 0 };
+  }
+  const element = getElement(ref.current);
+  const { offsetWidth: width = 0, offsetHeight: height = 0 } = element as HTMLElement;
+  return { width, height };
+}
+
 const Canvas = React.forwardRef(
   (props: React.ComponentProps<typeof View>, ref: React.Ref<HTMLCanvasElement>) =>
     createElement('canvas', { ...props, ref })
@@ -32,55 +53,50 @@ const CanvasWrapper: React.FunctionComponent<
     canvasRef: React.Ref<HTMLCanvasElement>;
   }
 > = ({ pointerEvents, children, style, ...props }) => {
-  const [size, setSize] = React.useState<{ width: number; height: number } | null>(null);
+  const [size, setSize] = React.useState<Size | null>(null);
 
   const ref = React.useRef<View>(null);
   const _canvasRef = React.useRef<HTMLCanvasElement>(null);
 
-  function updateCanvasSize(): void {
+  const updateCanvasSize = React.useCallback(() => {
     const canvas = _canvasRef.current;
     if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement) {
-      const size = getSize();
+      const currentSize = getSize({
+        size,
+        ref,
+      });
       const scale = PixelRatio.get();
 
-      canvas.style.width = `${size.width}px`;
-      canvas.style.height = `${size.height}px`;
-
-      canvas.width = size.width * scale;
-      canvas.height = size.height * scale;
-    }
-  }
+      canvas.style.width = `${currentSize.width}px`;
+      canvas.style.height = `${currentSize.height}px`;
 
-  function getSize(): { width: number; height: number } {
-    if (size) {
-      return size;
-    } else if (!ref.current || typeof window === 'undefined') {
-      return { width: 0, height: 0 };
+      canvas.width = currentSize.width * scale;
+      canvas.height = currentSize.height * scale;
     }
-    const element = getElement(ref.current);
-    const { offsetWidth: width = 0, offsetHeight: height = 0 } = element as HTMLElement;
-    return { width, height };
-  }
-
-  const onLayout = (event: LayoutChangeEvent) => {
-    const {
-      nativeEvent: {
-        layout: { width, height },
-      },
-    } = event;
-
-    if (width !== size?.width || height !== size.height) {
-      setSize({ width, height });
-
-      if (props.onLayout) {
-        props.onLayout(event);
+  }, [size?.width, size?.height]);
+
+  const onLayout = React.useCallback(
+    (event: LayoutChangeEvent) => {
+      const {
+        nativeEvent: {
+          layout: { width, height },
+        },
+      } = event;
+
+      if (width !== size?.width || height !== size?.height) {
+        setSize({ width, height });
+
+        if (props.onLayout) {
+          props.onLayout(event);
+        }
       }
-    }
-  };
+    },
+    [size?.width, size?.height, props.onLayout]
+  );
 
   React.useEffect(() => {
     if (ref.current != null) {
-      setSize(getSize());
+      setSize(getSize({ size, ref }));
     }
   }, [ref]);
 

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.aar.md5

@@ -1 +0,0 @@
-abbfb2cd09e7dc57d480c0d623e7fe90

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.aar.sha1

@@ -1 +0,0 @@
-38f6d9e29f69a67ff7f07c60b7579c8215210c96

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.aar.sha256

@@ -1 +0,0 @@
-6d8b8667da77b17356443b62170d2e4be9ecc56ab3d134456bb93334d0ea6584

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.aar.sha512

@@ -1 +0,0 @@
-f91f6be8c66741bf857a39bfbbe858f34193ba0eb1cf2f00e0b48734bb5b2d7c43d2bfb5a6cffac2b01c28d3c958dbd6549334ff11e122dd9ed80bb5b75a7194

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.module.md5

@@ -1 +0,0 @@
-29e561f8ebb945a330ee02c0a75c2737

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.module.sha1

@@ -1 +0,0 @@
-444fa02a8e892d377e3d4bcd9b0692974fc7804d

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.module.sha256

@@ -1 +0,0 @@
-c446f7e365c70ba89cce0e41dc7a9fd23fdcbf2ac36c5d1abe787c4d80b21009

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.module.sha512

@@ -1 +0,0 @@
-e53ac2d909f8d988faff892e026efc28617a2a3c8b9793c96cc81ca123bfee09abfd35e2a98ef88bd20de7d6c1fe534bba75bbeeb4122d98ee28686ea2c5ae67

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.pom.md5

@@ -1 +0,0 @@
-03d7e62564cefcfe24b0aed8cbf9718f

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.pom.sha1

@@ -1 +0,0 @@
-8baf6165b52b9bfceec96d084732e5f7833e45b2

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.pom.sha256

@@ -1 +0,0 @@
-7693fbe2a0ade6abefe8c4fd3e5fa5ad7011cf3fc24f5d1bae987f5affaf5087

package/local-maven-repo/host/exp/exponent/expo.modules.gl/15.1.2/expo.modules.gl-15.1.2.pom.sha512

@@ -1 +0,0 @@
-0eae926ad3cdc9e01377942b26957dab2c772c032bf4f027877606ac9e8cfb78bb18a036ecb3861e6b6385f59284c041a7f0b840e7d5216f8f0edb59bdb80ced