@ringozz/react-godot 1.0.0-7 → 1.0.0-8

package/README.md

@@ -153,6 +153,16 @@ useSignal(root.windowInput, (event) => {
 });
 ```
 
+Signal **JSX props** (`pressed`, `toggled`, `valueChanged`, `textSubmitted`, ...) are typed as the signal's callback — pass a plain function, no cast needed:
+
+```tsx
+<Button text="Play" pressed={() => start()} />
+<CheckButton text="Debug" toggled={(on) => setDebug(on)} />
+<HSlider value={round} valueChanged={(v) => setRound(v)} />
+```
+
+`ComponentProps` only exposes writable members: read-only props (e.g. `Node.multiplayer`) and methods are not settable props.
+
 ## Full Example
 
 Below is a complete interactive 3D physics scene with custom camera controls and physics bodies:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ringozz/react-godot",
   "author": "Vladimir Davidovich",
-  "version": "1.0.0-7",
+  "version": "1.0.0-8",
   "description": "A React renderer for Godot Engine via @ringozz/godot",
   "keywords": [
     "react",

package/src/react-types.ts

@@ -1,39 +1,52 @@
-/**********************************************************************
- Copyright (c) Vladimir Davidovich. All rights reserved.
-***********************************************************************/
-
-import type React from 'react';
-import type { Object } from '@ringozz/godot/Object';
-import type { ValueTypes } from '@ringozz/godot';
-import type { PackedScene } from '@ringozz/godot/PackedScene';
-
-type FunctionKeys<T> = { [K in keyof T]: T[K] extends Function ? K : never }[keyof T];
-type Properties<T> = Omit<T, FunctionKeys<T>>;
-type Overwrite<P, O> = Properties<P> & O;
-type Mutable<P> = { [K in keyof P]: P[K] | Readonly<P[K]> };
-type ConstructorRepresentation<T = any> = new (...args: any[]) => T;
-
-export type Instance = Object;
-
-export type GodotConstructor<T extends Instance = Instance> = ConstructorRepresentation<T> & Function;
-
-export type InstanceProps<T extends Instance = Instance> = {
-  /** An existing instance to render instead of creating a new one. */
-  object?: T | PackedScene;
-  /** Attaches the element to a named property of the parent instead of adding it as a child. */
-  attach?: string;
-};
-
-type ReactProps<P> = React.PropsWithChildren<React.RefAttributes<P>>;
-
-type WidenVT<T> = {
-  [K in keyof T]: T[K] extends ValueTypes ? T[K] | number[] : T[K];
-};
-
-type ElementProps<T extends GodotConstructor, P = InstanceType<T>> = Partial<
-  Overwrite<WidenVT<P>, ReactProps<P>>
->;
-
-export type ComponentProps<T extends GodotConstructor> = Mutable<
-  Overwrite<ElementProps<T>, InstanceProps<InstanceType<T>>>
->;
+/**********************************************************************
+ Copyright (c) Vladimir Davidovich. All rights reserved.
+***********************************************************************/
+
+import type React from 'react';
+import type { Object } from '@ringozz/godot/Object';
+import type { Signal, ValueTypes } from '@ringozz/godot';
+import type { PackedScene } from '@ringozz/godot/PackedScene';
+
+// Identity check sensitive to readonly (deferred-conditional trick; the
+// comparison lives in return-type position, so it is independent of
+// strictFunctionTypes).
+type Equal<X, Y> = (<T>() => T extends X ? 1 : 2) extends
+  (<T>() => T extends Y ? 1 : 2) ? true : false;
+
+type ConstructorRepresentation<T = any> = new (...args: any[]) => T;
+
+export type Instance = Object;
+
+export type GodotConstructor<T extends Instance = Instance> = ConstructorRepresentation<T> & Function;
+
+export type InstanceProps<T extends Instance = Instance> = {
+  /** An existing instance to render instead of creating a new one. */
+  object?: T | PackedScene;
+  /** Attaches the element to a named property of the parent instead of adding it as a child. */
+  attach?: string;
+};
+
+type ReactProps<P> = React.PropsWithChildren<React.RefAttributes<P>>;
+
+// Settable, non-method keys. `Pick<T, K>` preserves the readonly modifier, so
+// getter-only (read-only) props, e.g. Node.multiplayer, compare unequal to
+// their `-readonly` copy and drop out; write-only accessors pass through with
+// their setter parameter type.
+type SettableKey<T, K extends keyof T> =
+  Equal<Pick<T, K>, { -readonly [P in K]: T[K] }> extends true
+    ? (T[K] extends Function ? never : K)
+    : never;
+
+// JSX props are settable instance members, typed as the setter accepts them:
+// ValueTypes also accept JSX arrays, and signals (getter `Signal<CB>`, setter
+// `CB | null`) take the callback directly. Maps over `keyof T` (homomorphic)
+// so optional/readonly modifiers survive.
+type Properties<T> = {
+  [K in keyof T as SettableKey<T, K>]:
+    T[K] extends ValueTypes ? T[K] | number[]
+    : T[K] extends Signal<infer CB> ? CB | null
+    : T[K];
+};
+
+export type ComponentProps<T extends GodotConstructor, P extends Instance = InstanceType<T>> =
+  Partial<Properties<P> & ReactProps<P>> & InstanceProps<P>;