From 911100f1931f8f3c6c112c4c14b197288f2ff12a Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Mon, 7 Feb 2022 13:12:26 +0100
Subject: [PATCH] Improve frame element compat handling
Better solution without an extra variable.
---
projects/common/ui-elements/frame/frame-element.ts | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/projects/common/ui-elements/frame/frame-element.ts b/projects/common/ui-elements/frame/frame-element.ts
index ad6618d62..3563f7f4e 100644
--- a/projects/common/ui-elements/frame/frame-element.ts
+++ b/projects/common/ui-elements/frame/frame-element.ts
@@ -20,14 +20,16 @@ export class FrameElement extends UIElement implements PositionedElement, Surfac
constructor(serializedElement: Partial<UIElement>) {
super(serializedElement);
Object.assign(this, serializedElement);
- const newSerializedElement = serializedElement;
- if (newSerializedElement.positionProps && newSerializedElement.positionProps.zIndex === undefined) {
- newSerializedElement.positionProps.zIndex = -1;
+ this.positionProps = initPositionedElement(serializedElement);
+ this.surfaceProps = initSurfaceElement(serializedElement);
+
+ if (serializedElement.zIndex === undefined &&
+ serializedElement.positionProps?.zIndex === undefined) {
+ this.positionProps.zIndex = -1;
}
- this.positionProps = initPositionedElement(newSerializedElement);
- this.surfaceProps = initSurfaceElement(newSerializedElement);
+
this.surfaceProps.backgroundColor =
- newSerializedElement.surfaceProps?.backgroundColor as string ||
+ serializedElement.surfaceProps?.backgroundColor as string ||
'transparent';
}
}
--
GitLab