gd-bs 6.6.40 → 6.6.42

package/build/components/form/control.js

@@ -625,8 +625,15 @@ var FormControl = /** @class */ (function () {
         if (this._el) {
             // See if this is a row
             if (this._el.parentElement && this._el.parentElement.parentElement && this._el.parentElement.parentElement.classList.contains("row")) {
-                // Hide the row element
-                this._el.parentElement.parentElement.classList.add("d-none");
+                // See if there are other controls in this row
+                if (this._el.parentElement.parentElement.querySelectorAll(".col").length > 1) {
+                    // Hide the column element
+                    this._el.parentElement.classList.add("d-none");
+                }
+                else {
+                    // Hide the row element
+                    this._el.parentElement.parentElement.classList.add("d-none");
+                }
             }
             // Else, ensure the parent element exists
             else if (this._el.parentElement) {
@@ -727,8 +734,15 @@ var FormControl = /** @class */ (function () {
         if (this._el) {
             // See if this is a row
             if (this._el.parentElement && this._el.parentElement.parentElement && this._el.parentElement.parentElement.classList.contains("row")) {
-                // Show the row element
-                this._el.parentElement.parentElement.classList.remove("d-none");
+                // See if there are other controls in this row
+                if (this._el.parentElement.parentElement.querySelectorAll(".col").length > 1) {
+                    // Show the column element
+                    this._el.parentElement.classList.remove("d-none");
+                }
+                else {
+                    // Show the row element
+                    this._el.parentElement.parentElement.classList.remove("d-none");
+                }
             }
             // Else, ensure the parent element exists
             else if (this._el.parentElement) {

package/build/components/navbar/index.js

@@ -52,18 +52,36 @@ var _Navbar = /** @class */ (function (_super) {
     }
     // Configure the card group
     _Navbar.prototype.configure = function (itemTemplate) {
-        // See if there is a brand
-        var brand = this.el.querySelector(".navbar-brand");
-        if (brand) {
-            if (this.props.brand) {
+        // See if we are applying a brand
+        if (this.props.brand) {
+            var elBrand = this.el.querySelector("span.navbar-brand");
+            var elBrandLink = this.el.querySelector("a.navbar-brand");
+            // See if we are using a link
+            if (this.props.brandUrl || this.props.onClickBrand) {
+                // Remove the element
+                elBrand ? elBrand.parentElement.removeChild(elBrand) : null;
                 // Update the brand
-                this.props.brandUrl ? brand.href = this.props.brandUrl : null;
+                elBrandLink ? elBrandLink.href = this.props.brandUrl : null;
                 // Append the content
-                (0, common_1.appendContent)(brand, this.props.brand);
+                (0, common_1.appendContent)(elBrandLink, this.props.brand);
             }
             else {
-                // Remove the brand
-                brand.parentNode.removeChild(brand);
+                // Remove the link element
+                elBrandLink ? elBrandLink.parentElement.removeChild(elBrandLink) : null;
+                // Append the content
+                (0, common_1.appendContent)(elBrand, this.props.brand);
+            }
+        }
+        else {
+            // Remove the brand link
+            var elBrandLink = this.el.querySelector("a.navbar-brand");
+            if (elBrandLink) {
+                elBrandLink.parentNode.removeChild(elBrandLink);
+            }
+            // Remove the brand element
+            var elBrand = this.el.querySelector("span.navbar-brand");
+            if (elBrand) {
+                elBrand.parentNode.removeChild(elBrand);
             }
         }
         // Update the nav bar

package/build/components/navbar/templates.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTMLItemButton = exports.HTMLItem = exports.HTML = void 0;
 // Navbar
-exports.HTML = "\n<nav class=\"navbar navbar-expand-lg\">\n    <div class=\"container-fluid\">\n        <a class=\"navbar-brand\" href=\"#\"></a>\n        <button class=\"navbar-toggler\" type=\"button\" data-bs-toggle=\"collapse\" aria-expanded=\"false\"\n            aria-label=\"Toggle Navigation\">\n            <span class=\"navbar-toggler-icon\"></span>\n        </button>\n        <div class=\"collapse navbar-collapse\">\n            <ul class=\"navbar-nav me-auto mb-2 mb-lg-0\"></ul>\n            <ul class=\"navbar-nav ms-auto mb-2 mb-lg-0\"></ul>\n        </div>\n        <form class=\"d-flex mb-2 mb-lg-0\">\n            <input class=\"form-control lh-1 me-1\" type=\"search\" placeholder=\"Search\" aria-label=\"Search\" />\n            <button class=\"btn\" type=\"submit\">Search</button>\n        </form>\n    </div>\n</nav>".trim();
+exports.HTML = "\n<nav class=\"navbar navbar-expand-lg\">\n    <div class=\"container-fluid\">\n        <a class=\"navbar-brand\" href=\"#\"></a>\n        <span class=\"navbar-brand mb-0 h1\"></span>\n        <button class=\"navbar-toggler\" type=\"button\" data-bs-toggle=\"collapse\" aria-expanded=\"false\"\n            aria-label=\"Toggle Navigation\">\n            <span class=\"navbar-toggler-icon\"></span>\n        </button>\n        <div class=\"collapse navbar-collapse\">\n            <ul class=\"navbar-nav me-auto mb-2 mb-lg-0\"></ul>\n            <ul class=\"navbar-nav ms-auto mb-2 mb-lg-0\"></ul>\n        </div>\n        <form class=\"d-flex mb-2 mb-lg-0\">\n            <input class=\"form-control lh-1 me-1\" type=\"search\" placeholder=\"Search\" aria-label=\"Search\" />\n            <button class=\"btn\" type=\"submit\">Search</button>\n        </form>\n    </div>\n</nav>".trim();
 // Item
 exports.HTMLItem = "\n<li class=\"nav-item\">\n    <a class=\"nav-link\" href=\"#\" role=\"link\">\n        <span class=\"visually-hidden\">(current)</span>\n    </a>\n</li>".trim();
 // Item