@gtkx/react 1.4.0 → 1.6.0

package/src/reconciler/instance.ts

@@ -1,5 +1,6 @@
 import type * as GObject from "@gtkx/gi/gobject";
-import { getWrapperClass, TYPE_INVALID, typeFromName, typeIsA } from "@gtkx/runtime";
+import { TYPE_INVALID, typeFromName, typeIsA } from "@gtkx/runtime";
+import { getExactWrapperClass } from "@gtkx/runtime/internal";
 import { getOrInsert, pickBy } from "@gtkx/utils";
 import type { Props } from "./registry.js";
 import { type TypeInfo, typeInfoFor } from "./metadata.js";
@@ -57,8 +58,8 @@ const constructInput = (info: TypeInfo, props: Props): Props =>
             (info.constructOnly.has(name) || info.construct.has(name)),
     );
 
-const instantiate = (type: bigint, input: Props): GObject.Object => {
-    const cls = getWrapperClass(type) as WidgetConstructor;
+const instantiate = (typeName: string, type: bigint, input: Props): GObject.Object => {
+    const cls = getExactWrapperClass(type, typeName) as WidgetConstructor;
 
     return new cls(input);
 };
@@ -66,7 +67,7 @@ const instantiate = (type: bigint, input: Props): GObject.Object => {
 const createObject = (typeName: string, type: bigint, input: Props): GObject.Object => {
     const create = ELEMENTS[typeName]?.behaviors?.find((behavior) => behavior.create !== undefined)?.create;
 
-    return create === undefined ? instantiate(type, input) : create(input);
+    return create === undefined ? instantiate(typeName, type, input) : create(input);
 };
 
 const resolveElementNode = (typeName: string, props: Props, dispatch: Dispatch): ElementNode | LazyNode => {

package/src/reconciler/metadata.ts

@@ -9,6 +9,11 @@ import {
     typeName,
     typeParent,
 } from "@gtkx/runtime";
+import {
+    elementMetadataVersion,
+    registeredElementProperties,
+    registeredElementSignals,
+} from "@gtkx/runtime/internal";
 import { getOrInsert } from "@gtkx/utils";
 import { properties, type PropertyEntry, signals, userEventSignals } from "virtual:gtkx-config";
 import { deferredProps, type ElementBehavior, ELEMENTS } from "./registry.js";
@@ -36,6 +41,19 @@ const FLAGS = 1;
 const DEFAULT_VALUE = 2;
 const ancestryCache: Map<string, string[]> = new Map();
 const typeInfoCache: Map<string, TypeInfo> = new Map();
+const metadataCacheState = { seenVersion: elementMetadataVersion() };
+
+const dropStaleCaches = (): void => {
+    const current = elementMetadataVersion();
+
+    if (metadataCacheState.seenVersion === current) {
+        return;
+    }
+
+    metadataCacheState.seenVersion = current;
+    ancestryCache.clear();
+    typeInfoCache.clear();
+};
 
 const addAncestor = (names: string[], seen: Set<string>, name: string | null): void => {
     if (name === null || seen.has(name)) {
@@ -75,7 +93,7 @@ const addAll = <T>(target: Set<T>, source: Iterable<T> | undefined): void => {
 };
 
 const accumulateAncestor = (info: TypeInfo, ancestor: string): void => {
-    Object.assign(info.signals, signals[ancestor] ?? {});
+    Object.assign(info.signals, registeredElementSignals[ancestor] ?? signals[ancestor] ?? {});
     addAll(info.userEventSignals, userEventSignals[ancestor]);
     info.behaviors.push(...(ELEMENTS[ancestor]?.behaviors ?? []));
 };
@@ -141,7 +159,7 @@ const buildTypeInfo = (name: string): TypeInfo => {
     info.isLazy = chain.some((ancestor) => ELEMENTS[ancestor]?.isLazy === true);
 
     for (const ancestor of chain.toReversed()) {
-        Object.assign(info.properties, properties[ancestor] ?? {});
+        Object.assign(info.properties, registeredElementProperties[ancestor] ?? properties[ancestor] ?? {});
     }
 
     resolveProperties(info);
@@ -149,7 +167,11 @@ const buildTypeInfo = (name: string): TypeInfo => {
     return info;
 };
 
-const typeInfoFor = (name: string): TypeInfo => getOrInsert(typeInfoCache, name, buildTypeInfo);
+const typeInfoFor = (name: string): TypeInfo => {
+    dropStaleCaches();
+
+    return getOrInsert(typeInfoCache, name, buildTypeInfo);
+};
 
 const getTypeInfo = (object: GObject.Object): TypeInfo | undefined => {
     const name = typeName(getClassType(object.constructor as AnyClass));