@eclipse-scout/core 22.0.0-beta.5 → 22.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/core",
-  "version": "22.0.0-beta.5",
+  "version": "22.0.0",
   "description": "Eclipse Scout runtime",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -26,7 +26,7 @@
     "src"
   ],
   "devDependencies": {
-    "@eclipse-scout/cli": "22.0.0-beta.5",
+    "@eclipse-scout/cli": "22.0.0",
     "@eclipse-scout/releng": "^22.0.0",
     "jasmine-core": "3.10.1",
     "jasmine-ajax": "4.0.0",

package/src/App.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -196,7 +196,7 @@ export default class App {
    */
   _init(options) {
     options = options || {};
-    this.setLoading(true)
+    this.setLoading(true);
     let compatibilityPromise = this._checkBrowserCompatibility(options);
     if (compatibilityPromise) {
       this.setLoading(false);
@@ -224,7 +224,6 @@ export default class App {
 
   _checkBrowserCompatibility(options) {
     let device = Device.get();
-    let app = this;
     $.log.isInfoEnabled() && $.log.info('Detected browser ' + device.browser + ' version ' + device.browserVersion);
     if (!scout.nvl(options.checkBrowserCompatibility, true) || device.isSupportedBrowser()) {
       // No check requested or browser is supported
@@ -400,9 +399,7 @@ export default class App {
 
     // TODO [7.0] cgu improve this, start must not be executed because it currently does a server request
     let desktop = this._createDesktop(session.root);
-    this.trigger('desktopReady', {
-      desktop: desktop
-    });
+    this._triggerDesktopReady(desktop);
     session.render(() => {
       session._renderDesktop();
 
@@ -411,14 +408,24 @@ export default class App {
       session.focusManager.validateFocus();
 
       session.ready = true;
-      this.trigger('sessionReady', {
-        session: session
-      });
+      this._triggerSessionReady(session);
       $.log.isInfoEnabled() && $.log.info('Session initialized. Detected ' + Device.get());
     });
     return $.resolvedPromise();
   }
 
+  _triggerDesktopReady(desktop) {
+    this.trigger('desktopReady', {
+      desktop: desktop
+    });
+  }
+
+  _triggerSessionReady(session) {
+    this.trigger('sessionReady', {
+      session: session
+    });
+  }
+
   _createSession(options) {
     return scout.create('Session', options, {
       ensureUniqueId: false

package/src/desktop/desktoptab/DesktopTab.less

@@ -85,6 +85,20 @@
     }
   }
 
+  &.glasspane-parent {
+    // Modality highlight does not work with pointer-events: none because mouse down is ignored on the glass pane completely by the browser
+    // -> we need to disable the hover effect manually
+    pointer-events: unset;
+
+    &:not(.disabled):not(.selected):hover {
+      background-color: @desktop-tab-background-color;
+    }
+
+    &:not(.selected):hover > .closer {
+      display: none;
+    }
+  }
+
   &.disabled {
     background-color: transparent;
 

package/src/desktop/outline/Outline.js

@@ -1076,42 +1076,12 @@ export default class Outline extends Tree {
     if (desktop.navigation) {
       $elements.push(desktop.navigation.$body);
     }
-    if (desktop.bench && element instanceof Form && element.displayHint === Form.DisplayHint.VIEW) {
-      arrays.pushAll($elements, this._getBenchGlassPaneTargetsForView(element));
-    }
     if (desktop.bench && desktop.bench.outlineContent) {
       arrays.pushAll($elements, desktop.bench.outlineContent.glassPaneTargets(element));
     }
     return $elements;
   }
 
-  _getBenchGlassPaneTargetsForView(view) {
-    let $glassPanes = [];
-    $glassPanes = $glassPanes.concat(this._getTabGlassPaneTargetsForView(view, this.session.desktop.header));
-    this.session.desktop.bench.visibleTabBoxes().forEach(function(tabBox) {
-      if (tabBox.hasView(view)) {
-        arrays.pushAll($glassPanes, this._getTabGlassPaneTargetsForView(view, tabBox));
-      } else if (tabBox.$container) {
-        $glassPanes.push(tabBox.$container);
-      }
-    }, this);
-    return $glassPanes;
-  }
-
-  _getTabGlassPaneTargetsForView(view, tabBox) {
-    let $glassPanes = [];
-    tabBox.tabArea.tabs.forEach(tab => {
-      if (tab.view !== view && tab.view.displayParent === this) {
-        $glassPanes.push(tab.$container);
-        // Workaround for javascript not being able to prevent hover event propagation:
-        // In case of tabs, the hover selector is defined on the element that is the direct parent
-        // of the glass pane. Under these circumstances, the hover style isn't be prevented by the glass pane.
-        tab.$container.addClass('glasspane-parent');
-      }
-    });
-    return $glassPanes;
-  }
-
   _onGlassPaneMouseDown(glassPaneOwner, $glassPane) {
     let desktop = this.session.desktop;
     if (desktop.navigation) {

package/src/desktop/viewbutton/ViewButtonBox.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 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
@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {Desktop, HtmlComponent, OutlineViewButton, scout, Widget, widgets} from '../../index';
+import {HtmlComponent, OutlineViewButton, scout, Widget, widgets} from '../../index';
 
 export default class ViewButtonBox extends Widget {
 

package/src/form/fields/groupbox/GroupBox.less

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -119,6 +119,7 @@
     display: inline-block;
     vertical-align: middle;
     padding: @group-box-title-padding-top 0 @group-box-title-padding-bottom 0;
+    max-width: 100%;
 
     .group-box.has-sub-label > & {
       padding-bottom: @group-box-title-with-sub-label-padding-bottom;
@@ -135,6 +136,7 @@
       font-size: @sub-title-font-size;
       letter-spacing: @sub-title-letter-spacing;
       color: @sub-title-color;
+      #scout.overflow-ellipsis();
     }
   }
 

package/src/index.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -605,6 +605,7 @@ export {default as FormFieldTile} from './tile/fields/FormFieldTile';
 export {default as FormFieldTileAdapter} from './tile/fields/FormFieldTileAdapter';
 export {default as ButtonTile} from './tile/fields/button/ButtonTile';
 export {default as TileButton} from './tile/fields/button/TileButton';
+export {default as TileHtmlField} from './tile/fields/htmlfield/TileHtmlField';
 export {default as TileTableField} from './tile/fields/tablefield/TileTableField';
 export {default as SimpleTab} from './tabbox/SimpleTab';
 export {default as SimpleTabArea} from './tabbox/SimpleTabArea';

package/src/session/Session.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -422,6 +422,8 @@ export default class Session {
     // Extract client session data without creating a model adapter for it. It is (currently) only used to transport the desktop's adapterId.
     let clientSessionData = this._getAdapterData(data.startupData.clientSession);
     this.desktop = this.getOrCreateWidget(clientSessionData.desktop, this.rootAdapter.widget);
+    App.get()._triggerDesktopReady(this.desktop);
+
     let renderDesktopImpl = function() {
       this._renderDesktop();
 
@@ -443,6 +445,7 @@ export default class Session {
       this._resumeBackgroundJobPolling();
 
       this.ready = true;
+      App.get()._triggerSessionReady(this);
 
       $.log.isInfoEnabled() && $.log.info('Session initialized. Detected ' + Device.get());
       if ($.log.isDebugEnabled()) {

package/src/style/sizes.less

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -26,9 +26,10 @@
 @drop-shadow-blur: 13px;
 @drop-shadow-large-y: 8px;
 @drop-shadow-large-blur: 32px;
-@filter-field-bottom: 6px;
-@filter-field-right: 6px;
+@filter-field-bottom: 8px;
+@filter-field-right: 8px;
 @filter-field-height: @logical-grid-row-height;
+@filter-field-height-dense: @logical-grid-row-height-dense;
 @filter-field-width: 190px;
 @filter-field-min-width: 75px;
 @filter-field-max-width: 60%;

package/src/table/Table.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -2199,7 +2199,7 @@ export default class Table extends Widget {
     let cell, column, predicate;
 
     predicate = function(column) {
-      if (column.guiOnly) {
+      if (!column.isVisible() || column.guiOnly) {
         // does not support tabbing
         return false;
       }
@@ -3056,6 +3056,7 @@ export default class Table extends Widget {
     this.ensureRowRendered(row);
     let popup = column.startCellEdit(row, field);
     this.cellEditorPopup = popup;
+    this.$container.toggleClass('has-cell-editor-popup', !!popup);
     return popup;
   }
 
@@ -3754,7 +3755,7 @@ export default class Table extends Widget {
   addFilter(filter, applyFilter = true) {
     if (filter instanceof TableUserFilter) {
       let previousFilter = this.getFilter(filter.createKey());
-      this.filterSupport.removeFilter(previousFilter);
+      this.filterSupport.removeFilter(previousFilter, false);
     }
 
     let added = this.filterSupport.addFilter(filter, applyFilter);
@@ -5384,6 +5385,9 @@ export default class Table extends Widget {
     let destroyEditor = () => {
       this.cellEditorPopup.destroy();
       this.cellEditorPopup = null;
+      if (this.$container) {
+        this.$container.removeClass('has-cell-editor-popup');
+      }
       if (callback) {
         callback();
       }

package/src/table/Table.less

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -121,20 +121,30 @@
   }
 
   & > .filter-field {
-    --filter-field-max-bottom: calc(~'50% - ' (@filter-field-height + var(--controls-height)) / 2);
+    --filter-field-max-bottom: calc(~'50% - ' (var(--filter-field-height) + var(--controls-height)) / 2);
 
     &:not(.focused).empty {
       --filter-field-max-bottom: calc(~'50% - ' (@filter-field-icon-size + var(--controls-height)) / 2);
     }
 
     .has-menubar.menubar-bottom& {
-      --filter-field-max-bottom: calc(~'50% - ' (@filter-field-height + var(--controls-height)) / 2);
+      --filter-field-max-bottom: calc(~'50% - ' (var(--filter-field-height) + var(--controls-height)) / 2);
       bottom: calc(min(var(--filter-field-bottom), var(--filter-field-max-bottom)) + var(--menubar-height));
 
       &:not(.focused).empty {
         --filter-field-max-bottom: calc(~'50% - ' (@filter-field-icon-size + var(--controls-height)) / 2);
       }
     }
+
+    .has-cell-editor-popup& {
+      opacity: 0;
+      visibility: hidden;
+
+      // start the "fade out" transition right away
+      --filter-field-opacity-transition-delay: 0s;
+      // set visibility to hidden right after the "fade out" transition ends
+      --filter-field-visibility-transition-delay: calc(@filter-field-transition-duration + var(--filter-field-opacity-transition-delay));
+    }
   }
 }
 

package/src/tile/fields/htmlfield/TileHtmlField.js

@@ -0,0 +1,28 @@
+/*
+ * 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
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+import {HtmlField} from '../../../index';
+
+export default class TileHtmlField extends HtmlField {
+
+  constructor() {
+    super();
+  }
+
+  _render() {
+    super._render();
+
+    this.$container.addClass('scrollbar-y-outside');
+  }
+
+  _installScrollbars(options) {
+    return super._installScrollbars($.extend(true, {}, options, {scrollShadow: 'gradient'}));
+  }
+}

package/src/tooltip/Tooltip.less

@@ -17,11 +17,6 @@
   #scout.drop-shadow(@y: 4px, @blur: 6px, @alpha: 5%);
   max-width: 300px;
   white-space: normal;
-
-  &.has-menus {
-    padding-top: 6px;
-    padding-bottom: 6px;
-  }
 }
 
 .tooltip-content {
@@ -37,6 +32,7 @@
     font-weight: @font-weight-bold;
     padding-left: @context-menu-item-padding-left;
     padding-right: @context-menu-item-padding-right;
+    padding-top: @tooltip-padding-y + 6px;
   }
 
   & .small {
@@ -53,6 +49,12 @@
 
 .tooltip-menus {
   position: relative;
+  background-color: inherit; // Necessary if arrow has a border
+  padding-bottom: 6px;
+
+  .no-text > & {
+    padding-top: 6px;
+  }
 
   & > .menu-item {
     display: flex;

package/src/tree/LazyNodeFilter.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 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
@@ -8,27 +8,36 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
+
 export default class LazyNodeFilter {
 
-  constructor(tree) { //
+  constructor(tree) {
     this.tree = tree;
   }
 
   accept(node) {
-    if (!node.expanded && node.parentNode && node.parentNode.expandedLazy && node.parentNode.lazyExpandingEnabled && this.tree.lazyExpandingEnabled) {
-      // if this node is not expanded and parent is lazyExpanding.
-      for (let i = 0; i < this.tree.selectedNodes.length; i++) {
-        let selectedNode = this.tree.selectedNodes[i];
-        // not initialized selected nodes
-        if (typeof selectedNode === 'string') {
-          break;
-        }
-        if (selectedNode === node || selectedNode.isDescendantOf(node)) {
-          return true;
-        }
+    if (node.expanded) {
+      return true;
+    }
+    // not expanded: remove lazy expand marker (forget lazy expanded children)
+    node.childNodes.forEach(child => child._lazyNodeFilterAccepted = false);
+
+    if (!node.parentNode || !node.parentNode.expandedLazy || !node.parentNode.lazyExpandingEnabled || !this.tree.lazyExpandingEnabled) {
+      // no lazy expanding supported
+      return true;
+    }
+
+    // if this node is not expanded and parent is lazyExpanding.
+    for (let i = 0; i < this.tree.selectedNodes.length; i++) {
+      let selectedNode = this.tree.selectedNodes[i];
+      if (typeof selectedNode === 'string') {
+        break;
+      }
+      if (selectedNode == node) {
+        node._lazyNodeFilterAccepted = true;
+        return true;
       }
-      return false;
     }
-    return true;
+    return !!node._lazyNodeFilterAccepted;
   }
 }