Async load Yoga after all

diegomura · Jun 28, 2024 · b1e2d6c · b1e2d6c
1 parent 77b12f3
commit b1e2d6c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/packages/layout/src/steps/resolveYoga.js b/packages/layout/src/steps/resolveYoga.js
@@ -1,7 +1,7 @@
 import { loadYoga } from '../yoga/index';
 
-const resolveYoga = (root) => {
-  const yoga = loadYoga();
+const resolveYoga = async (root) => {
+  const yoga = await loadYoga();
 
   return Object.assign({}, root, { yoga });
 };

diff --git a/packages/layout/src/yoga/index.js b/packages/layout/src/yoga/index.js
@@ -1,13 +1,14 @@
 /* eslint-disable import/prefer-default-export */
 
-import Yoga from 'yoga-layout';
+import { loadYoga as importedLoadYoga } from 'yoga-layout/load';
 
-export const loadYoga = () => {
-  const config = Yoga.Config.create();
+export const loadYoga = async () => {
+  const instance = await importedLoadYoga();
+  const config = instance.Config.create();
 
   config.setPointScaleFactor(0);
 
-  const node = { create: () => Yoga.Node.createWithConfig(config) };
+  const node = { create: () => instance.Node.createWithConfig(config) };
 
   return { node };
 };
diff --git a/packages/layout/tests/steps/resolvePagination.test.js b/packages/layout/tests/steps/resolvePagination.test.js
@@ -10,7 +10,7 @@ const calcLayout = (node) => resolvePagination(resolveDimensions(node));
 
 describe('pagination step', () => {
   test('should stretch absolute block to full page size', async () => {
-    const yoga = loadYoga();
+    const yoga = await loadYoga();
 
     const root = {
       type: 'DOCUMENT',
@@ -63,7 +63,7 @@ describe('pagination step', () => {
   });
 
   test('should force new height for split nodes', async () => {
-    const yoga = loadYoga();
+    const yoga = await loadYoga();
 
     const root = {
       type: 'DOCUMENT',
@@ -113,7 +113,7 @@ describe('pagination step', () => {
   });
 
   test('should force new height for split nodes with fixed height', async () => {
-    const yoga = loadYoga();
+    const yoga = await loadYoga();
 
     const root = {
       type: 'DOCUMENT',
@@ -152,7 +152,7 @@ describe('pagination step', () => {
   });
 
   test('should not wrap page with false wrap prop', async () => {
-    const yoga = loadYoga();
+    const yoga = await loadYoga();
 
     const root = {
       type: 'DOCUMENT',
@@ -187,7 +187,7 @@ describe('pagination step', () => {
   });
 
   test('should break on a container whose children can not fit on a page', async () => {
-    const yoga = loadYoga();
+    const yoga = await loadYoga();
 
     const root = {
       type: 'DOCUMENT',