@peachy/react 0.0.8 → 0.0.9

package/dist/extra.d.mts

@@ -1,11 +1,6 @@
-import Gtk from "gi://Gtk?version=4.0";
+import { PeachyExtraMethods } from "./types.mjs";
 
 //#region src/extra.d.ts
-interface ReactionExtraProps<T extends Gtk.Widget> {
-  appendChild?(parentInstance: T, child: Gtk.Widget): void;
-  insertBefore?(parentInstance: T, child: Gtk.Widget, before: Gtk.Widget | null): void;
-  removeChild?(parentInstance: T, child: Gtk.Widget): void;
-}
-declare const extraMap: Map<GObject.GType, ReactionExtraProps<Gtk.Widget>>;
+declare const extraMap: Map<GObject.GType, PeachyExtraMethods<Gtk.Widget, {}>>;
 //#endregion
-export { ReactionExtraProps, extraMap };
+export { extraMap };

package/dist/extra.mjs

@@ -2,6 +2,18 @@ import { getMetadata } from "./utilities/metadata.mjs";
 import Gtk from "gi://Gtk?version=4.0";
 
 //#region src/extra.ts
+/**
+* GTK has some limitations, so here we try to solve some of them
+*
+* For example, it's not that clear how to add children to an element, every Widget
+* has it's own API, here we map each Object (or an Interface) on how to something
+* for example:
+*
+* - how to append a child to this object
+* - how to remove a child from this object
+* - how to insert a child before another child
+* - how to save/restore state for this object (between updates, not currently saved)
+*/
 let builder;
 const extraMap = new Map([
 	[Gtk.Buildable.$gtype, { appendChild: (parentInstance, child) => {
@@ -38,6 +50,14 @@ const extraMap = new Map([
 			const siblingRow = sibling instanceof Gtk.ListBoxRow ? sibling : sibling.get_ancestor(Gtk.ListBoxRow.$gtype);
 			parentInstance.insert(child, siblingRow?.get_index() ?? 0);
 		}
+	}],
+	[Gtk.Editable.$gtype, {
+		saveState(instance) {
+			return { cursorPosition: instance.get_position() };
+		},
+		restoreState(instance, state) {
+			instance.set_position(state.cursorPosition);
+		}
 	}]
 ]);
 

package/dist/global.d.mts

@@ -1,3 +1,4 @@
+import GObject from "gi://GObject?version=2.0";
 import { Key, Ref } from "react";
 
 //#region src/global.d.ts

package/dist/hostconfig.d.mts

@@ -0,0 +1,7 @@
+import Gtk from "gi://Gtk?version=4.0";
+import { HostConfig } from "react-reconciler";
+
+//#region src/hostconfig.d.ts
+declare const hostConfig: HostConfig<string, Record<string, unknown>, Gtk.Widget, Gtk.Widget, Gtk.Label, Gtk.Widget, null, any, any, any, any, any, any, any>;
+//#endregion
+export { hostConfig };

package/dist/hostconfig.mjs

@@ -0,0 +1,111 @@
+import { setMetadataFromProps } from "./utilities/metadata.mjs";
+import { typeMap } from "./type-map.mjs";
+import { appendChild, insertBefore, removeChild } from "./utilities/children.mjs";
+import { getEventListeners, getEventName, getProperties, updateWidget } from "./utilities/diff.mjs";
+import Gtk from "gi://Gtk?version=4.0";
+import GLib from "gi://GLib?version=2.0";
+import { DefaultEventPriority, NoEventPriority } from "react-reconciler/constants";
+
+//#region src/hostconfig.ts
+const emptyObject = {};
+let updatePriority = NoEventPriority;
+const hostConfig = {
+	appendInitialChild(parentInstance, child) {
+		appendChild(parentInstance, child);
+	},
+	createInstance(type, props, rootContainerInstance, hostContext, internalInstanceHandle) {
+		const klass = typeMap.get(type);
+		if (!klass) throw new Error(`Unknown type: ${type}`);
+		return new klass(getProperties(props));
+	},
+	createTextInstance(text, rootContainerInstance, internalInstanceHandle) {
+		return Gtk.Label.new(text);
+	},
+	finalizeInitialChildren(widget, type, props) {
+		const events = getEventListeners(props);
+		Object.keys(events).forEach((name) => {
+			const eventType = getEventName(name);
+			widget.connect(eventType, events[name]);
+		});
+		setMetadataFromProps(widget, props);
+		return false;
+	},
+	getPublicInstance(inst) {
+		return inst;
+	},
+	prepareForCommit(container) {
+		return null;
+	},
+	resetAfterCommit() {},
+	getRootHostContext(rootInstance) {
+		return emptyObject;
+	},
+	getChildHostContext(parentHostContext, type) {
+		return emptyObject;
+	},
+	shouldSetTextContent(type, props) {
+		return false;
+	},
+	supportsMutation: true,
+	supportsHydration: false,
+	supportsPersistence: false,
+	supportsMicrotasks: true,
+	scheduleTimeout: (fn, delay) => {
+		GLib.timeout_add(GLib.PRIORITY_DEFAULT, delay, () => {
+			fn();
+			return GLib.SOURCE_REMOVE;
+		});
+	},
+	scheduleMicrotask: (fn) => {
+		GLib.idle_add(GLib.PRIORITY_HIGH_IDLE, () => {
+			fn();
+			return GLib.SOURCE_REMOVE;
+		});
+	},
+	removeChild(parentInstance, child) {
+		removeChild(parentInstance, child);
+	},
+	removeChildFromContainer(parentInstance, child) {
+		removeChild(parentInstance, child);
+	},
+	insertBefore(parentInstance, child, beforeChild) {
+		insertBefore(parentInstance, child, beforeChild);
+	},
+	insertInContainerBefore(parentInstance, child, beforeChild) {
+		insertBefore(parentInstance, child, beforeChild);
+	},
+	clearContainer(container) {},
+	appendChild(parentInstance, child) {
+		appendChild(parentInstance, child);
+	},
+	appendChildToContainer(container, child) {
+		appendChild(container, child);
+	},
+	detachDeletedInstance(node) {},
+	commitUpdate(widget, type, oldProps, newProps, internalInstanceHandle) {
+		updateWidget(widget, oldProps, newProps);
+	},
+	commitTextUpdate(textInstance, oldText, newText) {
+		textInstance.label = newText;
+	},
+	resolveUpdatePriority: function() {
+		if (updatePriority !== NoEventPriority) return updatePriority;
+		return DefaultEventPriority;
+	},
+	setCurrentUpdatePriority: function(newPriority) {
+		updatePriority = newPriority;
+	},
+	getCurrentUpdatePriority: function() {
+		return updatePriority;
+	},
+	resolveEventTimeStamp() {
+		return -1.1;
+	},
+	resolveEventType() {
+		return null;
+	},
+	trackSchedulerEvent() {}
+};
+
+//#endregion
+export { hostConfig };

package/dist/index.mjs

@@ -1,116 +1,10 @@
-import { setMetadataFromProps } from "./utilities/metadata.mjs";
 import "./global.d.mts";
-import { typeMap } from "./type-map.mjs";
-import { appendChild, insertBefore, removeChild } from "./utilities/children.mjs";
-import { getEventListeners, getEventName, getProperties, updateWidget } from "./utilities/diff.mjs";
-import Gtk from "gi://Gtk?version=4.0";
+import { hostConfig } from "./hostconfig.mjs";
 import "reflect-metadata";
-import GLib from "gi://GLib?version=2.0";
 import Reconciler from "react-reconciler";
-import { DefaultEventPriority, NoEventPriority } from "react-reconciler/constants";
 
 //#region src/index.ts
-const emptyObject = {};
-let updatePriority = NoEventPriority;
-const reconciler = Reconciler({
-	appendInitialChild(parentInstance, child) {
-		appendChild(parentInstance, child);
-	},
-	createInstance(type, props, rootContainerInstance, hostContext, internalInstanceHandle) {
-		const klass = typeMap.get(type);
-		if (!klass) throw new Error(`Unknown type: ${type}`);
-		return new klass(getProperties(props));
-	},
-	createTextInstance(text, rootContainerInstance, internalInstanceHandle) {
-		return Gtk.Label.new(text);
-	},
-	finalizeInitialChildren(widget, type, props) {
-		const events = getEventListeners(props);
-		Object.keys(events).forEach((name) => {
-			const eventType = getEventName(name);
-			widget.connect(eventType, events[name]);
-		});
-		setMetadataFromProps(widget, props);
-		return false;
-	},
-	getPublicInstance(inst) {
-		return inst;
-	},
-	prepareForCommit() {
-		return null;
-	},
-	resetAfterCommit() {},
-	getRootHostContext(rootInstance) {
-		return emptyObject;
-	},
-	getChildHostContext(parentHostContext, type) {
-		return emptyObject;
-	},
-	shouldSetTextContent(type, props) {
-		return false;
-	},
-	supportsMutation: true,
-	supportsHydration: false,
-	supportsPersistence: false,
-	supportsMicrotasks: true,
-	scheduleTimeout: (fn, delay) => {
-		GLib.timeout_add(GLib.PRIORITY_DEFAULT, delay, () => {
-			fn();
-			return GLib.SOURCE_REMOVE;
-		});
-	},
-	scheduleMicrotask: (fn) => {
-		GLib.idle_add(GLib.PRIORITY_HIGH_IDLE, () => {
-			fn();
-			return GLib.SOURCE_REMOVE;
-		});
-	},
-	removeChild(parentInstance, child) {
-		removeChild(parentInstance, child);
-	},
-	removeChildFromContainer(parentInstance, child) {
-		removeChild(parentInstance, child);
-	},
-	insertBefore(parentInstance, child, beforeChild) {
-		insertBefore(parentInstance, child, beforeChild);
-	},
-	insertInContainerBefore(parentInstance, child, beforeChild) {
-		insertBefore(parentInstance, child, beforeChild);
-	},
-	clearContainer(container) {},
-	appendChild(parentInstance, child) {
-		appendChild(parentInstance, child);
-	},
-	appendChildToContainer(container, child) {
-		appendChild(container, child);
-	},
-	detachDeletedInstance(node) {
-		node.unparent();
-	},
-	commitUpdate(widget, type, oldProps, newProps, internalInstanceHandle) {
-		updateWidget(widget, oldProps, newProps);
-	},
-	commitTextUpdate(textInstance, oldText, newText) {
-		textInstance.label = newText;
-	},
-	resolveUpdatePriority: function() {
-		if (updatePriority !== NoEventPriority) return updatePriority;
-		return DefaultEventPriority;
-	},
-	setCurrentUpdatePriority: function(newPriority) {
-		updatePriority = newPriority;
-	},
-	getCurrentUpdatePriority: function() {
-		return updatePriority;
-	},
-	resolveEventTimeStamp() {
-		return -1.1;
-	},
-	resolveEventType() {
-		return null;
-	},
-	trackSchedulerEvent() {}
-});
+const reconciler = Reconciler(hostConfig);
 const render = (jsx, root, callback) => {
 	const container = reconciler.createContainer(root, 0, null, false, null, "peachy", console.error, console.error, console.error, () => {}, null);
 	reconciler.updateContainer(jsx, container, null, callback);

package/dist/types.d.mts

@@ -4,5 +4,12 @@ type Listener = (...args: any[]) => any;
 interface ReactionMetadata {
   childType?: string;
 }
+interface PeachyExtraMethods<T extends Gtk.Widget, State = {}> {
+  appendChild?(parentInstance: T, child: Gtk.Widget): void;
+  insertBefore?(parentInstance: T, child: Gtk.Widget, before: Gtk.Widget | null): void;
+  removeChild?(parentInstance: T, child: Gtk.Widget): void;
+  saveState?(instance: T): State;
+  restoreState?(instance: T, state: State): void;
+}
 //#endregion
-export { Listener, Props, ReactionMetadata };
+export { Listener, PeachyExtraMethods, Props, ReactionMetadata };

package/dist/utilities/children.mjs

@@ -1,16 +1,9 @@
-import { extraMap } from "../extra.mjs";
-import { getGtype } from "./type.mjs";
-import GObject from "gi://GObject?version=2.0";
+import { getExtraMethod } from "./extra.mjs";
 
 //#region src/utilities/children.ts
 function appendChild(parentInstance, child) {
-	const gtype = getGtype(parentInstance);
-	for (const [type, props] of extraMap) if (GObject.type_is_a(gtype, type)) {
-		if (props.appendChild) {
-			props.appendChild(parentInstance, child);
-			return;
-		}
-	}
+	const appendChild = getExtraMethod(parentInstance, "appendChild");
+	if (appendChild) return appendChild(parentInstance, child);
 	if ("child" in parentInstance) {
 		parentInstance.child = child;
 		return;
@@ -22,10 +15,8 @@ function appendChild(parentInstance, child) {
 	child.set_parent(parentInstance);
 }
 function insertBefore(parentInstance, child, sibling) {
-	const gtype = getGtype(parentInstance);
-	for (const [type, props] of extraMap) if (GObject.type_is_a(gtype, type)) {
-		if (props.insertBefore) return props.insertBefore(parentInstance, child, sibling);
-	}
+	const insertBefore = getExtraMethod(parentInstance, "insertBefore");
+	if (insertBefore) return insertBefore(parentInstance, child, sibling);
 	const children = getAllChildren(parentInstance);
 	children.forEach((child$1) => removeChild(parentInstance, child$1));
 	const childIndex = children.findIndex((c) => c === sibling);
@@ -34,10 +25,8 @@ function insertBefore(parentInstance, child, sibling) {
 	children.forEach((child$1) => appendChild(parentInstance, child$1));
 }
 function removeChild(parentInstance, child) {
-	const gtype = getGtype(parentInstance);
-	for (const [type, props] of extraMap) if (GObject.type_is_a(gtype, type)) {
-		if (props.removeChild) return props.removeChild(parentInstance, child);
-	}
+	const removeChild = getExtraMethod(parentInstance, "removeChild");
+	if (removeChild) return removeChild(parentInstance, child);
 	if ("child" in parentInstance) {
 		parentInstance.child = null;
 		return;

package/dist/utilities/extra.mjs

@@ -0,0 +1,16 @@
+import { extraMap } from "../extra.mjs";
+import { getGtype } from "./type.mjs";
+import GObject from "gi://GObject?version=2.0";
+
+//#region src/utilities/extra.ts
+function getExtraMethod(object, method) {
+	const gtype = getGtype(object);
+	for (const [type, props] of extraMap) if (GObject.type_is_a(gtype, type)) {
+		const methodImplementation = props[method];
+		if (methodImplementation) return methodImplementation;
+	}
+	return null;
+}
+
+//#endregion
+export { getExtraMethod };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peachy/react",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Run GJS applications with react",
   "main": "./dist/index.mjs",
   "exports": {
@@ -20,9 +20,10 @@
     "react": "^19.2.3",
     "react-reconciler": "^0.33.0",
     "reflect-metadata": "^0.2.2",
-    "@peachy/core": "0.0.8"
+    "@peachy/core": "0.0.9"
   },
   "devDependencies": {
+    "@types/node": "^25.0.9",
     "@types/react": "^19.2.8",
     "@types/react-reconciler": "^0.32.3",
     "tsdown": "0.20.0-beta.4",