gd-bs 6.6.92 → 6.6.93

package/indexv2.html

@@ -212,7 +212,7 @@
             <bs-form-control label="Last Name:" type="GD.Components.FormControlTypes.TextField"></bs-form-control>
         </row>
         <row>
-            <bs-form-control label="Items:" type="GD.Components.FormControlTypes.Dropdown">
+            <bs-form-control label="Items:" type="GD.Components.FormControlTypes.Dropdown" value="4">
                 <item value="1">Item 1</item>
                 <item value="2">Item 2</item>
                 <item value="3">Item 3</item>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gd-bs",
-    "version": "6.6.92",
+    "version": "6.6.93",
     "description": "Bootstrap JavaScript, TypeScript and Web Components library.",
     "main": "build/index.js",
     "typings": "src/index.d.ts",

package/src/components/custom-element.ts

@@ -65,23 +65,19 @@ export class CustomElement {
                     switch (elChild.nodeName) {
                         // Append the control
                         case "BS-FORM-CONTROL":
-                            //controls.push((new RenderComponents(elChild, true, true)).Props[0]);
+                            controls.push(this.getProps(elChild, "FORM-CONTROL"));
                             break;
 
                         // Append the row
                         case "ROW":
+                            // Get the controls
                             let columns = [];
-                            /*
-                            let rowControls = (new RenderComponents(elChild, true)).Props;
-                            if (rowControls?.length > 0) {
+                            this.getChildItems(elChild, "bs-form-control", "FORM-CONTROL").forEach(control => {
                                 // Append the control
-                                for (let i = 0; i < rowControls.length; i++) {
-                                    columns.push({ control: rowControls[i] });
-                                }
-                            }
-                            */
+                                columns.push({ control });
+                            });
 
-                            // Append the row
+                            // Append the columns to the row
                             rows.push({ columns });
                             break;
 
@@ -110,7 +106,7 @@ export class CustomElement {
                 props.rows = rows.length > 0 ? rows : undefined;
 
                 // Set the controls
-                //props.controls = this.getChildItems(el, "bs-form-control", componentName);
+                props.controls = this.getChildItems(el, "bs-form-control", componentName);
                 props.controls = controls.length > 0 ? controls : undefined;
 
                 // Render the form
@@ -296,9 +292,15 @@ export class CustomElement {
                         case "BS-COL":
                             item.title = (item.title || elItem.innerHTML)?.trim();
                             break;
+                        case "BS-FORM-CONTROL":
+                            item.items = this.getChildItems(elItem, "item", elItem.nodeName);
+                            break;
                         case "CARD-BODY":
                             item.actions = this.getChildItems(elItem, "card-action", elItem.nodeName);
                             break;
+                        case "ITEM":
+                            item.text = (item.text || elItem.innerHTML)?.trim();
+                            break;
                         case "NAVBAR-ITEM":
                             item.items = this.getChildItems(elItem, "navbar-item", componentName);
                             item.text = (item.text || elItem.innerHTML)?.trim();

package/src/components/floating-ui/index.ts

@@ -171,12 +171,12 @@ class _FloatingUI {
 
         // See if we are adding the offset option
         if (this._props.options?.offset) {
-            middleware.push(offset(this._props.options.offset));
+            middleware.push(typeof (this._props.options.offset) === "boolean" ? offset() : offset(this._props.options.offset));
         }
 
         // See if we are adding the auto placement option
         if (this._props.options?.autoPlacement || placement.autoPlacement) {
-            middleware.push(autoPlacement(this._props.options.autoPlacement));
+            middleware.push(typeof (this._props.options.autoPlacement) === "boolean" ? autoPlacement() : autoPlacement(this._props.options.autoPlacement));
         }
         // Else, see if we are adding the flip option
         else if (this._props.options?.flip) {
@@ -185,22 +185,22 @@ class _FloatingUI {
 
         // See if we are adding the hide option
         if (this._props.options?.hide) {
-            middleware.push(hide(this._props.options.hide));
+            middleware.push(typeof (this._props.options.hide) === "boolean" ? hide() : hide(this._props.options.hide));
         }
 
         // See if we are adding the inline option
         if (this._props.options?.inline) {
-            middleware.push(inline(this._props.options.inline));
+            middleware.push(typeof (this._props.options.inline) === "boolean" ? inline() : inline(this._props.options.inline));
         }
 
         // See if we are adding the shift option
         if (this._props.options?.shift) {
-            middleware.push(shift(this._props.options?.shift));
+            middleware.push(typeof (this._props.options.shift) === "boolean" ? shift() : shift(this._props.options?.shift));
         }
 
         // See if we are adding the size option
         if (this._props.options?.size) {
-            middleware.push(size(this._props.options?.size));
+            middleware.push(typeof (this._props.options.size) === "boolean" ? size() : size(this._props.options?.size));
         }
 
         // Return the middle ware
@@ -349,7 +349,7 @@ class _FloatingUI {
                     right: 'left',
                     bottom: 'top',
                     left: 'right'
-                }[middlewareData.offset?.placement || this._options.placement.split('-')[0]]
+                }[(middlewareData.offset?.placement || this._options.placement).split('-')[0]]
 
                 // Update the location
                 Object.assign(this._elArrow.style, {

package/src/components/form/formTypes.d.ts

@@ -161,11 +161,11 @@ export interface IFormProps extends IBaseProps<IForm> {
     controls?: Array<IFormControlProps>;
     groupClassName?: string;
     isFloating?: boolean;
-    rowClassName?: string;
-    rows?: Array<IFormRow>;
     onControlRendering?: (control: IFormControlProps) => void | PromiseLike<IFormControlProps>;
     onControlRendered?: (control: IFormControl) => void | PromiseLike<IFormControl>;
     onRendered?: (controls: Array<IFormControl>) => void;
+    rowClassName?: string;
+    rows?: Array<IFormRow>;
     validationType?: number;
     value?: any;
 }

package/src/index-icons.ts

@@ -8,14 +8,13 @@ import "./ie";
 import * as Components from "./components";
 export { Components }
 
-// Render method
-import { render } from "./render";
-export { render };
-
 // Icons
 import { Icons, IconTypes } from "./icons";
 export { Icons, IconTypes }
 
 // Bootstrap Global library
-const BS = { Components, Icons, IconTypes, render }
-window["GD"] = window["GD"] || BS;
+const BS = { Components, Icons, IconTypes }
+window["GD"] = window["GD"] || BS;
+
+// Custom Elements
+import "./custom-elements.js";

package/src/index.d.ts

@@ -1,6 +1,5 @@
 import * as Components from "./components/components";
-declare var render: (el: HTMLElement) => void;
 
 export {
-    Components, render
+    Components
 }

package/src/index.ts

@@ -8,10 +8,9 @@ import "./ie";
 import * as Components from "./components";
 export { Components }
 
-// Render method
-import { render } from "./render";
-export { render };
-
 // Bootstrap Global library
-const BS = { Components, render }
-window["GD"] = window["GD"] || BS;
+const BS = { Components }
+window["GD"] = window["GD"] || BS;
+
+// Custom Elements
+import "./custom-elements.js";