@eclipse-scout/core 22.0.11 → 22.0.19

package/src/tile/accordion/TileAccordionLayout.js

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -19,8 +19,45 @@ export default class TileAccordionLayout extends AccordionLayout {
   }
 
   layout($container) {
+    let previousGroupHeights = this.tileAccordion.groups
+      .map(group => group.body)
+      .map(tileGrid => this._getTileGridHeight(tileGrid));
+
     super.layout($container);
     this._updateFilterFieldMaxWidth($container);
+
+    this.tileAccordion.groups
+      .map(group => group.body)
+      .forEach((tileGrid, index) => this._updateTileGridViewPort(tileGrid, previousGroupHeights[index]));
+  }
+
+  _updateTileGridViewPort(tileGrid, previousHeight) {
+    if (!tileGrid.rendered || !tileGrid.htmlComp || previousHeight <= 0) {
+      return;
+    }
+
+    let newHeight = this._getTileGridHeight(tileGrid);
+    if (previousHeight === newHeight && tileGrid.virtual) {
+      // The viewPort of the virtual tileGrid has not been updated as no layout update was done for the grid because its height is unchanged.
+      // But as there might be more space available in the accordion now (its height might have changed), enforce a viewPort update to ensure all necessary tiles are rendered.
+      tileGrid.setViewRangeSize(tileGrid.calculateViewRangeSize(), false);
+      tileGrid.htmlComp.layout.updateViewPort();
+    }
+  }
+
+  _getTileGridHeight(tileGrid) {
+    if (!tileGrid) {
+      return 0;
+    }
+    let htmlComp = tileGrid.htmlComp;
+    if (!htmlComp) {
+      return 0;
+    }
+    let size = tileGrid.htmlComp.sizeCached;
+    if (!size) {
+      return 0;
+    }
+    return size.height;
   }
 
   _updateFilterFieldMaxWidth($container) {

package/src/tree/Tree.js

@@ -2926,6 +2926,10 @@ export default class Tree extends Widget {
       } else if (newWidth > this.maxNodeWidth) {
         this.maxNodeWidth = newWidth;
         this.nodeWidthDirty = true;
+      } else if (newWidth === oldWidth && newWidth === 0) {
+        // newWidth and oldWidth are 0: this might be because the tree is invisible while a node is added:
+        // Mark as dirty to update the width later during layouting (when the tree gets visible and the width is available)
+        this.nodeWidthDirty = true;
       }
       node.width = newWidth;
     }, this);

package/src/util/arrays.js

@@ -12,6 +12,10 @@ import {objects, strings} from '../index';
 
 /**
  * Ensures the given parameter is an array
+ *
+ * @template T
+ * @param {T[]|T|null} array
+ * @return T[]
  */
 export function ensure(array) {
   if (array === undefined || array === null) {

package/src/util/objects.js

@@ -127,6 +127,9 @@ export function someProperties(obj, properties) {
   });
 }
 
+/**
+ * @return {*}
+ */
 export function valueCopy(obj) {
   // Nothing to be done for immutable things
   if (obj === undefined || obj === null || typeof obj !== 'object') {
@@ -220,7 +223,7 @@ export function findChildObjectByKey(parentObj, property, propertyValue) {
  * @return Object Returns the selected object.
  * @throws Throws an error, if the provided parameters are malformed, or a property could not be found/a id property filter does not find any elements.
  */
-function getByPath(object, path) {
+export function getByPath(object, path) {
   scout.assertParameter('object', object, Object);
   scout.assertParameter('path', path);
 

package/src/widget/FilterSupport.js

@@ -3,7 +3,7 @@
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -125,13 +125,11 @@ export default class FilterSupport extends WidgetSupport {
 
     this._filterField.$field.attr('tabIndex', -1);
 
-    let color = styles.getFirstOpaqueBackgroundColor(this._filterField.$container),
-      colorRgba = $.extend(true, {red: 0, green: 0, blue: 0, alpha: 1}, styles.rgb(color)),
-      transparent50Color = 'rgba(' + colorRgba.red + ', ' + colorRgba.green + ', ' + colorRgba.blue + ', ' + 0.5 + ')',
-      transparent80Color = 'rgba(' + colorRgba.red + ', ' + colorRgba.green + ', ' + colorRgba.blue + ', ' + 0.8 + ')';
-    this._filterField.$container.css('--filter-field-background-color', color);
-    this._filterField.$container.css('--filter-field-transparent-50-background-color', transparent50Color);
-    this._filterField.$container.css('--filter-field-transparent-80-background-color', transparent80Color);
+    if (!this.widget.rendered) {
+      this.widget.session.layoutValidator.schedulePostValidateFunction(this._updateFilterFieldBackgroundColor.bind(this));
+    } else {
+      this._updateFilterFieldBackgroundColor();
+    }
 
     this._textFilter = this._createTextFilter();
     this._textFilter.synthetic = true;
@@ -164,6 +162,19 @@ export default class FilterSupport extends WidgetSupport {
     this._filterField.keyStrokeContext.registerKeyStroke(this._exitFilterFieldKeyStroke);
   }
 
+  _updateFilterFieldBackgroundColor() {
+    if (!this._filterField || !this._filterField.rendered) {
+      return;
+    }
+    let color = styles.getFirstOpaqueBackgroundColor(this._filterField.$container),
+      colorRgba = $.extend(true, {red: 0, green: 0, blue: 0, alpha: 1}, styles.rgb(color)),
+      transparent50Color = 'rgba(' + colorRgba.red + ', ' + colorRgba.green + ', ' + colorRgba.blue + ', ' + 0.5 + ')',
+      transparent80Color = 'rgba(' + colorRgba.red + ', ' + colorRgba.green + ', ' + colorRgba.blue + ', ' + 0.8 + ')';
+    this._filterField.$container.css('--filter-field-background-color', color);
+    this._filterField.$container.css('--filter-field-transparent-50-background-color', transparent50Color);
+    this._filterField.$container.css('--filter-field-transparent-80-background-color', transparent80Color);
+  }
+
   _onFilterFieldDisplayTextChanged(event) {
     if (this._filterField && this._filterField.rendered) {
       this._filterField.$container.toggleClass('empty', !event.newValue);