@singularsystems/neo-react 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/ReactComponents/DropDown/AutoCompleteDropDown.d.ts

@@ -46,8 +46,9 @@ interface IAutoCompleteCommonProps<T> extends ICommonEditorProps, Props<IOption,
     /**
      * Callback which fires when an item is selected.
      * The removedItem parameter will be provided when removing an item from a multi select drop down.
+     * The addedItem parameter will be provided when an item is selected in a multi select drop down. This is the item stored in the bindItems list.
      */
-    onItemSelected?: (item?: T, removedItem?: Model.ISelectedItem) => void;
+    onItemSelected?: (item?: T, removedItem?: Model.ISelectedItem, addedItem?: Model.ISelectedItem) => void;
     /**
      * Millisecond delay from the last typed character, to when the itemSource function is called.
      * Default is 500ms.

package/dist/ReactComponents/DropDown/AutoCompleteDropDown.js

@@ -78,12 +78,13 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
             // Multi select
             var itemList = itemsProperty.value;
             if (action.action === "select-option") {
-                itemList.push({ id: action.option.value, display: action.option.label });
+                var newItem = { id: action.option.value, display: action.option.label };
+                itemList.push(newItem);
                 if (this.bindIdsList) {
                     this.bindIdsList.push(action.option.value);
                 }
                 if (onItemSelected) {
-                    onItemSelected((_a = action.option) === null || _a === void 0 ? void 0 : _a.item);
+                    onItemSelected((_a = action.option) === null || _a === void 0 ? void 0 : _a.item, undefined, newItem);
                 }
             }
             else if (action.action === "remove-value") {
@@ -132,15 +133,25 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
         var bindDisplayProperty = bindDisplay;
         var displayInfo = this.bindProperty.validator.getDisplayState(this.context.validationDisplayMode);
         displayInfo.applyToDom(nativeProps, this.context.parentType !== EditorParentType.FormGroup);
-        this.displayMember = (_a = this.props.displayMember) !== null && _a !== void 0 ? _a : "";
-        this.valueMember = (_b = this.props.valueMember) !== null && _b !== void 0 ? _b : "";
+        if (!this.displayMember) {
+            this.displayMember = (_a = this.props.displayMember) !== null && _a !== void 0 ? _a : "";
+        }
+        if (!this.valueMember) {
+            this.valueMember = (_b = this.props.valueMember) !== null && _b !== void 0 ? _b : "";
+        }
         var defaultItems = undefined;
         if (this.props.items) {
             var items_1 = this.getItems(this.props.items);
+            defaultItems = this.mapTArrayToOptions(items_1);
             if (this.props.filterPredicate !== undefined) {
-                items_1 = items_1.filter(this.props.filterPredicate);
+                if (bindValue) {
+                    // Dont filter out the current selected item even if excluded by the filter.
+                    defaultItems = defaultItems.filter(function (option) { return bindValue.value === option.value || _this.props.filterPredicate(option.item); });
+                }
+                else {
+                    defaultItems = defaultItems.filter(function (option) { return _this.props.filterPredicate(option.item); });
+                }
             }
-            defaultItems = this.mapTArrayToOptions(items_1);
             if (descriptionMember === undefined && items_1.length > 0) {
                 if (EnumHelper.isEnumItem(items_1[0])) {
                     descriptionMember = "description";

package/dist/ReactComponents/Tabs/TabContainer.js

@@ -1,7 +1,6 @@
 import { __assign, __extends, __rest } from "tslib";
 import React from "react";
 import { Components, Utils } from "@singularsystems/neo-core";
-import { ObservableValue } from "@singularsystems/neo-core/dist/Model/ObservableValue";
 import { TabManager } from './TabManager';
 var TabContextParams = /** @class */ (function () {
     function TabContextParams() {
@@ -18,9 +17,7 @@ export var TabContext = React.createContext(new TabContextParams());
 var TabContainer = /** @class */ (function (_super) {
     __extends(TabContainer, _super);
     function TabContainer(props) {
-        var _this = this;
-        var _a;
-        _this = _super.call(this, props) || this;
+        var _this = _super.call(this, props) || this;
         _this.tabContext = new TabContextParams();
         var tabManager;
         if (_this.props.tabManager) {
@@ -28,8 +25,7 @@ var TabContainer = /** @class */ (function (_super) {
             _this.tabContext.isUserTabManager = true;
         }
         else {
-            tabManager = new TabManager("", true);
-            tabManager.observable = (_a = _this.props.selectedTab) !== null && _a !== void 0 ? _a : new ObservableValue("");
+            tabManager = new TabManager("", true, _this.props.selectedTab);
         }
         _this.tabManager = tabManager;
         _this.tabContext.tabManager = _this.tabManager;

package/dist/ReactComponents/Tabs/TabManager.d.ts

@@ -22,13 +22,14 @@ export interface ITabManagerInternal extends ITabManager {
  */
 export declare class TabManager<T extends string = string> {
     private autoSelectFirstTab;
-    observable: Model.ObservableValue<T>;
+    private reactionDisposer;
+    observable: Model.IObservableValue<T>;
     /**
      * Creates a tab manager used to bind to a tab container.
      * @param selectedTab Initially selected tab.
      * @param autoSelectFirstTab Set to true if the first child tab should become selected.
      */
-    constructor(selectedTab?: T, autoSelectFirstTab?: boolean);
+    constructor(selectedTab?: T, autoSelectFirstTab?: boolean, observable?: Model.IObservableValue<T>);
     /** Called by tab container. */
     private initialise;
     /** Called by tab container. */
@@ -43,6 +44,7 @@ export declare class TabManager<T extends string = string> {
      * Registers a callback to run whenever the tab with this tab key is displayed.
      */
     onTabDisplayed(tabKey: T, callback: () => void): this;
+    /** Called by tab container. */
     private tabMounted;
     private getTab;
     /**

package/dist/ReactComponents/Tabs/TabManager.js

@@ -1,4 +1,5 @@
 import { Model } from '@singularsystems/neo-core';
+import { reaction } from "mobx";
 import { CancellableEvent } from '../Misc';
 /**
  * Tab manager used to manage a tab component.
@@ -10,14 +11,20 @@ var TabManager = /** @class */ (function () {
      * @param selectedTab Initially selected tab.
      * @param autoSelectFirstTab Set to true if the first child tab should become selected.
      */
-    function TabManager(selectedTab, autoSelectFirstTab) {
+    function TabManager(selectedTab, autoSelectFirstTab, observable) {
         if (selectedTab === void 0) { selectedTab = ""; }
         if (autoSelectFirstTab === void 0) { autoSelectFirstTab = false; }
+        var _this = this;
         this.autoSelectFirstTab = autoSelectFirstTab;
-        this.observable = new Model.ObservableValue("");
         this.tabs = {};
-        this.observable.value = selectedTab;
+        if (observable) {
+            this.observable = observable;
+        }
+        else {
+            this.observable = new Model.ObservableValue(selectedTab);
+        }
         this.onTabChanged = this.onTabChanged.bind(this);
+        this.reactionDisposer = reaction(function () { return _this.observable.value; }, function () { return _this.onTabChanged(); });
     }
     /** Called by tab container. */
     TabManager.prototype.initialise = function () {
@@ -27,6 +34,7 @@ var TabManager = /** @class */ (function () {
     };
     /** Called by tab container. */
     TabManager.prototype.destroy = function () {
+        this.reactionDisposer();
     };
     Object.defineProperty(TabManager.prototype, "selectedTab", {
         get: function () {
@@ -50,7 +58,6 @@ var TabManager = /** @class */ (function () {
                 }
                 cancellableEvent.tryRunAction(function () {
                     _this.observable.value = value;
-                    _this.onTabChanged();
                 });
             }
         },
@@ -73,6 +80,7 @@ var TabManager = /** @class */ (function () {
         tab.onDisplayed = callback;
         return this;
     };
+    /** Called by tab container. */
     TabManager.prototype.tabMounted = function (tabKey, onLeave) {
         var tab = this.getTab(tabKey, true);
         tab.onLeave = onLeave;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",