Skip to content

Commit 4669644

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix/canvas-radius-border
2 parents f0dd82b + 17b7829 commit 4669644

File tree

2 files changed

+24
-16
lines changed

2 files changed

+24
-16
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@lightningjs/renderer",
3-
"version": "2.6.1",
3+
"version": "2.6.2",
44
"description": "Lightning 3 Renderer",
55
"type": "module",
66
"main": "./dist/exports/index.js",

src/main-api/Inspector.ts

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -272,25 +272,33 @@ export class Inspector {
272272
): CoreNode | CoreTextNode {
273273
// Define traps for each property in knownProperties
274274
knownProperties.forEach((property) => {
275-
const originalProp = Object.getOwnPropertyDescriptor(node, property);
276-
if (!originalProp) {
275+
let originalProp = Object.getOwnPropertyDescriptor(node, property);
276+
277+
if (originalProp === undefined) {
278+
// Search the prototype chain for the property descriptor
279+
const proto = Object.getPrototypeOf(node) as CoreNode | CoreTextNode;
280+
originalProp = Object.getOwnPropertyDescriptor(proto, property);
281+
}
282+
283+
if (originalProp === undefined) {
277284
return;
278285
}
279286

280-
Object.defineProperties(node, {
281-
[property]: {
282-
get() {
283-
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
284-
return originalProp.get?.call(node);
285-
},
286-
set(value) {
287-
originalProp.set?.call(node, value);
288-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
289-
this.updateNodeProperty(div, property, value);
290-
},
291-
configurable: true,
292-
enumerable: true,
287+
Object.defineProperty(node, property, {
288+
get() {
289+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
290+
return originalProp?.get?.call(node);
291+
},
292+
set: (value) => {
293+
originalProp?.set?.call(node, value);
294+
this.updateNodeProperty(
295+
div,
296+
property as keyof CoreNodeProps | keyof CoreTextNodeProps,
297+
value,
298+
);
293299
},
300+
configurable: true,
301+
enumerable: true,
294302
});
295303
});
296304

0 commit comments

Comments
 (0)