react-native-yoga-jsi 0.1.2 → 0.2.1

package/src/derived/utils.ts

@@ -14,60 +14,61 @@ export function createLayout<T extends string>(styles: NodeTree<T>) {
   return styles;
 }
 
-class Layout<T extends string> {
-  layout: Record<T, Node>;
-  rootKey: T;
-
-  constructor(rootKey: T) {
-    const config = Yoga.Config.create();
-    config.setPointScaleFactor(0);
-    const root = Yoga.Node.create(config);
-    this.rootKey = rootKey;
-    this.layout = {
-      [rootKey]: root,
-    } as Record<T, Node>;
-  }
-
-  addNodeTo(parentKey: T, key: T, index: number) {
-    const parent = this.layout[parentKey];
-    const child = Yoga.Node.create();
-    parent.insertChild(child, index);
-    this.layout[key] = child;
-    return child;
-  }
-
-  getNode(key: T) {
-    return this.layout[key];
-  }
-
-  free() {
-    this.getNode(this.rootKey).freeRecursive();
-  }
+type TreeItem<T extends string> = NodeTree<T> | NodeTree<T>[];
 
-  forEach(cb: (node: Node, key: T) => void) {
-    for (const key in this.layout) {
-      cb(this.layout[key], key);
-    }
-  }
+function Layout<T extends string>(rootKey: T){
+  'worklet';
+  const config = Yoga.Config.create();
+  config.setPointScaleFactor(0);
+  const root = Yoga.Node.create(config);
+  const layout = {
+    [rootKey]: root,
+  } as Record<T, Node>;
+  return {
+    layout,
+    rootKey,
+    getNode: (key: T) => {
+      'worklet';
+      return layout[key];
+    },
+    addNodeTo: (parentKey: T, key: T, index: number) => {
+      'worklet';
+      const parent = layout[parentKey];
+      const child = Yoga.Node.create();
+      parent.insertChild(child, index);
+      layout[key] = child;
+      return child;
+    },
+    free: () => {
+      'worklet';
+      root.freeRecursive();
+    },
+    forEach: (cb: (node: Node, key: T) => void) => {
+      'worklet';
+      for (const key in layout) {
+        cb(layout[key], key);
+      }
+    },
+  };
 }
 
-type TreeItem<T extends string> = NodeTree<T> | NodeTree<T>[];
-
 export function generateStyledLayout<T extends string>(layout: NodeTree<T>) {
-  const layoutTree = new Layout(layout.key);
+  'worklet';
+  const layoutTree = Layout(layout.key);
   applyStyle(layoutTree.layout[layout.key], layout.style);
-  (function _parse(
-    treeItem: TreeItem<T>,
+  function _parse<U extends T>(
+    treeItem: TreeItem<U>,
     index: number,
     isArray: boolean,
-    parentKey: T | null,
+    parentKey: U | null
   ) {
+    'worklet';
     if (isArray) {
-      (treeItem as NodeTree<T>[]).forEach((o, i) => {
+      (treeItem as NodeTree<U>[]).forEach((o, i) => {
         _parse(o, i, false, parentKey);
       });
     } else {
-      treeItem = treeItem as NodeTree<T>;
+      treeItem = treeItem as NodeTree<U>;
       if (parentKey !== null) {
         const addedNode = layoutTree.addNodeTo(parentKey, treeItem.key, index);
         applyStyle(addedNode, treeItem.style);
@@ -76,9 +77,11 @@ export function generateStyledLayout<T extends string>(layout: NodeTree<T>) {
         _parse(treeItem.children, 0, true, treeItem.key);
       }
     }
-
+  
     return layoutTree;
-  })(layout, 0, false, null);
+  }
+  
+  _parse(layout, 0, false, null);
 
   return layoutTree;
 }

package/src/index.ts

@@ -1,18 +1,16 @@
 import { NativeModules } from 'react-native';
-import type { Yoga } from './coreTypes';
-// import * as derived from './derived';
-// import * as coreTypes from './coreTypes';
+import type { Yoga as YogaType } from './coreTypes';
 
 (function () {
   NativeModules.YogaJSI.install();
 })();
 
-//@ts-expect-error gotta fix it later
-const YogaModule: {
-  Yoga: Yoga;
-} = global;
+declare global {  
+  const Yoga: YogaType;
+}
 
-export default YogaModule.Yoga;
+
+export default Yoga;
 export * from './derived';
 export * from './coreTypes';