onejs-react 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onejs-react",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "React 19 renderer for OneJS (Unity UI Toolkit)",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -17,7 +17,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Singtaa/onejs-react"
+    "url": "git+https://github.com/Singtaa/onejs-react.git"
   },
   "author": "Singtaa",
   "scripts": {

package/src/host-config.ts

@@ -12,6 +12,13 @@ declare function clearTimeout(id: number): void;
 
 declare const console: { log: (...args: unknown[]) => void; error: (...args: unknown[]) => void };
 
+// Native delegate callback helpers (from QuickJSBootstrap __csHelpers)
+declare const __csHelpers: {
+    createDelegateCallback(fn: Function): number;
+    freeDelegateCallback(handle: number): void;
+    [key: string]: unknown;
+};
+
 // Priority constants from react-reconciler/constants
 // These match React's internal lane priorities
 const DiscreteEventPriority = 2;
@@ -149,6 +156,8 @@ export interface Instance {
     hasMixedContent?: boolean;
     // For vector drawing: track the current generateVisualContent callback
     visualContentCallback?: GenerateVisualContentCallback;
+    // Native callback handle for the above (used to free slot on replacement)
+    visualContentCallbackHandle?: number;
 }
 
 export type TextInstance = Instance; // For Label elements with text content
@@ -435,6 +444,15 @@ function untrackParent(child: CSObject) {
     }
 }
 
+// Free native callback handles tracked on an instance (prevents callback table leak)
+function cleanupCallbackHandles(instance: Instance) {
+    if (instance.visualContentCallbackHandle !== undefined) {
+        __csHelpers.freeDelegateCallback(instance.visualContentCallbackHandle);
+        instance.visualContentCallbackHandle = undefined;
+        instance.visualContentCallback = undefined;
+    }
+}
+
 // Apply event handlers
 function applyEvents(instance: Instance, props: BaseProps) {
     for (const [propName, eventType] of Object.entries(EVENT_PROPS)) {
@@ -468,17 +486,27 @@ function applyVisualContentCallback(instance: Instance, props: BaseProps) {
     if (callback !== existingCallback) {
         const element = instance.element as unknown as { generateVisualContent: GenerateVisualContentCallback | null };
 
-        // Remove old callback if exists
+        // Free old native callback handle to prevent callback table leak
         if (existingCallback) {
-            // Clear the delegate via C# interop
             element.generateVisualContent = null;
+            if (instance.visualContentCallbackHandle !== undefined) {
+                __csHelpers.freeDelegateCallback(instance.visualContentCallbackHandle);
+            }
+            instance.visualContentCallbackHandle = undefined;
         }
 
         // Add new callback if provided
         if (callback) {
-            // Assign callback to generateVisualContent property
-            // The C# interop layer handles the delegate conversion
-            element.generateVisualContent = callback;
+            // Register with argument wrapping and track the handle for cleanup
+            const handle = __csHelpers.createDelegateCallback(callback);
+            if (handle >= 0) {
+                instance.visualContentCallbackHandle = handle;
+                // Pass pre-resolved handle directly — bypasses __resolveValue's auto-registration
+                element.generateVisualContent = { __csCallbackHandle: handle } as any;
+            } else {
+                // WebGL path: no native callback table
+                element.generateVisualContent = callback;
+            }
             instance.visualContentCallback = callback;
         } else {
             instance.visualContentCallback = undefined;
@@ -947,6 +975,7 @@ export const hostConfig = {
             removeMergedTextChild(parentInstance, child);
         } else {
             __eventAPI.removeAllEventListeners(child.element);
+            cleanupCallbackHandles(child);
             parentInstance.element.Remove(child.element);
         }
         untrackParent(child.element);
@@ -954,6 +983,7 @@ export const hostConfig = {
 
     removeChildFromContainer(container: Container, child: Instance) {
         __eventAPI.removeAllEventListeners(child.element);
+        cleanupCallbackHandles(child);
         container.Remove(child.element);
         untrackParent(child.element);
     },

package/src/style-parser.ts

@@ -9,6 +9,7 @@
 declare const CS: {
     UnityEngine: {
         Color: new (r: number, g: number, b: number, a: number) => CSColor;
+        FontStyle: Record<string, number>;
         UIElements: {
             Length: new (value: number, unit?: number) => CSLength;
             LengthUnit: { Pixel: number; Percent: number };
@@ -24,6 +25,9 @@ declare const CS: {
             Visibility: Record<string, number>;
             WhiteSpace: Record<string, number>;
             TextAnchor: Record<string, number>;
+            TextOverflow: Record<string, number>;
+            TextOverflowPosition: Record<string, number>;
+            OverflowClipBox: Record<string, number>;
         };
     };
 };
@@ -78,17 +82,20 @@ const LENGTH_PROPERTIES = new Set([
     "borderWidth", "borderTopWidth", "borderRightWidth", "borderBottomWidth", "borderLeftWidth",
     "borderRadius", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius",
     "fontSize",
+    "letterSpacing", "wordSpacing", "unityTextOutlineWidth", "unityParagraphSpacing",
 ])
 
 // Style properties that expect color values
 const COLOR_PROPERTIES = new Set([
     "color", "backgroundColor",
     "borderColor", "borderTopColor", "borderRightColor", "borderBottomColor", "borderLeftColor",
+    "unityTextOutlineColor", "unityBackgroundImageTintColor",
 ])
 
 // Style properties that are plain numbers (no Length wrapper needed)
 const NUMBER_PROPERTIES = new Set([
     "flexGrow", "flexShrink", "opacity",
+    "unitySliceTop", "unitySliceRight", "unitySliceBottom", "unitySliceLeft", "unitySliceScale",
 ])
 
 // Enum property mappings: React style value -> Unity enum value
@@ -186,6 +193,37 @@ const ENUM_MAPPINGS: Record<string, { enum: () => Record<string, number>, values
             "nowrap": "NoWrap",
         }
     },
+    unityFontStyleAndWeight: {
+        enum: () => CS.UnityEngine.FontStyle,
+        values: {
+            "normal": "Normal",
+            "bold": "Bold",
+            "italic": "Italic",
+            "bold-and-italic": "BoldAndItalic",
+        }
+    },
+    textOverflow: {
+        enum: () => CS.UnityEngine.UIElements.TextOverflow,
+        values: {
+            "clip": "Clip",
+            "ellipsis": "Ellipsis",
+        }
+    },
+    unityTextOverflowPosition: {
+        enum: () => CS.UnityEngine.UIElements.TextOverflowPosition,
+        values: {
+            "end": "End",
+            "start": "Start",
+            "middle": "Middle",
+        }
+    },
+    unityOverflowClipBox: {
+        enum: () => CS.UnityEngine.UIElements.OverflowClipBox,
+        values: {
+            "padding-box": "PaddingBox",
+            "content-box": "ContentBox",
+        }
+    },
 }
 
 /**

package/src/types.ts

@@ -127,6 +127,70 @@ export interface ViewStyle {
   /** Text alignment. Note: Use USS class or stylesheet for -unity-font-style (italic/bold) */
   unityTextAlign?: 'upper-left' | 'upper-center' | 'upper-right' | 'middle-left' | 'middle-center' | 'middle-right' | 'lower-left' | 'lower-center' | 'lower-right';
   whiteSpace?: 'normal' | 'nowrap';
+
+  // Typography
+  /** C# Font object */
+  unityFont?: any;
+  /** C# FontDefinition object */
+  unityFontDefinition?: any;
+  /** Font style and weight */
+  unityFontStyleAndWeight?: 'normal' | 'bold' | 'italic' | 'bold-and-italic';
+  /** Spacing between characters */
+  letterSpacing?: StyleLength;
+  /** Spacing between words */
+  wordSpacing?: StyleLength;
+  /** Spacing between paragraphs */
+  unityParagraphSpacing?: StyleLength;
+  /** Text outline color */
+  unityTextOutlineColor?: StyleColor;
+  /** Text outline width */
+  unityTextOutlineWidth?: StyleLength;
+  /** How overflowing text is handled */
+  textOverflow?: 'clip' | 'ellipsis';
+  /** Position of text overflow indicator */
+  unityTextOverflowPosition?: 'end' | 'start' | 'middle';
+
+  // Background (additional)
+  /** Tint color applied to the background image */
+  unityBackgroundImageTintColor?: StyleColor;
+
+  // Slicing
+  /** 9-slice top inset */
+  unitySliceTop?: number;
+  /** 9-slice right inset */
+  unitySliceRight?: number;
+  /** 9-slice bottom inset */
+  unitySliceBottom?: number;
+  /** 9-slice left inset */
+  unitySliceLeft?: number;
+  /** Scale applied to 9-slice borders */
+  unitySliceScale?: number;
+
+  // Transform
+  /** Rotation transform. Pass a C# Rotate struct. */
+  rotate?: any;
+  /** Scale transform. Pass a C# Scale struct. */
+  scale?: any;
+  /** Translation transform. Pass a C# Translate struct. */
+  translate?: any;
+  /** Transform origin point. Pass a C# TransformOrigin struct. */
+  transformOrigin?: any;
+
+  // Transition
+  /** Delay before transitions start. Pass a C# StyleList. */
+  transitionDelay?: any;
+  /** Duration of transitions. Pass a C# StyleList. */
+  transitionDuration?: any;
+  /** Properties to transition. Pass a C# StyleList. */
+  transitionProperty?: any;
+  /** Timing functions for transitions. Pass a C# StyleList. */
+  transitionTimingFunction?: any;
+
+  // Other
+  /** Overflow clipping box */
+  unityOverflowClipBox?: 'padding-box' | 'content-box';
+  /** Cursor style. Pass a C# Cursor struct. */
+  cursor?: any;
 }
 
 // Event types