@eclipse-scout/core 22.0.0 → 22.0.10

package/src/form/fields/datefield/DateField.js

@@ -8,29 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {
-  arrays,
-  DateFormat,
-  DatePickerPopup,
-  DatePredictionFailedStatus,
-  dates,
-  DateTimeCompositeLayout,
-  Device,
-  fields,
-  focusUtils,
-  FormField,
-  HtmlComponent,
-  InputFieldKeyStrokeContext,
-  keys,
-  objects,
-  ParsingFailedStatus,
-  scout,
-  Status,
-  strings,
-  styles,
-  TimePickerPopup,
-  ValueField
-} from '../../../index';
+import {arrays, DateFormat, DatePickerPopup, DatePredictionFailedStatus, dates, DateTimeCompositeLayout, Device, fields, focusUtils, FormField, HtmlComponent, InputFieldKeyStrokeContext, keys, objects, ParsingFailedStatus, scout, Status, strings, styles, TimePickerPopup, ValueField} from '../../../index';
 import $ from 'jquery';
 
 export default class DateField extends ValueField {
@@ -695,7 +673,7 @@ export default class DateField extends ValueField {
   }
 
   _renderDateClearable() {
-    if (this.hasDate || this.isClearable()) {
+    if (this.hasDate && this.isClearable()) {
       if (!this.$dateClearIcon) {
         // date clear icon
         this.$dateClearIcon = this.$field.appendSpan('icon date-clear unfocusable text-field-icon action')
@@ -711,14 +689,18 @@ export default class DateField extends ValueField {
   }
 
   _renderTimeClearable() {
-    if (this.hasTime && this.isClearable() && !this.$timeClearIcon) {
-      // date clear icon
-      this.$timeClearIcon = this.$field.appendSpan('icon time-clear unfocusable text-field-icon action')
-        .on('mousedown', this._onTimeClearIconMouseDown.bind(this));
-    } else if ((!this.hasTime || !this.isClearable()) && this.$timeClearIcon) {
-      // Remove $dateField
-      this.$timeClearIcon.remove();
-      this.$timeClearIcon = null;
+    if (this.hasTime && this.isClearable()) {
+      if (!this.$timeClearIcon) {
+        // time clear icon
+        this.$timeClearIcon = this.$field.appendSpan('icon time-clear unfocusable text-field-icon action')
+          .on('mousedown', this._onTimeClearIconMouseDown.bind(this));
+      }
+    } else {
+      if (this.$timeClearIcon) {
+        // Remove clear icon
+        this.$timeClearIcon.remove();
+        this.$timeClearIcon = null;
+      }
     }
   }
 
@@ -1192,21 +1174,19 @@ export default class DateField extends ValueField {
   }
 
   _onDatePickerDateSelect(event) {
-    this._setDateValid(true);
-    this._setTimeValid(true);
-    let newValue = this._newTimestampAsDate(event.date, this.value);
-    this.setValue(newValue);
-    this.closePopup();
-    this._triggerAcceptInput();
+    this._setNewDateTimeValue(this._newTimestampAsDate(event.date, this.value));
   }
 
   _onTimePickerTimeSelect(event) {
+    this._setNewDateTimeValue(this._newTimestampAsDate(this.value, event.time));
+  }
+
+  _setNewDateTimeValue(newValue) {
     this._setDateValid(true);
     this._setTimeValid(true);
-    let newValue = this._newTimestampAsDate(this.value, event.time);
     this.setValue(newValue);
-    this.closePopup();
     this._triggerAcceptInput();
+    this.closePopup();
   }
 
   _createPredictionField($inputField) {
@@ -1385,10 +1365,12 @@ export default class DateField extends ValueField {
     this.popup = this.createDatePopup();
     this.popup.open();
     this.$dateField.addClass('focused');
-    this.popup.on('remove', event => {
-      this._onPopupRemove(event);
-      this.popup = null;
+    this.popup.one('destroy', event => {
+      // Removing the class must happen before _onPopupDestroy() is called, otherwise the date field no longer exists,
+      // because in touch mode _onPopupDestroy() destroys the date field.
       this.$dateField.removeClass('focused');
+      this._onPopupDestroy(event);
+      this.popup = null;
     });
     this.getDatePicker().on('dateSelect', this._onDatePickerDateSelect.bind(this));
   }
@@ -1416,10 +1398,12 @@ export default class DateField extends ValueField {
     this.popup = this.createTimePopup();
     this.popup.open();
     this.$timeField.addClass('focused');
-    this.popup.on('remove', event => {
-      this._onPopupRemove(event);
-      this.popup = null;
+    this.popup.one('destroy', event => {
+      // Removing the class must happen before _onPopupDestroy() is called, otherwise the date field no longer exists,
+      // because in touch mode _onPopupDestroy() destroys the date field.
       this.$timeField.removeClass('focused');
+      this._onPopupDestroy(event);
+      this.popup = null;
     });
     this.getTimePicker().on('timeSelect', this._onTimePickerTimeSelect.bind(this));
   }
@@ -1686,7 +1670,7 @@ export default class DateField extends ValueField {
     }
   }
 
-  _onPopupRemove(event) {
+  _onPopupDestroy(event) {
     if (!this.touchMode || !this._cellEditorPopup) {
       return;
     }

package/src/form/fields/filechooserfield/FileChooserFieldBrowseKeyStroke.js

@@ -19,9 +19,7 @@ export default class FileChooserFieldBrowseKeyStroke extends KeyStroke {
     this.stopPropagation = true;
 
     this.renderingHints.hAlign = HAlign.LEFT;
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
-      return this.field.$fieldContainer;
-    }.bind(this);
+    this.renderingHints.$drawingArea = ($drawingArea, event) => this.field.$fieldContainer;
   }
 
   /**

package/src/form/fields/filechooserfield/FileChooserFieldDeleteKeyStroke.js

@@ -20,9 +20,7 @@ export default class FileChooserFieldDeleteKeyStroke extends KeyStroke {
 
     this.renderingHints.offset = 25;
     this.renderingHints.hAlign = HAlign.RIGHT;
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
-      return this.field.$fieldContainer;
-    }.bind(this);
+    this.renderingHints.$drawingArea = ($drawingArea, event) => this.field.$fieldContainer;
   }
 
   /**

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

@@ -42,6 +42,7 @@ export default class GroupBox extends CompositeField {
     this.processButtons = [];
     this.processMenus = [];
     this.staticMenus = [];
+    this.selectionKeystroke = null;
     this.responsive = null;
 
     this.$header = null;
@@ -162,12 +163,12 @@ export default class GroupBox extends CompositeField {
       render: () => true,
       offset: 0,
       hAlign: HAlign.RIGHT,
-      $drawingArea: function($drawingArea, event) {
-        if (this.labelVisible) {
+      $drawingArea: ($drawingArea, event) => {
+        if (this.$header && this.$header.isVisible()) {
           return this.$header;
         }
         return this.$body;
-      }.bind(this)
+      }
     };
 
     keyStrokes
@@ -360,14 +361,11 @@ export default class GroupBox extends CompositeField {
     this.$container.toggleClass('has-scroll-shadow-bottom', hasScrollShadowBottom);
     if ((headerVisible || hasMenubarTop) && oldHasScrollShadowTop !== hasScrollShadowTop
       || hasMenubarBottom && oldHasScrollShadowBottom !== hasScrollShadowBottom) {
-      this.invalidateLayout();
+      this.invalidateLayoutTree(false);
     }
 
     // Enlarge header line if there is a shadow, but don't do it if there is a menubar on top
     fields.adjustStatusPositionForScrollShadow(this, () => hasScrollShadowTop && headerVisible && !hasMenubarTop);
-
-    // Prevent flickering of status icon
-    this.validateLayout();
   }
 
   setMainBox(mainBox) {
@@ -782,9 +780,16 @@ export default class GroupBox extends CompositeField {
   }
 
   _onControlClick(event) {
-    if (this.expandable) {
-      this.setExpanded(!this.expanded);
+    if (!this.expandable) {
+      return;
     }
+    const target = scout.widget(event.target);
+    if (this.menuBarPosition === GroupBox.MenuBarPosition.TITLE && this.menuBar.has(target)) {
+      // If the position of the menubar is set to title and a menu has been clicked, then the event must not be handled
+      return;
+    }
+
+    this.setExpanded(!this.expanded);
     $.suppressEvent(event); // otherwise, the event would be triggered twice sometimes (by group-box-control and group-box-title)
   }
 

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

@@ -120,6 +120,7 @@
     vertical-align: middle;
     padding: @group-box-title-padding-top 0 @group-box-title-padding-bottom 0;
     max-width: 100%;
+    margin-top: @text-margin-top;
 
     .group-box.has-sub-label > & {
       padding-bottom: @group-box-title-with-sub-label-padding-bottom;

package/src/form/fields/htmlfield/HtmlField.less

@@ -19,7 +19,6 @@
 
   & > .field {
     margin-left: @mandatory-indicator-width;
-    overflow: hidden;
 
     &:focus {
       outline: none;

package/src/form/fields/listbox/ListBox.js

@@ -1,14 +1,14 @@
 /*
- * 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
- * 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
  */
-import {arrays, ListBoxLayout, LookupBox, scout, Table, ValueField} from '../../../index';
+import {arrays, ListBoxLayout, LookupBox, scout, Table} from '../../../index';
 
 export default class ListBox extends LookupBox {
 
@@ -17,7 +17,6 @@ export default class ListBox extends LookupBox {
 
     this.table = null;
     this.lookupStatus = null;
-    this.clearable = ValueField.Clearable.NEVER;
 
     this._addWidgetProperties(['table', 'filterBox']);
   }
@@ -32,6 +31,12 @@ export default class ListBox extends LookupBox {
     if (!this.table) {
       this.table = this._createDefaultListBoxTable();
     }
+
+    // align checkableColumn in table with checkboxes of tree fields
+    if (this.table.checkableColumn) { // may be null if a non-default list-box-table with checkable=false is used
+      this.table.checkableColumn.minWidth = 28;
+      this.table.checkableColumn.width = this.table.checkableColumn.minWidth; // do not use setWidth here
+    }
   }
 
   _render() {
@@ -174,12 +179,13 @@ export default class ListBox extends LookupBox {
     if (lookupRow.enabled === false) {
       row.enabled = false;
     }
-    if (lookupRow.active === false) {
-      row.active = false;
-    }
     if (lookupRow.cssClass) {
       row.cssClass = lookupRow.cssClass;
     }
+    if (lookupRow.active === false) {
+      row.active = false;
+      row.cssClass = (row.cssClass ? (row.cssClass + ' ') : '') + 'inactive';
+    }
 
     return row;
   }

package/src/form/fields/lookupfield/lookupField.js

@@ -1,9 +1,9 @@
 /*
- * 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
- * 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
@@ -25,12 +25,13 @@ export function createTableRow(lookupRow, multipleColumns) {
   if (lookupRow.enabled === false) {
     row.enabled = false;
   }
-  if (lookupRow.active === false) {
-    row.active = false;
-  }
   if (lookupRow.cssClass) {
     row.cssClass = lookupRow.cssClass;
   }
+  if (lookupRow.active === false) {
+    row.active = false;
+    row.cssClass = (row.cssClass ? (row.cssClass + ' ') : '') + 'inactive';
+  }
 
   if (!multipleColumns) {
     cells.push(createTableCell(lookupRow, null, null));

package/src/form/fields/smartfield/ProposalField.js

@@ -189,11 +189,12 @@ export default class ProposalField extends SmartField {
     // this causes a lookup which may fail and open a new proposal chooser (property
     // change for 'result').
     if (searchTextChanged) {
+      this.clearErrorStatus();
       this._acceptByText(sync, searchText);
     } else if (!this._hasUiError()) {
       this._inputAccepted(false);
     } else {
-      // even though there's nothing todo, someone could wait for our promise to be resolved
+      // even though there's nothing to do, someone could wait for our promise to be resolved
       this._acceptInputDeferred.resolve();
     }
 

package/src/form/fields/smartfield/ProposalTreeNode.js

@@ -1,9 +1,9 @@
 /*
- * 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
- * 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
@@ -22,14 +22,10 @@ export default class ProposalTreeNode extends TreeNode {
   }
 
   _renderText() {
-    let text = this.text;
-    if (this.lookupRow.active === false) {
-      text += ' (' + this.session.text('InactiveState') + ')';
-    }
     if (this.htmlEnabled) {
-      this.$text.html(text);
+      this.$text.html(this.text);
     } else {
-      this.$text.textOrNbsp(text);
+      this.$text.textOrNbsp(this.text);
     }
   }
 

package/src/form/fields/smartfield/SmartField.js

@@ -1,31 +1,14 @@
 /*
- * 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
  */
-import {
-  arrays,
-  Device,
-  fields,
-  FormField,
-  InputFieldKeyStrokeContext,
-  keys,
-  LookupCall,
-  objects,
-  QueryBy,
-  scout,
-  SimpleLoadingSupport,
-  SmartFieldCancelKeyStroke,
-  SmartFieldLayout,
-  Status,
-  strings,
-  ValueField
-} from '../../../index';
+import {arrays, Device, fields, FormField, InputFieldKeyStrokeContext, keys, LookupCall, objects, QueryBy, scout, SimpleLoadingSupport, SmartFieldCancelKeyStroke, SmartFieldLayout, Status, strings, ValueField} from '../../../index';
 import $ from 'jquery';
 
 export default class SmartField extends ValueField {
@@ -932,6 +915,7 @@ export default class SmartField extends ValueField {
     });
 
     this.popup.open();
+    this.popup.$container.css('--inactive-lookup-row-suffix-text', `'${this.session.text('InactiveState')}'`);
 
     /* This variable is required to route events to the right field:
      * - in normal mode popup events should be processed by the normal smart-field

package/src/form/fields/smartfield/SmartField.less

@@ -1,9 +1,9 @@
 /*
- * 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
- * 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
@@ -266,13 +266,23 @@
     & > .table-data {
       padding: @proposal-chooser-padding-y @proposal-chooser-padding-x;
 
-      & > .table-row.first {
-        border-top: 1px solid @table-row-border-color;
+      & > .table-row {
+        &.first {
+          border-top: 1px solid @table-row-border-color;
 
-        &.selected::after {
-          // If header is invisible, selection of first row starts at 0
-          // Since we now have a top border we can move it to -1px again to cover the border
-          top: -1px;
+          &.selected::after {
+            // If header is invisible, selection of first row starts at 0
+            // Since we now have a top border we can move it to -1px again to cover the border
+            top: -1px;
+          }
+        }
+
+        &.inactive {
+          font-style: italic;
+
+          & > .table-cell.last > .text::after {
+            content: ' (' var(--inactive-lookup-row-suffix-text) ')';
+          }
         }
       }
 
@@ -286,9 +296,12 @@
     & > .tree-data {
       padding: @proposal-chooser-padding-y @proposal-chooser-padding-x;
 
-      & > .tree-node {
-        &.inactive {
-          font-style: italic;
+      & > .tree-node.inactive,
+      & > .animation-wrapper > .tree-node.inactive {
+        font-style: italic;
+
+        & > .text::after {
+          content: ' (' var(--inactive-lookup-row-suffix-text) ')';
         }
       }
     }

package/src/form/fields/splitbox/SplitBoxCollapseKeyStroke.js

@@ -16,6 +16,7 @@ export default class SplitBoxCollapseKeyStroke extends KeyStroke {
     super();
     this.field = splitBox;
     this.parseAndSetKeyStroke(keyStroke);
+    this.inheritAccessibility = false;
   }
 
   handle(event) {

package/src/form/fields/splitbox/SplitBoxFirstCollapseKeyStroke.js

@@ -16,6 +16,7 @@ export default class SplitBoxFirstCollapseKeyStroke extends KeyStroke {
     super();
     this.field = splitBox;
     this.parseAndSetKeyStroke(keyStroke);
+    this.inheritAccessibility = false;
   }
 
   handle(event) {

package/src/form/fields/splitbox/SplitBoxSecondCollapseKeyStroke.js

@@ -16,6 +16,7 @@ export default class SplitBoxSecondCollapseKeyStroke extends KeyStroke {
     super();
     this.field = splitBox;
     this.parseAndSetKeyStroke(keyStroke);
+    this.inheritAccessibility = false;
   }
 
   handle(event) {