@eclipse-scout/core 22.0.0 → 22.0.10

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/FilterSupport.js

@@ -51,7 +51,7 @@ export default class FilterSupport extends WidgetSupport {
       scout.assertParameter('getElementsForFiltering', options.getElementsForFiltering);
       this._getElementsForFiltering = options.getElementsForFiltering;
     }
-    this._getElementText = options.getElementText || ((element) => $(element).text());
+    this._getElementText = options.getElementText || (element => $(element).text());
 
     if (options.createTextFilter) {
       scout.assertParameter('updateTextFilterText', options.updateTextFilterText);

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);
   }
 
   /**