gd-bs 6.6.36 → 6.6.38

package/build/components/common.js

@@ -53,9 +53,8 @@ var configureParent = function (component, parent) {
 };
 exports.configureParent = configureParent;
 var setClassNames = function (el, className) {
-    if (className === void 0) { className = ""; }
-    // Ensure the element exists
-    if (el) {
+    // Ensure the element and class name exists exists
+    if (el && className) {
         // Set the class names
         var classNames = className.split(' ');
         for (var i = 0; i < classNames.length; i++) {

package/build/components/dropdown/index.js

@@ -184,7 +184,6 @@ var _Dropdown = /** @class */ (function (_super) {
         if (menu) {
             // Add a change event
             menu.addEventListener("change", function (ev) {
-                var values = "";
                 // See if multiple options are allowed
                 if (_this.props.multi == true) {
                     // See if we are selecting the values
@@ -194,8 +193,6 @@ var _Dropdown = /** @class */ (function (_super) {
                             var item = _this._items[i];
                             // Update the flag
                             item.isSelected = item.el.selected;
-                            // Append the value
-                            values = (values ? ", " : "") + (item.props.text || item.props.value);
                         }
                     }
                     // Call the change event
@@ -204,8 +201,6 @@ var _Dropdown = /** @class */ (function (_super) {
                 else {
                     // Get the selected value
                     var selectedValue = (ev.target.value || "").trim();
-                    // Set the selected value
-                    values = selectedValue;
                     // Parse the items
                     for (var i = 0; i < _this._items.length; i++) {
                         var item = _this._items[i];
@@ -228,14 +223,6 @@ var _Dropdown = /** @class */ (function (_super) {
                         }
                     }
                 }
-                // See if we are updating the label
-                if (_this.props.updateLabel) {
-                    // Set the label
-                    var toggle_1 = _this.el.querySelector(".dropdown-toggle");
-                    if (toggle_1) {
-                        toggle_1.innerHTML = values || _this.props.label;
-                    }
-                }
             });
         }
         // Get the toggle
@@ -353,6 +340,20 @@ var _Dropdown = /** @class */ (function (_super) {
                         selectedItem.toggle();
                     }
                 }
+                // See if we are updating the label
+                if (_this.props.updateLabel) {
+                    var selectedItems = _this.getValue();
+                    var selectedValues = [];
+                    for (var i = 0; i < selectedItems.length; i++) {
+                        // Append the value
+                        selectedValues.push(selectedItems[i].text);
+                    }
+                    // Set the label
+                    var toggle = _this.el.querySelector(".dropdown-toggle");
+                    if (toggle) {
+                        toggle.innerHTML = selectedValues.length > 0 ? selectedValues.join(', ') : _this.props.label;
+                    }
+                }
             });
         }
         // Add a click event
@@ -366,6 +367,15 @@ var _Dropdown = /** @class */ (function (_super) {
             }
             // Execute the event
             _this.props.onChange ? _this.props.onChange(_this.getValue(), ev) : null;
+            // See if we are updating the label
+            if (_this.props.updateLabel) {
+                var selectedItem = _this.getValue();
+                // Set the label
+                var toggle = _this.el.querySelector(".dropdown-toggle");
+                if (toggle) {
+                    toggle.innerHTML = selectedItem ? selectedItem.text : _this.props.label;
+                }
+            }
         });
     };
     // Configures the dropdown for a nav bar