@singularsystems/neo-react 1.0.20 → 1.0.21

package/dist/ReactComponents/Badge.js

@@ -2,17 +2,19 @@ import { __assign, __decorate, __extends, __metadata, __rest } from "tslib";
 import React from 'react';
 import { observer } from 'mobx-react';
 import { Utils } from '@singularsystems/neo-core';
+import BootstrapUtils from "./BootstrapUtils";
 var Badge = /** @class */ (function (_super) {
     __extends(Badge, _super);
     function Badge(props) {
         return _super.call(this, props) || this;
     }
     Badge.prototype.render = function () {
-        var _a;
-        var _b = this.props, text = _b.text, variant = _b.variant, customVariant = _b.customVariant, isLarge = _b.isLarge, isPill = _b.isPill, children = _b.children, domProps = __rest(_b, ["text", "variant", "customVariant", "isLarge", "isPill", "children"]);
-        var variantClassName = "badge badge-".concat(((_a = customVariant !== null && customVariant !== void 0 ? customVariant : variant) !== null && _a !== void 0 ? _a : "primary"));
+        var _a, _b;
+        var _c = this.props, text = _c.text, variant = _c.variant, customVariant = _c.customVariant, isLarge = _c.isLarge, isPill = _c.isPill, children = _c.children, domProps = __rest(_c, ["text", "variant", "customVariant", "isLarge", "isPill", "children"]);
+        var isBsPre5 = BootstrapUtils.isPre5;
+        var variantClassName = isBsPre5 ? "badge badge-".concat(((_a = customVariant !== null && customVariant !== void 0 ? customVariant : variant) !== null && _a !== void 0 ? _a : "primary")) : "badge bg-".concat(((_b = customVariant !== null && customVariant !== void 0 ? customVariant : variant) !== null && _b !== void 0 ? _b : "primary"));
         var largeBadgeClassName = isLarge ? "badge-lg" : "";
-        var pillClassName = isPill ? "badge-pill" : "";
+        var pillClassName = isPill ? (isBsPre5 ? "badge-pill" : "rounded-pill") : "";
         domProps.className = Utils.joinWithSpaces(domProps.className, variantClassName, pillClassName, largeBadgeClassName);
         return (React.createElement("div", __assign({}, domProps), children !== null && children !== void 0 ? children : text));
     };

package/dist/ReactComponents/Card.js

@@ -5,6 +5,7 @@ import { observer } from 'mobx-react';
 import Scrollbar from 'react-custom-scrollbars';
 import Collapsable from './Collapsable';
 import { NeoReactTypes } from '../Modules/Types';
+import { Icon } from "./_Exports";
 var Card = /** @class */ (function (_super) {
     __extends(Card, _super);
     function Card() {
@@ -21,7 +22,8 @@ var Card = /** @class */ (function (_super) {
         var expandState = isExpanded !== null && isExpanded !== void 0 ? isExpanded : this.expandState;
         var expandIndicator = undefined;
         if (isCollapsible) {
-            expandIndicator = React.createElement("i", { onClick: function (e) { return expandState.value = !expandState.value; }, className: "card-expand-indicator fa fa-fw fa-angle-".concat(expandState.value ? "up" : "down") });
+            expandIndicator = React.createElement("span", { className: "card-expand-indicator", onClick: function (e) { expandState.value = !expandState.value; e.stopPropagation(); } },
+                React.createElement(Icon, { fixedWidth: true, name: "fa-angle-".concat(expandState.value ? "up" : "down") }));
             if (expandIconPosition === "right") {
                 if (headerElements) {
                     headerElements = React.createElement(React.Fragment, null,

package/dist/ReactComponents/Icons/MaterialSymbolsFontFactory.js

@@ -81,6 +81,8 @@ var neoFontAwesomeMappings = [
     ["minus-square", "indeterminate_check_box"],
     ["arrow-left", "arrow_back"],
     ["angle-left", "chevron_left"],
+    ["angle-up", "keyboard_arrow_up"],
+    ["angle-down", "keyboard_arrow_down"],
     ["caret-left", "arrow_left"],
     ["trash", "delete"],
     ["user", "person"],

package/dist/ReactComponents/InputHelpers.js

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Misc } from '@singularsystems/neo-core';
 import { NeoReactTypes } from '../Modules/Types';
-import BootstrapUtils from "./BootstrapUtils";
 var InputHelpers = /** @class */ (function () {
     function InputHelpers() {
     }
@@ -10,26 +9,24 @@ var InputHelpers = /** @class */ (function () {
             this.iconFactory = Misc.Globals.appService.get(NeoReactTypes.Components.IconFactory);
         }
         if (props.requiresGroup) {
-            var isBsPre5 = BootstrapUtils.isPre5, isDisabled = domProps.disabled || domProps.readOnly;
+            var isDisabled = domProps.disabled || domProps.readOnly;
             return (React.createElement("div", { className: "input-group" + (isDisabled ? " input-group-disabled" : "") },
-                this.getElement(isBsPre5, "input-group-prepend", inputRef, props.prependText, props.prependIcon, props.prepend),
+                this.getElement("input-group-prepend", inputRef, props.prependText, props.prependIcon, props.prepend),
                 element,
-                this.getElement(isBsPre5, "input-group-append", inputRef, props.appendText, props.appendIcon, props.append)));
+                this.getElement("input-group-append", inputRef, props.appendText, props.appendIcon, props.append)));
         }
         else {
             return element;
         }
     };
-    InputHelpers.getElement = function (isBsPre5, className, inputRef, text, icon, element) {
+    InputHelpers.getElement = function (className, inputRef, text, icon, element) {
         if (!text && !icon && !element) {
             return undefined;
         }
         var innerElement = element ?
             (element instanceof Function ? element() : element) :
             React.createElement("span", { className: "input-group-text", onClick: function () { var _a; return (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); } }, text ? this.iconFactory.textOrIcon(text) : this.iconFactory.getIconComponent(icon));
-        return isBsPre5 ?
-            React.createElement("div", { className: className }, innerElement) :
-            innerElement;
+        return React.createElement("div", { className: className }, innerElement);
     };
     return InputHelpers;
 }());

package/package.json

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

package/styles/Card.scss

@@ -4,8 +4,8 @@
         justify-content: space-between;
         align-items: center;
 
-        .card-header-title i {
-            margin-right: 10px;
+        .card-header-title .neo-icon {
+            margin-right: 0.5rem;
         }
 
         .card-header-right-section {
@@ -15,8 +15,6 @@
 
             .card-expand-indicator {
                 margin-left: 0.5rem;
-                padding-top: 0.5rem;
-                padding-bottom: 0.5rem;
             }
         }
     }