gd-bs 6.6.8 → 6.6.10

package/build/components/checkboxGroup/index.js

@@ -82,6 +82,8 @@ var _CheckboxGroup = /** @class */ (function (_super) {
         }
         // Render the checkboxes
         this.renderItems();
+        // Set the value
+        this.setValue(this.props.value);
     };
     // Configure the events
     _CheckboxGroup.prototype.configureEvents = function (item) {
@@ -129,14 +131,6 @@ var _CheckboxGroup = /** @class */ (function (_super) {
                 label: this.props.label || ""
             });
         }
-        // See if this is a single checkbox
-        if (this.props.multi != true && items.length > 0) {
-            // See if this checkbox should be checked
-            if (typeof (this.props.value) === "boolean" && this.props.value) {
-                // Select the item
-                items[0].isSelected = true;
-            }
-        }
         // Parse the items
         for (var i = 0; i < items.length; i++) {
             var item = items[i];
@@ -185,6 +179,15 @@ var _CheckboxGroup = /** @class */ (function (_super) {
     // Method to set the value
     // Sets the dropdown value
     _CheckboxGroup.prototype.setValue = function (value) {
+        // See if this is a single checkbox
+        if (this.props.multi != true && this._checkboxes.length == 1) {
+            // See if this checkbox should be checked
+            if (typeof (value) === "boolean" && value) {
+                // Select the item
+                this._checkboxes[0].isChecked ? null : this._checkboxes[0].toggle();
+            }
+            return;
+        }
         // Ensure it's an array
         var values = value ? (typeof (value.length) === "number" && typeof (value) !== "string" ? value : [value]) : [];
         // Parse the items

package/build/components/dropdown/index.js

@@ -377,6 +377,64 @@ var _Dropdown = /** @class */ (function (_super) {
             }
         }
     };
+    // Generates the checkbox items
+    _Dropdown.prototype.generateCheckboxItems = function () {
+        var cbItems = [];
+        // Parse the items
+        var items = this.props.items || [];
+        for (var i = 0; i < items.length; i++) {
+            var item = items[i];
+            // Create the checkbox item
+            cbItems.push({
+                data: item,
+                isDisabled: item.isDisabled,
+                isSelected: item.isSelected,
+                label: item.text,
+                onChange: item.onClick,
+                type: checkboxGroup_1.CheckboxGroupTypes.Checkbox
+            });
+        }
+        // Return the items
+        return cbItems;
+    };
+    // Generates the checkbox value
+    _Dropdown.prototype.generateCheckboxValue = function (currentValues) {
+        var _a;
+        var values = [];
+        // Ensure a value exists
+        if (currentValues == null) {
+            return values;
+        }
+        // Ensure it's an array
+        if (typeof (currentValues) === "string") {
+            // Make it an array
+            currentValues = [currentValues];
+        }
+        var _loop_1 = function (i) {
+            var value = currentValues[i];
+            // Find the item
+            var item = (_a = this_1.props.items) === null || _a === void 0 ? void 0 : _a.find(function (item) {
+                // Match by the text property if the value doesn't exist
+                if (typeof (item.value) === undefined) {
+                    return item.text == value;
+                }
+                // See if the value property matches
+                return item.value == value;
+            });
+            // See if an item was found
+            if (item) {
+                // Add the text property
+                values.push(item.text);
+            }
+        };
+        var this_1 = this;
+        // Parse the current values
+        for (var i = 0; i < currentValues.length; i++) {
+            _loop_1(i);
+        }
+        // Return the values
+        return values;
+    };
     // Renders the items
     _Dropdown.prototype.renderItems = function () {
         var _this = this;
@@ -387,28 +445,13 @@ var _Dropdown = /** @class */ (function (_super) {
         if (menu) {
             // See if we are creating checkboxes
             if (this.props.isCheckbox) {
-                var cbItems = [];
-                // Parse the items
-                var items = this.props.items || [];
-                for (var i = 0; i < items.length; i++) {
-                    var item = items[i];
-                    // Create the checkbox item
-                    cbItems.push({
-                        data: item,
-                        isDisabled: item.isDisabled,
-                        isSelected: item.isSelected,
-                        label: item.text,
-                        onChange: item.onClick,
-                        type: checkboxGroup_1.CheckboxGroupTypes.Checkbox
-                    });
-                }
                 // Render the checkbox
                 this._cb = (0, checkboxGroup_1.CheckboxGroup)({
                     className: "m-2",
                     el: menu,
-                    items: cbItems,
+                    items: this.generateCheckboxItems(),
                     multi: this.props.multi,
-                    value: this.props.value,
+                    value: this.generateCheckboxValue(this.props.value),
                     onChange: this.props.onChange ? function (values, ev) {
                         // Pass the current values
                         _this.props.onChange(_this.getValue(), ev);
@@ -477,7 +520,6 @@ var _Dropdown = /** @class */ (function (_super) {
                 // Add the value
                 values.push(items[i].data);
             }
-            // Return the value
         }
         else {
             // Parse the items
@@ -523,7 +565,7 @@ var _Dropdown = /** @class */ (function (_super) {
         // See if we are rendering checkboxes
         if (this._cb) {
             // Set the items
-            this._cb.setItems(newItems);
+            this._cb.setItems(this.generateCheckboxItems());
             return;
         }
         // Get the menu
@@ -575,8 +617,8 @@ var _Dropdown = /** @class */ (function (_super) {
     _Dropdown.prototype.setType = function (ddlType) {
         // Parse the element types to search for
         var elTypes = ["button", ".dropdown-toggle"];
-        var _loop_1 = function (i) {
-            var el = this_1.el.querySelector(elTypes[i]);
+        var _loop_2 = function (i) {
+            var el = this_2.el.querySelector(elTypes[i]);
             if (el) {
                 // Parse the class names
                 button_1.ButtonClassNames.parse(function (className) {
@@ -588,15 +630,21 @@ var _Dropdown = /** @class */ (function (_super) {
                 className ? el.classList.add(className) : null;
             }
         };
-        var this_1 = this;
+        var this_2 = this;
         for (var i = 0; i < elTypes.length; i++) {
-            _loop_1(i);
+            _loop_2(i);
         }
     };
     // Sets the dropdown value
     _Dropdown.prototype.setValue = function (value) {
         // Ensure it's an array
         var values = value == null ? [] : (typeof (value.length) === "number" && typeof (value) !== "string" ? value : [value]);
+        // See if this is a checkbox
+        if (this._cb) {
+            // Set the value
+            this._cb.setValue(this.generateCheckboxValue(value));
+            return;
+        }
         // Parse the items
         for (var i = 0; i < this._items.length; i++) {
             var item = this._items[i];