@gtkx/react 0.1.26 → 0.1.28

package/dist/node.d.ts

@@ -4,6 +4,7 @@ export declare abstract class Node<T extends Gtk.Widget | undefined = Gtk.Widget
     static matches(_type: string): boolean;
     protected signalHandlers: Map<string, number>;
     protected widget: T;
+    protected widgetType: string;
     protected isVirtual(): boolean;
     constructor(type: string, props: Props, app: Gtk.Application, existingWidget?: Gtk.Widget);
     protected createWidget(type: string, props: Props, app: Gtk.Application): T;
@@ -16,8 +17,9 @@ export declare abstract class Node<T extends Gtk.Widget | undefined = Gtk.Widget
     attachToParentBefore(parent: Node, before: Node): void;
     protected consumedProps(): Set<string>;
     updateProps(oldProps: Props, newProps: Props): void;
-    protected setSignalProperty(widget: Gtk.Widget, key: string, handler: unknown): void;
-    protected setSignalHandler(widget: Gtk.Widget, eventName: string, handler: (...args: unknown[]) => unknown): void;
+    protected propKeyToEventName(key: string): string;
+    protected disconnectSignal(eventName: string): void;
+    protected connectSignal(widget: Gtk.Widget, eventName: string, handler: (...args: unknown[]) => unknown): void;
     protected setProperty(widget: Gtk.Widget, key: string, value: unknown): void;
     mount(_app: Gtk.Application): void;
     dispose(_app: Gtk.Application): void;

package/dist/node.js

@@ -1,6 +1,6 @@
 import * as GObject from "@gtkx/ffi/gobject";
 import * as Gtk from "@gtkx/ffi/gtk";
-import { CONSTRUCTOR_PARAMS } from "./generated/jsx.js";
+import { CONSTRUCTOR_PARAMS, SETTER_GETTERS } from "./generated/jsx.js";
 import { isAppendable, isRemovable, isSingleChild } from "./predicates.js";
 const extractConstructorArgs = (type, props) => {
     const params = CONSTRUCTOR_PARAMS[type];
@@ -14,10 +14,12 @@ export class Node {
     }
     signalHandlers = new Map();
     widget;
+    widgetType;
     isVirtual() {
         return false;
     }
     constructor(type, props, app, existingWidget) {
+        this.widgetType = type.split(".")[0] || type;
         if (existingWidget) {
             this.widget = existingWidget;
             return;
@@ -94,6 +96,8 @@ export class Node {
             return;
         const consumed = this.consumedProps();
         const allKeys = new Set([...Object.keys(oldProps), ...Object.keys(newProps)]);
+        const signalUpdates = [];
+        const propertyUpdates = [];
         for (const key of allKeys) {
             if (consumed.has(key))
                 continue;
@@ -102,39 +106,64 @@ export class Node {
             if (oldValue === newValue)
                 continue;
             if (key.startsWith("on")) {
-                this.setSignalProperty(widget, key, newValue);
-                continue;
+                signalUpdates.push({ key, newValue });
             }
-            if (newValue === undefined)
-                continue;
+            else if (newValue !== undefined) {
+                propertyUpdates.push({ key, newValue });
+            }
+        }
+        for (const { key } of signalUpdates) {
+            this.disconnectSignal(this.propKeyToEventName(key));
+        }
+        for (const { key, newValue } of propertyUpdates) {
             this.setProperty(widget, key, newValue);
         }
+        for (const { key, newValue } of signalUpdates) {
+            if (typeof newValue === "function") {
+                this.connectSignal(widget, this.propKeyToEventName(key), newValue);
+            }
+        }
     }
-    setSignalProperty(widget, key, handler) {
-        const eventName = key
+    propKeyToEventName(key) {
+        return key
             .slice(2)
             .replace(/([A-Z])/g, "-$1")
             .toLowerCase()
             .replace(/^-/, "");
-        const oldHandlerId = this.signalHandlers.get(eventName);
-        if (oldHandlerId !== undefined) {
-            GObject.signalHandlerDisconnect(widget, oldHandlerId);
+    }
+    disconnectSignal(eventName) {
+        const handlerId = this.signalHandlers.get(eventName);
+        if (handlerId !== undefined) {
+            const widget = this.getWidget();
+            if (widget) {
+                GObject.signalHandlerDisconnect(widget, handlerId);
+            }
             this.signalHandlers.delete(eventName);
         }
-        if (typeof handler === "function") {
-            this.setSignalHandler(widget, eventName, handler);
-        }
     }
-    setSignalHandler(widget, eventName, handler) {
+    connectSignal(widget, eventName, handler) {
         const handlerId = widget.connect(eventName, handler);
         this.signalHandlers.set(eventName, handlerId);
     }
     setProperty(widget, key, value) {
         const setterName = `set${key.charAt(0).toUpperCase()}${key.slice(1)}`;
         const setter = widget[setterName];
-        if (typeof setter === "function") {
-            setter.call(widget, value);
+        if (typeof setter !== "function")
+            return;
+        const getterName = SETTER_GETTERS[this.widgetType]?.[setterName];
+        if (getterName) {
+            const getter = widget[getterName];
+            if (typeof getter === "function") {
+                try {
+                    const currentValue = getter.call(widget);
+                    if (currentValue === value)
+                        return;
+                }
+                catch {
+                }
+            }
         }
+        setter.call(widget, value);
     }
     mount(_app) { }
     dispose(_app) { }

package/dist/nodes/dropdown.js

@@ -48,7 +48,7 @@ export class DropDownNode extends Node {
                 const item = this.store.getItem(index);
                 this.onSelectionChanged?.(item, index);
             };
-            this.setSignalHandler(this.widget, "notify::selected", handler);
+            this.connectSignal(this.widget, "notify::selected", handler);
         }
     }
     getStore() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtk",
@@ -40,10 +40,10 @@
   ],
   "dependencies": {
     "react-reconciler": "0.33.0",
-    "@gtkx/ffi": "0.1.26"
+    "@gtkx/ffi": "0.1.28"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.1.26"
+    "@gtkx/gir": "0.1.28"
   },
   "peerDependencies": {
     "react": "^19"