onejs-react 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onejs-react",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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

@@ -3,7 +3,7 @@ import type {BaseProps, ViewStyle, VisualElement, GenerateVisualContentCallback}
 import {parseStyleValue, parseColor} from './style-parser';
 
 // CSObject is an alias for VisualElement - they represent the same C# objects
-type CSObject = VisualElement;
+type CSObject = VisualElement & { pickingMode?: number };
 
 // Global declarations for QuickJS environment
 declare function setTimeout(callback: () => void, ms?: number): number;
@@ -54,6 +54,7 @@ declare const CS: {
             AlternatingRowBackground: CSEnum;
             CollectionVirtualizationMethod: CSEnum;
             DisplayStyle: CSEnum;
+            PickingMode: CSEnum;
         };
     };
     OneJS: {
@@ -70,6 +71,8 @@ declare const __eventAPI: {
     addEventListener: (element: CSObject, eventType: string, callback: Function) => void;
     removeEventListener: (element: CSObject, eventType: string, callback: Function) => void;
     removeAllEventListeners: (element: CSObject) => void;
+    setParent: (childHandle: number, parentHandle: number) => void;
+    removeParent: (childHandle: number) => void;
 };
 
 interface CSStyle {
@@ -416,6 +419,22 @@ function updateClassNames(element: CSObject, oldClassName: string | undefined, n
     }
 }
 
+// Track parent-child relationships for event bubbling
+function trackParent(child: CSObject, parent: CSObject) {
+    const childHandle = (child as unknown as { __csHandle: number }).__csHandle;
+    const parentHandle = (parent as unknown as { __csHandle: number }).__csHandle;
+    if (childHandle > 0 && parentHandle > 0) {
+        __eventAPI.setParent(childHandle, parentHandle);
+    }
+}
+
+function untrackParent(child: CSObject) {
+    const childHandle = (child as unknown as { __csHandle: number }).__csHandle;
+    if (childHandle > 0) {
+        __eventAPI.removeParent(childHandle);
+    }
+}
+
 // Apply event handlers
 function applyEvents(instance: Instance, props: BaseProps) {
     for (const [propName, eventType] of Object.entries(EVENT_PROPS)) {
@@ -778,6 +797,11 @@ function createInstance(type: string, props: BaseProps): Instance {
     applyVisualContentCallback(instance, props);
     applyComponentProps(element, type, props as Record<string, unknown>);
 
+    // Apply pickingMode
+    if (props.pickingMode !== undefined) {
+        element.pickingMode = CS.UnityEngine.UIElements.PickingMode[props.pickingMode];
+    }
+
     return instance;
 }
 
@@ -806,6 +830,16 @@ function updateInstance(instance: Instance, oldProps: BaseProps, newProps: BaseP
     // Update component-specific props
     applyComponentProps(element, instance.type, newProps as Record<string, unknown>);
 
+    // Update pickingMode
+    if (oldProps.pickingMode !== newProps.pickingMode) {
+        if (newProps.pickingMode !== undefined) {
+            element.pickingMode = CS.UnityEngine.UIElements.PickingMode[newProps.pickingMode];
+        } else {
+            // Reset to default (Position)
+            element.pickingMode = CS.UnityEngine.UIElements.PickingMode.Position;
+        }
+    }
+
     instance.props = newProps;
 }
 
@@ -862,31 +896,31 @@ export const hostConfig = {
         if (shouldMergeText(parentInstance, child)) {
             appendMergedTextChild(parentInstance, child);
         } else {
-            // Non-text child - unmerge any previously merged text first
             handleNonTextChild(parentInstance);
             parentInstance.element.Add(child.element);
         }
+        trackParent(child.element, parentInstance.element);
     },
 
     appendChild(parentInstance: Instance, child: Instance) {
         if (shouldMergeText(parentInstance, child)) {
             appendMergedTextChild(parentInstance, child);
         } else {
-            // Non-text child - unmerge any previously merged text first
             handleNonTextChild(parentInstance);
             parentInstance.element.Add(child.element);
         }
+        trackParent(child.element, parentInstance.element);
     },
 
     appendChildToContainer(container: Container, child: Instance) {
         container.Add(child.element);
+        // Container is the root - no parent to track
     },
 
     insertBefore(parentInstance: Instance, child: Instance, beforeChild: Instance) {
         if (shouldMergeText(parentInstance, child)) {
             insertMergedTextChild(parentInstance, child, beforeChild);
         } else {
-            // Non-text child - unmerge any previously merged text first
             handleNonTextChild(parentInstance);
             const index = parentInstance.element.IndexOf(beforeChild.element);
             if (index >= 0) {
@@ -895,6 +929,7 @@ export const hostConfig = {
                 parentInstance.element.Add(child.element);
             }
         }
+        trackParent(child.element, parentInstance.element);
     },
 
     insertInContainerBefore(container: Container, child: Instance, beforeChild: Instance) {
@@ -904,21 +939,23 @@ export const hostConfig = {
         } else {
             container.Add(child.element);
         }
+        // Container is the root - no parent to track
     },
 
     removeChild(parentInstance: Instance, child: Instance) {
         if (child.mergedInto === parentInstance) {
-            // Child was merged into parent's text - remove from merged children
             removeMergedTextChild(parentInstance, child);
         } else {
             __eventAPI.removeAllEventListeners(child.element);
             parentInstance.element.Remove(child.element);
         }
+        untrackParent(child.element);
     },
 
     removeChildFromContainer(container: Container, child: Instance) {
         __eventAPI.removeAllEventListeners(child.element);
         container.Remove(child.element);
+        untrackParent(child.element);
     },
 
     prepareUpdate(_instance: Instance, _type: string, oldProps: BaseProps, newProps: BaseProps) {

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
@@ -331,6 +395,14 @@ export interface BaseProps {
   onTransitionEnd?: TransitionEventHandler;
   onTransitionCancel?: TransitionEventHandler;
 
+  // Picking mode - controls whether the element receives pointer events
+  /**
+   * Controls whether this element is pickable by pointer events.
+   * - "Position" (default): Element receives pointer events based on its rectangle
+   * - "Ignore": Element is transparent to pointer events (clicks pass through)
+   */
+  pickingMode?: 'Position' | 'Ignore';
+
   // Vector drawing
   /**
    * Callback for custom vector drawing via Unity's generateVisualContent.