@singularsystems/neo-react 1.2.1 → 1.2.3

package/dist/ReactComponents/Button.js

@@ -61,18 +61,18 @@ var Button = /** @class */ (function (_super) {
     Button.prototype.render = function () {
         var _this = this;
         var _a;
-        var _b = this.props, isSubmit = _b.isSubmit, variant = _b.variant, size = _b.size, isOutline = _b.isOutline, isFlat = _b.isFlat, icon = _b.icon, iconAlignment = _b.iconAlignment, text = _b.text, menuItems = _b.menuItems, splitMenu = _b.splitMenu, menuAlignment = _b.menuAlignment, buttonGroupClassName = _b.buttonGroupClassName, tooltip = _b.tooltip, task = _b.task, isBusy = _b.isBusy, pulse = _b.pulse, customVariant = _b.customVariant, native = __rest(_b, ["isSubmit", "variant", "size", "isOutline", "isFlat", "icon", "iconAlignment", "text", "menuItems", "splitMenu", "menuAlignment", "buttonGroupClassName", "tooltip", "task", "isBusy", "pulse", "customVariant"]);
+        var _b = this.props, isSubmit = _b.isSubmit, variant = _b.variant, size = _b.size, isOutline = _b.isOutline, inline = _b.inline, icon = _b.icon, iconAlignment = _b.iconAlignment, text = _b.text, menuItems = _b.menuItems, splitMenu = _b.splitMenu, menuAlignment = _b.menuAlignment, buttonGroupClassName = _b.buttonGroupClassName, tooltip = _b.tooltip, task = _b.task, isBusy = _b.isBusy, pulse = _b.pulse, customVariant = _b.customVariant, native = __rest(_b, ["isSubmit", "variant", "size", "isOutline", "inline", "icon", "iconAlignment", "text", "menuItems", "splitMenu", "menuAlignment", "buttonGroupClassName", "tooltip", "task", "isBusy", "pulse", "customVariant"]);
         native.type = isSubmit ? "submit" : "button";
         var variantClassName = ((_a = customVariant !== null && customVariant !== void 0 ? customVariant : variant) !== null && _a !== void 0 ? _a : "primary");
         var isLoading = isBusy || (task === null || task === void 0 ? void 0 : task.isBusy);
         var isDropDown = menuItems && menuItems.length;
-        var buttonClasses = "btn btn-" + ((isFlat || isOutline) ? "outline-" : "") + variantClassName;
+        var buttonClasses = "btn btn-" + ((inline || isOutline) ? "outline-" : "") + variantClassName;
         if (size)
             buttonClasses += " btn-" + size;
-        if (isFlat)
-            buttonClasses += " btn-flat";
-        if (isFlat && isOutline)
-            buttonClasses += " btn-outline";
+        if (inline)
+            buttonClasses += " btn-inline";
+        if (inline && isOutline)
+            buttonClasses += " btn-bordered";
         if (isDropDown && !splitMenu) {
             buttonClasses += " dropdown-toggle";
             native.onClick = this.showMenu;

package/dist/ReactComponents/DropDown/AutoCompleteDropDown.js

@@ -131,8 +131,8 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
     };
     AutoCompleteDropDown.prototype.render = function () {
         var _this = this;
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        var _j = this.props, bind = _j.bind, bindDisplay = _j.bindDisplay, bindItems = _j.bindItems, bindIds = _j.bindIds, itemSource = _j.itemSource, items = _j.items, displayMember = _j.displayMember, valueMember = _j.valueMember, descriptionMember = _j.descriptionMember, option = _j.option, noRecordsPrompt = _j.noRecordsPrompt, typeToSearchPrompt = _j.typeToSearchPrompt, delayMs = _j.delayMs, minCharacters = _j.minCharacters, onItemSelected = _j.onItemSelected, fieldInfoLimit = _j.fieldInfoLimit, filterPredicate = _j.filterPredicate, inputFilter = _j.inputFilter, otherProps = __rest(_j, ["bind", "bindDisplay", "bindItems", "bindIds", "itemSource", "items", "displayMember", "valueMember", "descriptionMember", "option", "noRecordsPrompt", "typeToSearchPrompt", "delayMs", "minCharacters", "onItemSelected", "fieldInfoLimit", "filterPredicate", "inputFilter"]);
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _k = this.props, bind = _k.bind, bindDisplay = _k.bindDisplay, bindItems = _k.bindItems, bindIds = _k.bindIds, itemSource = _k.itemSource, items = _k.items, displayMember = _k.displayMember, valueMember = _k.valueMember, descriptionMember = _k.descriptionMember, option = _k.option, noRecordsPrompt = _k.noRecordsPrompt, typeToSearchPrompt = _k.typeToSearchPrompt, delayMs = _k.delayMs, minCharacters = _k.minCharacters, onItemSelected = _k.onItemSelected, fieldInfoLimit = _k.fieldInfoLimit, filterPredicate = _k.filterPredicate, inputFilter = _k.inputFilter, otherProps = __rest(_k, ["bind", "bindDisplay", "bindItems", "bindIds", "itemSource", "items", "displayMember", "valueMember", "descriptionMember", "option", "noRecordsPrompt", "typeToSearchPrompt", "delayMs", "minCharacters", "onItemSelected", "fieldInfoLimit", "filterPredicate", "inputFilter"]);
         this.setBindProperty();
         var splitProps = BindPropsHelper.splitCommonEditorProps(otherProps);
         var nativeProps = splitProps.rest;
@@ -215,9 +215,7 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
             nativeProps.isDisabled = true;
         }
         nativeProps.className = Utils.joinWithSpaces("react-select-bs", nativeProps.className);
-        if (this.context.uniqueId) {
-            nativeProps.inputId = this.context.uniqueId;
-        }
+        nativeProps.inputId = (_g = this.context.uniqueId) !== null && _g !== void 0 ? _g : BindPropsHelper.getUniqueId(this.bindProperty, this);
         var userOnBlur = nativeProps.onBlur;
         nativeProps.onBlur = function (e) {
             _this.bindProperty.validator.hasBlurred = true;
@@ -231,10 +229,10 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
             };
         }
         if (this.props.itemSource !== undefined) {
-            return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.asyncSelectImplementation, __assign({}, nativeProps, { placeholder: (_g = this.props.placeholder) !== null && _g !== void 0 ? _g : "", classNamePrefix: "react-select-bs", defaultOptions: defaultItems, loadOptions: this.onKeyPress, isMulti: bindItems !== undefined, noOptionsMessage: function (c) { var _a, _b; return c.inputValue && c.inputValue.length >= (minCharacters !== null && minCharacters !== void 0 ? minCharacters : 1) ? ((_a = _this.props.noRecordsPrompt) !== null && _a !== void 0 ? _a : "No records found") : ((_b = _this.props.typeToSearchPrompt) !== null && _b !== void 0 ? _b : "Type to search..."); }, value: value, onChange: this.onItemSelected, components: components })), splitProps.editor, { disabled: nativeProps.isDisabled }), nativeProps);
+            return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.asyncSelectImplementation, __assign({}, nativeProps, { placeholder: (_h = this.props.placeholder) !== null && _h !== void 0 ? _h : "", classNamePrefix: "react-select-bs", defaultOptions: defaultItems, loadOptions: this.onKeyPress, isMulti: bindItems !== undefined, noOptionsMessage: function (c) { var _a, _b; return c.inputValue && c.inputValue.length >= (minCharacters !== null && minCharacters !== void 0 ? minCharacters : 1) ? ((_a = _this.props.noRecordsPrompt) !== null && _a !== void 0 ? _a : "No records found") : ((_b = _this.props.typeToSearchPrompt) !== null && _b !== void 0 ? _b : "Type to search..."); }, value: value, onChange: this.onItemSelected, components: components })), splitProps.editor, { disabled: nativeProps.isDisabled }), nativeProps);
         }
         else {
-            return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.selectImplementation, __assign({}, nativeProps, { placeholder: (_h = this.props.placeholder) !== null && _h !== void 0 ? _h : "", classNamePrefix: "react-select-bs", options: defaultItems, isLoading: this.isLoading, isMulti: bindItems !== undefined, noOptionsMessage: function (c) { var _a; return (_a = _this.props.noRecordsPrompt) !== null && _a !== void 0 ? _a : "No records found"; }, value: value, onChange: this.onItemSelected, components: components })), splitProps.editor, { disabled: nativeProps.isDisabled }), nativeProps);
+            return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.selectImplementation, __assign({}, nativeProps, { placeholder: (_j = this.props.placeholder) !== null && _j !== void 0 ? _j : "", classNamePrefix: "react-select-bs", options: defaultItems, isLoading: this.isLoading, isMulti: bindItems !== undefined, noOptionsMessage: function (c) { var _a; return (_a = _this.props.noRecordsPrompt) !== null && _a !== void 0 ? _a : "No records found"; }, value: value, onChange: this.onItemSelected, components: components })), splitProps.editor, { disabled: nativeProps.isDisabled }), nativeProps);
         }
     };
     AutoCompleteDropDown.prototype.getOption = function (content, additionalClass) {

package/dist/ReactComponents/PropTypes.d.ts

@@ -145,6 +145,7 @@ export declare class BindPropsHelper {
     };
     static normaliseContainerProps<T, TContainerDom = React.HTMLProps<T>, TData = any>(component: IComponentBase, props: IEditorContainerProps<T, TData>, inGroup: boolean, isBootstrap?: boolean): IEditorContainerNormalisedProps<TContainerDom, TData>;
     static normaliseEditorProps<T, TDom = React.HTMLProps<T>>(component: IComponentBase, props: (IEditorAndSelectorProps<T, any> & TDom) | IEditorNormalisedProps<TDom, any>): IEditorNormalisedProps<TDom, any>;
+    static getUniqueId(bindProperty: Model.IPropertyInstance, component: IComponentBase): string;
     static getPlaceholderText(placeholder: string | boolean | undefined, property: PropertyInfo): string | undefined;
     static autoSetDomProperties<TDom extends React.HTMLProps<HTMLElement>>(props: IEditorNormalisedProps<TDom, any>, formContext: FormContextParams, componentBlurFn?: (e: React.FocusEvent<HTMLElement>) => void, componentFocusFn?: (e: React.FocusEvent<HTMLElement>) => void): TDom;
     static isReadOnly(editorProps: ICommonEditorProps, formContext: FormContextParams): boolean;

package/dist/ReactComponents/PropTypes.js

@@ -179,7 +179,7 @@ var BindPropsHelper = /** @class */ (function () {
             fileProps: fileProps,
             radioList: radioList,
             inGroup: inGroup,
-            uniqueID: (bindOrDisplay === null || bindOrDisplay === void 0 ? void 0 : bindOrDisplay.uniqueID) + "!" + component.uniqueId,
+            uniqueID: this.getUniqueId(bindOrDisplay, component),
             containerDom: containerDom,
             isBootstrap: isBootstrap
         };
@@ -193,6 +193,9 @@ var BindPropsHelper = /** @class */ (function () {
         }
         return nProps;
     };
+    BindPropsHelper.getUniqueId = function (bindProperty, component) {
+        return (bindProperty === null || bindProperty === void 0 ? void 0 : bindProperty.uniqueID) + "!" + component.uniqueId;
+    };
     BindPropsHelper.getPlaceholderText = function (placeholder, property) {
         if (placeholder === true) {
             return property.readableName;

package/package.json

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