Merge branch 'main' into v11

2022-07-18 18:08:00 +02:00
parent 1bb32c8eb7 a2c22168a3
commit 6baf325b24
39 changed files with 7344 additions and 5892 deletions
@@ -10,17 +10,14 @@ function handleParentExpand(res: any[], updateItem: any) {
    if (extendWidth > 0 || extendHeight > 0 || updateItem.position.x < 0 || updateItem.position.y < 0) {
      parent.style = { ...parent.style } || {};

+      parent.style.width = parent.style.width ?? parent.width;
+      parent.style.height = parent.style.height ?? parent.height;
+
      if (extendWidth > 0) {
-        if (!parent.style.width) {
-          parent.style.width = parent.width;
-        }
        parent.style.width += extendWidth;
      }

      if (extendHeight > 0) {
-        if (!parent.style.height) {
-          parent.style.height = parent.height;
-        }
        parent.style.height += extendHeight;
      }