@eclipse-scout/core 22.0.1 → 22.0.11

package/src/tree/Tree.less

@@ -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
@@ -64,6 +64,13 @@
     & > .animation-wrapper > .tree-node {
       cursor: pointer;
     }
+
+    &.disabled > .tree-node,
+    &.disabled > .animation-wrapper > .tree-node,
+    & > .tree-node.disabled,
+    & > .animation-wrapper > .tree-node.disabled {
+      cursor: default;
+    }
   }
 }
 
@@ -95,12 +102,14 @@
     color: @disabled-color;
   }
 
+  .disabled > .animation-wrapper > &,
   .disabled > & {
     /* Whole tree is disabled -> use darker disabled color */
     color: @text-disabled-color;
   }
 
-  .disabled.read-only > .tree-data > & {
+  .disabled.read-only > .animation-wrapper > &,
+  .disabled.read-only > & {
     color: @read-only-color;
   }
 
@@ -132,6 +141,7 @@
     &.font-icon {
       /* Necessary to align with the text, depends on the used font size */
       line-height: @tree-node-font-icon-line-height;
+      font-size: @tree-node-font-icon-size;
     }
   }
 }
@@ -216,18 +226,16 @@
 
     .tree-node.lazy > & {
       font-family: @font-default-family;
-      font-size: @font-size-normal;
       content: '+';
       /* Move to left because '+' sign is not as wide as 'arrow-down' */
       margin-left: -2px;
     }
 
     .tree-node.expanded > & {
-      /* This "imprecise" angle is a workround for firefox to prevent shifting the div a little when the animation finishes. */
+      /* This "imprecise" angle is a workaround for firefox to prevent shifting the div a little when the animation finishes. */
       /* See https://bugzilla.mozilla.org/show_bug.cgi?id=739176 */
       #scout.transform(rotate(89.99deg));
     }
-
   }
 
   &:hover {

package/src/tree/keystrokes/AbstractTreeNavigationKeyStroke.js

@@ -24,6 +24,7 @@ export default class AbstractTreeNavigationKeyStroke extends KeyStroke {
     this.alt = keyStrokeModifier.isAlt(modifierBitMask);
 
     this.keyStrokeMode = KeyStroke.Mode.DOWN;
+    this.inheritAccessibility = false;
   }
 
   _accept(event) {

package/src/tree/keystrokes/TreeCollapseAllKeyStroke.js

@@ -16,11 +16,11 @@ export default class TreeCollapseAllKeyStroke extends AbstractTreeNavigationKeyS
     super(tree, keyStrokeModifier);
     this.which = [keys.HOME];
     this.renderingHints.hAlign = HAlign.RIGHT;
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
+    this.renderingHints.$drawingArea = ($drawingArea, event) => {
       if (this.field.visibleNodesFlat.length > 0) {
         return this.field.visibleNodesFlat[0].$node;
       }
-    }.bind(this);
+    };
   }
 
   handle(event) {

package/src/tree/keystrokes/TreeExpandOrDrillDownKeyStroke.js

@@ -16,14 +16,14 @@ export default class TreeExpandOrDrillDownKeyStroke extends AbstractTreeNavigati
     super(tree, modifierBitMask);
     this.which = [keys.ADD];
     this.renderingHints.text = '+';
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
+    this.renderingHints.$drawingArea = ($drawingArea, event) => {
       let currentNode = event._treeCurrentNode;
       if (this.isNodeExpandable(currentNode)) {
         return currentNode.$node;
       } else if (currentNode.childNodes.length > 0) {
         return currentNode.childNodes[0].$node;
       }
-    }.bind(this);
+    };
   }
 
   _accept(event) {

package/src/tree/keystrokes/TreeNavigationDownKeyStroke.js

@@ -16,12 +16,12 @@ export default class TreeNavigationDownKeyStroke extends AbstractTreeNavigationK
     super(tree, modifierBitMask);
     this.which = [keys.DOWN];
     this.renderingHints.text = '↓';
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
+    this.renderingHints.$drawingArea = ($drawingArea, event) => {
       let newSelectedNode = this._computeNewSelection(event._treeCurrentNode);
       if (newSelectedNode) {
         return newSelectedNode.$node;
       }
-    }.bind(this);
+    };
   }
 
   _computeNewSelection(currentNode) {

package/src/tree/keystrokes/TreeNavigationEndKeyStroke.js

@@ -15,12 +15,12 @@ export default class TreeNavigationEndKeyStroke extends AbstractTreeNavigationKe
   constructor(tree, modifierBitMask) {
     super(tree, modifierBitMask);
     this.which = [keys.END];
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
+    this.renderingHints.$drawingArea = ($drawingArea, event) => {
       let newSelectedNode = this._computeNewSelection(event._treeCurrentNode);
       if (newSelectedNode) {
         return newSelectedNode.$node;
       }
-    }.bind(this);
+    };
   }
 
   handle(event) {

package/src/tree/keystrokes/TreeNavigationUpKeyStroke.js

@@ -16,12 +16,12 @@ export default class TreeNavigationUpKeyStroke extends AbstractTreeNavigationKey
     super(tree, modifierBitMask);
     this.which = [keys.UP];
     this.renderingHints.text = '↑';
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
+    this.renderingHints.$drawingArea = ($drawingArea, event) => {
       let newSelectedNode = this._computeNewSelection(event._treeCurrentNode);
       if (newSelectedNode) {
         return newSelectedNode.$node;
       }
-    }.bind(this);
+    };
   }
 
   _computeNewSelection(currentNode) {

package/src/util/Device.js

@@ -259,15 +259,15 @@ export default class Device {
 
   /**
    * This method returns false for all browsers that are known to be unsupported, all others (e.g. unknown engines) are allowed by default.
-   * The supported browser versions are mainly determined by the features needed by Scout (e.g. class syntax, Array.flatMap, IntersectionObserver, Custom CSS Properties, CSS flex-box).
+   * The supported browser versions are mainly determined by the features needed by Scout (e.g. class syntax, Array.flatMap, IntersectionObserver, Custom CSS Properties, CSS flex-box, queueMicrotask).
    */
   isSupportedBrowser(browser, version) {
     browser = scout.nvl(browser, this.browser);
     version = scout.nvl(version, this.browserVersion);
     let browsers = Device.Browser;
-    return (browser === browsers.CHROME && version >= 69)
-      || (browser === browsers.FIREFOX && version >= 62)
-      || (browser === browsers.SAFARI && version >= 12);
+    return (browser === browsers.CHROME && version >= 71)
+      || (browser === browsers.FIREFOX && version >= 69)
+      || (browser === browsers.SAFARI && version >= 12.1);
   }
 
   /**

package/src/util/arrays.js

@@ -206,6 +206,11 @@ export function containsAll(haystack, needles) {
   });
 }
 
+/**
+ * @template T
+ * @param {T[]} arr
+ * @return {T}
+ */
 export function first(arr) {
   if (Array.isArray(arr)) {
     return arr[0];
@@ -213,6 +218,11 @@ export function first(arr) {
   return arr;
 }
 
+/**
+ * @template T
+ * @param {T[]} arr
+ * @return {T}
+ */
 export function last(arr) {
   if (Array.isArray(arr)) {
     return arr[arr.length - 1];
@@ -285,8 +295,8 @@ export function union(array1, array2) {
   return result;
 }
 
-// noinspection DuplicatedCode
 export function equalsIgnoreOrder(arr, arr2) {
+  // noinspection DuplicatedCode
   if (arr === arr2) {
     return true;
   }
@@ -302,8 +312,8 @@ export function equalsIgnoreOrder(arr, arr2) {
   return containsAll(arr, arr2);
 }
 
-// noinspection DuplicatedCode
 export function equals(arr, arr2) {
+  // noinspection DuplicatedCode
   if (arr === arr2) {
     return true;
   }
@@ -600,9 +610,40 @@ export function toMap(array, keyMapper = (el => el), valueMapper = (el => el)) {
   }, {}));
 }
 
+/**
+ * If the argument is an empty array, null is returned. Otherwise, the argument is returned unchanged.
+ *
+ * @template T
+ * @param {T[]} array
+ * @return {T[]|null}
+ */
+export function nullIfEmpty(array) {
+  return empty(array) ? null : array;
+}
+
+/**
+ * Clears the content of an array <i>in-place</i>. All elements are removed from the array and the
+ * length will be set to 0. If the given argument is not an array, nothing happens.
+ *
+ * This is a more readable version of `array.splice(0, a.length)`.
+ *
+ * The return value is an array of all deleted elements (never null).
+ *
+ * @template T
+ * @param {T[]} array
+ * @return {T[]}
+ */
+export function clear(array) {
+  if (Array.isArray(array)) {
+    return array.splice(0, array.length);
+  }
+  return [];
+}
+
 export default {
   $indexOf,
   $remove,
+  clear,
   contains,
   containsAll,
   containsAny,
@@ -638,6 +679,7 @@ export default {
   max,
   min,
   move,
+  nullIfEmpty,
   pushAll,
   pushIfDefined,
   pushSet,

package/src/util/objects.js

@@ -693,11 +693,14 @@ export function resolveConstProperty(object, config) {
 /**
  * @param {object} obj
  * @returns {Boolean|undefined}
- *  - true if the obj is empty
+ *  - true if the obj is empty, null or undefined
  *  - false if the obj is not empty
  *  - nothing if the obj is not an object
  */
 export function isEmpty(obj) {
+  if (isNullOrUndefined(obj)) {
+    return true;
+  }
   if (!isPlainObject(obj)) {
     return;
   }

package/src/widget/Widget.js

@@ -524,7 +524,8 @@ export default class Widget {
    * After the animation is executed, the element gets removed using this._removeInternal.
    */
   _removeAnimated() {
-    if (!Device.get().supportsCssAnimation() || !this.$container || this.$container.isDisplayNone()) {
+    let animateRemovalWhileRemovingParent = this._animateRemovalWhileRemovingParent();
+    if ((this.parent.removing && !animateRemovalWhileRemovingParent) || !Device.get().supportsCssAnimation() || !this.$container || this.$container.isDisplayNone()) {
       // Cannot remove animated, remove regularly
       this._removeInternal();
       return;
@@ -544,7 +545,7 @@ export default class Widget {
       if (!this.animateRemovalClass) {
         throw new Error('Missing animate removal class. Cannot remove animated.');
       }
-      if (!this.$container.isVisible() || !this.$container.isEveryParentVisible()) {
+      if (!this.$container.isVisible() || !this.$container.isEveryParentVisible() || !this.$container.isAttached()) {
         // If element is not visible, animationEnd would never fire -> remove it immediately
         this._removeInternal();
         return;
@@ -557,7 +558,14 @@ export default class Widget {
 
     // If the parent is being removed while the animation is running, the animationEnd event will never fire
     // -> Make sure remove is called nevertheless. Important: remove it before the parent is removed to maintain the regular remove order
-    this.parent.one('removing', this._parentRemovingWhileAnimatingHandler);
+    if (!animateRemovalWhileRemovingParent) {
+      this.parent.one('removing', this._parentRemovingWhileAnimatingHandler);
+    }
+  }
+
+  _animateRemovalWhileRemovingParent() {
+    // By default, remove animation is prevented when parent is being removed
+    return false;
   }
 
   _onParentRemovingWhileAnimating() {
@@ -2062,15 +2070,17 @@ export default class Widget {
    * Tries to set the focus on the widget.
    * <p>
    * By default the focus is set on the container but this may vary from widget to widget.
+   *
+   * @param {object} [options]
+   * @param {boolean} [options.preventScroll] prevents scrolling to new focused element (defaults to false)
    * @returns {boolean} true if the element could be focused, false if not
    */
-  focus() {
+  focus(options) {
     if (!this.rendered) {
-      this.session.layoutValidator.schedulePostValidateFunction(this.focus.bind(this));
+      this.session.layoutValidator.schedulePostValidateFunction(this.focus.bind(this, options));
       return false;
     }
-
-    return this.session.focusManager.requestFocus(this.getFocusableElement());
+    return this.session.focusManager.requestFocus(this.getFocusableElement(), null, options);
   }
 
   /**