@sondor-technology/sondor-components 1.0.1-develop.10 → 1.0.1-develop.11

package/dist/components/form/form-step.d.ts

@@ -2,6 +2,7 @@ import { LitElement } from "lit";
 export declare class StFormStep extends LitElement {
     title: string;
     active: boolean;
+    validate?: () => Promise<boolean> | boolean;
     static styles: import("lit").CSSResult[];
     render(): import("lit-html").TemplateResult<1>;
 }

package/dist/components/form/form-step.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-step.d.ts","sourceRoot":"","sources":["../../../src/components/form/form-step.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAY,MAAM,KAAK,CAAC;AAI1C,qBACa,UAAW,SAAQ,UAAU;IACd,KAAK,SAAM;IACK,MAAM,UAAS;IAEzD,MAAM,CAAC,MAAM,4BAWX;IAEF,MAAM,yCAEL;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,cAAc,EAAE,UAAU,CAAC;KAC5B;CACF"}
+{"version":3,"file":"form-step.d.ts","sourceRoot":"","sources":["../../../src/components/form/form-step.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAY,MAAM,KAAK,CAAC;AAI1C,qBACa,UAAW,SAAQ,UAAU;IACd,KAAK,SAAM;IACK,MAAM,UAAS;IAIzD,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAE5C,MAAM,CAAC,MAAM,4BAWX;IAEF,MAAM,yCAEL;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,cAAc,EAAE,UAAU,CAAC;KAC5B;CACF"}

package/dist/components/form/form-step.js

@@ -35,6 +35,9 @@ __decorate([
 __decorate([
     property({ type: Boolean, reflect: true })
 ], StFormStep.prototype, "active", void 0);
+__decorate([
+    property({ attribute: false })
+], StFormStep.prototype, "validate", void 0);
 StFormStep = __decorate([
     customElement("st-form-step")
 ], StFormStep);

package/dist/components/form/form.d.ts

@@ -1,13 +1,18 @@
-import { LitElement } from "lit";
+import { LitElement, PropertyValues } from "lit";
 export type FormLayout = "vertical" | "horizontal" | "inline";
 export declare class StForm extends LitElement {
     layout: FormLayout;
     loading: boolean;
     error: string;
     private _currentStepIndex;
-    private _stepElements;
     private _formEl;
+    private _modalFooterEl;
+    private get _steps();
     static styles: import("lit").CSSResult[];
+    connectedCallback(): void;
+    disconnectedCallback(): void;
+    updated(changedProperties: PropertyValues<this>): void;
+    private _updateModalFooter;
     private _handleSlotChange;
     private _updateStepVisibility;
     private _validateCurrentContext;

package/dist/components/form/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../src/components/form/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAY,MAAM,KAAK,CAAC;AAK1C,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,QAAQ,CAAC;AAE9D,qBACa,MAAO,SAAQ,UAAU;IACK,MAAM,EAAE,UAAU,CAAc;IAC/B,OAAO,UAAS;IAChC,KAAK,SAAM;IAE5B,OAAO,CAAC,iBAAiB,CAAK;IAGvC,OAAO,CAAC,aAAa,CAAgB;IAEtB,OAAO,CAAC,OAAO,CAAmB;IAEjD,MAAM,CAAC,MAAM,4BAqIX;IAEF,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,qBAAqB;YAOf,uBAAuB;IAuDrC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,gBAAgB;YAkCV,aAAa;IA4B3B,MAAM,yCAiFL;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,SAAS,EAAE,MAAM,CAAC;KACnB;CACF"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../src/components/form/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAa,cAAc,EAAC,MAAM,KAAK,CAAC;AAK1D,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,QAAQ,CAAC;AAE9D,qBACa,MAAO,SAAQ,UAAU;IACK,MAAM,EAAE,UAAU,CAAc;IAC/B,OAAO,UAAS;IAChC,KAAK,SAAM;IAE5B,OAAO,CAAC,iBAAiB,CAAK;IAExB,OAAO,CAAC,OAAO,CAAmB;IAEjD,OAAO,CAAC,cAAc,CAA4B;IAElD,OAAO,KAAK,MAAM,GAEjB;IAED,MAAM,CAAC,MAAM,4BAqIX;IAEO,iBAAiB,SAMzB;IAEQ,oBAAoB,SAM5B;IAEQ,OAAO,CAAC,iBAAiB,EAAE,cAAc,CAAC,IAAI,CAAC,QAGvD;IAED,OAAO,CAAC,kBAAkB;IAmD1B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,qBAAqB;YAQf,uBAAuB;IAiFrC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,gBAAgB;YAkCV,aAAa;IA6B3B,MAAM,yCAsFL;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,SAAS,EAAE,MAAM,CAAC;KACnB;CACF"}

package/dist/components/form/form.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { LitElement, html, css } from "lit";
-import { customElement, property, state, queryAssignedElements, query } from "lit/decorators.js";
+import { customElement, property, state, query } from "lit/decorators.js";
 import { resetStyles } from "../../styles/reset.js";
 let StForm = class StForm extends LitElement {
     constructor() {
@@ -14,43 +14,132 @@ let StForm = class StForm extends LitElement {
         this.loading = false;
         this.error = "";
         this._currentStepIndex = 0;
+        this._modalFooterEl = null;
     }
-    _handleSlotChange() {
-        if (this._stepElements.length > 0) {
+    get _steps() {
+        return Array.from(this.querySelectorAll("st-form-step"));
+    }
+    connectedCallback() {
+        super.connectedCallback();
+        this.updateComplete.then(() => {
             this._updateStepVisibility();
+            this._updateModalFooter();
+        });
+    }
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        if (this._modalFooterEl) {
+            this._modalFooterEl.remove();
+            this._modalFooterEl = null;
         }
     }
+    updated(changedProperties) {
+        super.updated(changedProperties);
+        this._updateModalFooter();
+    }
+    _updateModalFooter() {
+        const modal = this.closest("st-modal");
+        if (modal) {
+            if (!this._modalFooterEl) {
+                this._modalFooterEl = document.createElement("div");
+                this._modalFooterEl.setAttribute("slot", "footer");
+                this._modalFooterEl.style.display = "flex";
+                this._modalFooterEl.style.gap = "var(--st-spacing-md)";
+                this._modalFooterEl.style.width = "100%";
+                this._modalFooterEl.style.justifyContent = "flex-end";
+                this._modalFooterEl.style.alignItems = "center";
+                modal.appendChild(this._modalFooterEl);
+            }
+            const steps = this._steps;
+            const hasSteps = steps.length > 0;
+            const isLastStep = hasSteps ? this._currentStepIndex === steps.length - 1 : true;
+            // Imperative DOM management prevents event listener loss and re-rendering conflicts
+            this._modalFooterEl.innerHTML = "";
+            if (hasSteps && this._currentStepIndex > 0) {
+                const backBtn = document.createElement("st-button");
+                backBtn.setAttribute("variant", "secondary");
+                backBtn.setAttribute("type", "button");
+                if (this.loading)
+                    backBtn.setAttribute("disabled", "");
+                backBtn.textContent = "Back";
+                backBtn.addEventListener("click", (e) => {
+                    e.preventDefault();
+                    this._prevStep();
+                });
+                this._modalFooterEl.appendChild(backBtn);
+            }
+            const submitBtn = document.createElement("st-button");
+            submitBtn.setAttribute("color", "primary");
+            submitBtn.setAttribute("type", "button");
+            if (this.loading)
+                submitBtn.setAttribute("disabled", "");
+            submitBtn.textContent = this.loading ? "Submitting..." : (isLastStep ? "Submit" : "Continue");
+            submitBtn.addEventListener("click", (e) => {
+                e.preventDefault();
+                this._triggerSubmission();
+            });
+            this._modalFooterEl.appendChild(submitBtn);
+        }
+        else if (this._modalFooterEl) {
+            this._modalFooterEl.remove();
+            this._modalFooterEl = null;
+        }
+    }
+    _handleSlotChange() {
+        this._updateStepVisibility();
+        this._updateModalFooter();
+    }
     _updateStepVisibility() {
-        this._stepElements.forEach((step, index) => {
+        const steps = this._steps;
+        steps.forEach((step, index) => {
             step.active = index === this._currentStepIndex;
         });
         this.requestUpdate();
     }
     async _validateCurrentContext() {
-        const scope = this._stepElements.length > 0
-            ? this._stepElements[this._currentStepIndex]
+        const steps = this._steps;
+        const scope = steps.length > 0
+            ? steps[this._currentStepIndex]
             : this;
         let isValid = true;
-        // 1. Validate standard DOM input components
-        const inputs = Array.from(scope.querySelectorAll("*"));
+        const inputs = Array.from(scope.querySelectorAll("st-input, st-select, st-textarea, st-checkbox, st-radio, input, select, textarea"));
         for (const input of inputs) {
+            if (input.hasAttribute("disabled") || input.disabled)
+                continue;
+            let fieldValid = true;
             if (typeof input.checkValidity === "function") {
-                if (!input.checkValidity()) {
-                    if (isValid && typeof input.reportValidity === "function") {
-                        input.reportValidity();
+                fieldValid = input.checkValidity();
+            }
+            else {
+                const isRequired = input.hasAttribute("required") || input.required;
+                if (isRequired) {
+                    const isToggle = input.tagName === "ST-CHECKBOX" || input.tagName === "ST-RADIO";
+                    const val = isToggle ? input.checked : input.value;
+                    if (val === undefined || val === null || val === "" || val === false) {
+                        fieldValid = false;
                     }
-                    isValid = false;
                 }
             }
+            if (!fieldValid) {
+                if (typeof input.reportValidity === "function") {
+                    input.reportValidity();
+                }
+                else if ("invalid" in input) {
+                    input.invalid = true;
+                }
+                if (isValid && typeof input.focus === "function") {
+                    input.focus();
+                }
+                isValid = false;
+            }
         }
-        if (this._stepElements.length === 0 && this._formEl) {
+        if (steps.length === 0 && this._formEl) {
             if (!this._formEl.checkValidity()) {
                 isValid = false;
             }
         }
-        // 2. Execute step-level async/sync validation hook if defined
-        if (isValid && this._stepElements.length > 0) {
-            const currentStep = this._stepElements[this._currentStepIndex];
+        if (isValid && steps.length > 0) {
+            const currentStep = steps[this._currentStepIndex];
             if (typeof currentStep.validate === "function") {
                 try {
                     this.loading = true;
@@ -59,7 +148,7 @@ let StForm = class StForm extends LitElement {
                         isValid = false;
                     }
                 }
-                catch (err) {
+                catch {
                     isValid = false;
                 }
                 finally {
@@ -110,8 +199,9 @@ let StForm = class StForm extends LitElement {
         const isValid = await this._validateCurrentContext();
         if (!isValid)
             return;
-        const hasSteps = this._stepElements.length > 0;
-        const isLastStep = hasSteps ? this._currentStepIndex === this._stepElements.length - 1 : true;
+        const steps = this._steps;
+        const hasSteps = steps.length > 0;
+        const isLastStep = hasSteps ? this._currentStepIndex === steps.length - 1 : true;
         if (hasSteps && !isLastStep) {
             this._currentStepIndex++;
             this._updateStepVisibility();
@@ -126,8 +216,9 @@ let StForm = class StForm extends LitElement {
         }));
     }
     render() {
-        const hasSteps = this._stepElements?.length > 0;
-        const isLastStep = hasSteps ? this._currentStepIndex === this._stepElements.length - 1 : true;
+        const steps = this._steps;
+        const hasSteps = steps.length > 0;
+        const isInModal = !!this.closest("st-modal");
         return html `
       <div class="${hasSteps ? "has-steps" : ""}" aria-busy=${this.loading}>
         ${this.loading
@@ -140,7 +231,7 @@ let StForm = class StForm extends LitElement {
         ${hasSteps
             ? html `
               <div class="progress-nav" role="tablist">
-                ${this._stepElements.map((step, index) => {
+                ${steps.map((step, index) => {
                 const isActive = index === this._currentStepIndex;
                 const isCompleted = index < this._currentStepIndex;
                 return html `
@@ -158,7 +249,7 @@ let StForm = class StForm extends LitElement {
                       </div>
                       <span>${step.title || `Step ${index + 1}`}</span>
                     </div>
-                    ${index < this._stepElements.length - 1
+                    ${index < steps.length - 1
                     ? html ` <div class="step-connector ${isCompleted ? "completed" : ""}"></div> `
                     : ""}
                   `;
@@ -178,29 +269,33 @@ let StForm = class StForm extends LitElement {
         <form @submit=${this._handleSubmit}>
           <slot @slotchange=${this._handleSlotChange}></slot>
 
-          <div class="form-actions">
-            ${hasSteps && this._currentStepIndex > 0
+          ${!isInModal
             ? html `
+                <div class="form-actions">
+                  ${hasSteps && this._currentStepIndex > 0
+                ? html `
+                        <st-button
+                          variant="secondary"
+                          type="button"
+                          @click=${this._prevStep}
+                          ?disabled=${this.loading}
+                        >
+                          Back
+                        </st-button>
+                      `
+                : ""}
+
                   <st-button
-                    variant="secondary"
+                    color="primary"
                     type="button"
-                    @click=${this._prevStep}
+                    @click=${this._triggerSubmission}
                     ?disabled=${this.loading}
                   >
-                    Back
+                    ${this.loading ? "Submitting..." : hasSteps && this._currentStepIndex === steps.length - 1 ? "Submit" : hasSteps ? "Continue" : "Submit"}
                   </st-button>
-                `
+                </div>
+              `
             : ""}
-
-            <st-button
-              color="primary"
-              type="button"
-              @click=${this._triggerSubmission}
-              ?disabled=${this.loading}
-            >
-              ${this.loading ? "Submitting..." : isLastStep ? "Submit" : "Continue"}
-            </st-button>
-          </div>
         </form>
       </div>
     `;
@@ -352,9 +447,6 @@ __decorate([
 __decorate([
     state()
 ], StForm.prototype, "_currentStepIndex", void 0);
-__decorate([
-    queryAssignedElements({ selector: "st-form-step" })
-], StForm.prototype, "_stepElements", void 0);
 __decorate([
     query("form")
 ], StForm.prototype, "_formEl", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sondor-technology/sondor-components",
-  "version": "1.0.1-develop.10",
+  "version": "1.0.1-develop.11",
   "description": "",
   "main": "src/index.js",
   "types": "dist/index.d.ts",

package/src/components/form/form-step.ts

@@ -6,6 +6,10 @@ import {resetStyles} from "../../styles/reset.js";
 export class StFormStep extends LitElement {
   @property({type: String}) title = "";
   @property({type: Boolean, reflect: true}) active = false;
+  
+  // Declare the validate function property (attribute: false prevents reflection of functions to DOM attributes)
+  @property({attribute: false})
+  validate?: () => Promise<boolean> | boolean;
 
   static styles = [
     resetStyles,
@@ -29,4 +33,4 @@ declare global {
   interface HTMLElementTagNameMap {
     "st-form-step": StFormStep;
   }
-}
+}

package/src/components/form/form.ts

@@ -1,5 +1,5 @@
-import {LitElement, html, css} from "lit";
-import {customElement, property, state, queryAssignedElements, query} from "lit/decorators.js";
+import {LitElement, html, css, PropertyValues} from "lit";
+import {customElement, property, state, query} from "lit/decorators.js";
 import {resetStyles} from "../../styles/reset.js";
 import type {StFormStep} from "./form-step.js";
 
@@ -13,11 +13,14 @@ export class StForm extends LitElement {
 
   @state() private _currentStepIndex = 0;
 
-  @queryAssignedElements({selector: "st-form-step"})
-  private _stepElements!: StFormStep[];
-
   @query("form") private _formEl!: HTMLFormElement;
 
+  private _modalFooterEl: HTMLElement | null = null;
+
+  private get _steps(): StFormStep[] {
+    return Array.from(this.querySelectorAll("st-form-step"));
+  }
+
   static styles = [
     resetStyles,
     css`
@@ -153,53 +156,151 @@ export class StForm extends LitElement {
     `,
   ];
 
-  private _handleSlotChange() {
-    if (this._stepElements.length > 0) {
+  override connectedCallback() {
+    super.connectedCallback();
+    this.updateComplete.then(() => {
       this._updateStepVisibility();
+      this._updateModalFooter();
+    });
+  }
+
+  override disconnectedCallback() {
+    super.disconnectedCallback();
+    if (this._modalFooterEl) {
+      this._modalFooterEl.remove();
+      this._modalFooterEl = null;
+    }
+  }
+
+  override updated(changedProperties: PropertyValues<this>) {
+    super.updated(changedProperties);
+    this._updateModalFooter();
+  }
+
+  private _updateModalFooter() {
+    const modal = this.closest("st-modal");
+    if (modal) {
+      if (!this._modalFooterEl) {
+        this._modalFooterEl = document.createElement("div");
+        this._modalFooterEl.setAttribute("slot", "footer");
+        this._modalFooterEl.style.display = "flex";
+        this._modalFooterEl.style.gap = "var(--st-spacing-md)";
+        this._modalFooterEl.style.width = "100%";
+        this._modalFooterEl.style.justifyContent = "flex-end";
+        this._modalFooterEl.style.alignItems = "center";
+        modal.appendChild(this._modalFooterEl);
+      }
+
+      const steps = this._steps;
+      const hasSteps = steps.length > 0;
+      const isLastStep = hasSteps ? this._currentStepIndex === steps.length - 1 : true;
+
+      // Imperative DOM management prevents event listener loss and re-rendering conflicts
+      this._modalFooterEl.innerHTML = "";
+
+      if (hasSteps && this._currentStepIndex > 0) {
+        const backBtn = document.createElement("st-button");
+        backBtn.setAttribute("variant", "secondary");
+        backBtn.setAttribute("type", "button");
+        if (this.loading) backBtn.setAttribute("disabled", "");
+        backBtn.textContent = "Back";
+        backBtn.addEventListener("click", (e) => {
+          e.preventDefault();
+          this._prevStep();
+        });
+        this._modalFooterEl.appendChild(backBtn);
+      }
+
+      const submitBtn = document.createElement("st-button");
+      submitBtn.setAttribute("color", "primary");
+      submitBtn.setAttribute("type", "button");
+      if (this.loading) submitBtn.setAttribute("disabled", "");
+      submitBtn.textContent = this.loading ? "Submitting..." : (isLastStep ? "Submit" : "Continue");
+      submitBtn.addEventListener("click", (e) => {
+        e.preventDefault();
+        this._triggerSubmission();
+      });
+      this._modalFooterEl.appendChild(submitBtn);
+
+    } else if (this._modalFooterEl) {
+      this._modalFooterEl.remove();
+      this._modalFooterEl = null;
     }
   }
 
+  private _handleSlotChange() {
+    this._updateStepVisibility();
+    this._updateModalFooter();
+  }
+
   private _updateStepVisibility() {
-    this._stepElements.forEach((step, index) => {
+    const steps = this._steps;
+    steps.forEach((step, index) => {
       step.active = index === this._currentStepIndex;
     });
     this.requestUpdate();
   }
 
   private async _validateCurrentContext(): Promise<boolean> {
-    const scope: ParentNode = this._stepElements.length > 0
-      ? this._stepElements[this._currentStepIndex]
+    const steps = this._steps;
+    const scope: ParentNode = steps.length > 0
+      ? steps[this._currentStepIndex]
       : this;
 
     let isValid = true;
 
-    // 1. Validate standard DOM input components
     const inputs = Array.from(
       scope.querySelectorAll<
-        HTMLElement & {checkValidity?: () => boolean; reportValidity?: () => boolean}
-      >("*"),
+        HTMLElement & {
+          checkValidity?: () => boolean;
+          reportValidity?: () => boolean;
+          required?: boolean;
+          value?: any;
+          checked?: boolean;
+          invalid?: boolean;
+        }
+      >("st-input, st-select, st-textarea, st-checkbox, st-radio, input, select, textarea"),
     );
     
     for (const input of inputs) {
+      if (input.hasAttribute("disabled") || (input as any).disabled) continue;
+
+      let fieldValid = true;
+
       if (typeof input.checkValidity === "function") {
-        if (!input.checkValidity()) {
-          if (isValid && typeof input.reportValidity === "function") {
-            input.reportValidity();
+        fieldValid = input.checkValidity();
+      } else {
+        const isRequired = input.hasAttribute("required") || input.required;
+        if (isRequired) {
+          const isToggle = input.tagName === "ST-CHECKBOX" || input.tagName === "ST-RADIO";
+          const val = isToggle ? input.checked : input.value;
+          if (val === undefined || val === null || val === "" || val === false) {
+            fieldValid = false;
           }
-          isValid = false;
         }
       }
+
+      if (!fieldValid) {
+        if (typeof input.reportValidity === "function") {
+          input.reportValidity();
+        } else if ("invalid" in input) {
+          input.invalid = true;
+        }
+        if (isValid && typeof (input as any).focus === "function") {
+          (input as any).focus();
+        }
+        isValid = false;
+      }
     }
 
-    if (this._stepElements.length === 0 && this._formEl) {
+    if (steps.length === 0 && this._formEl) {
       if (!this._formEl.checkValidity()) {
         isValid = false;
       }
     }
 
-    // 2. Execute step-level async/sync validation hook if defined
-    if (isValid && this._stepElements.length > 0) {
-      const currentStep = this._stepElements[this._currentStepIndex] as StFormStep & {
+    if (isValid && steps.length > 0) {
+      const currentStep = steps[this._currentStepIndex] as StFormStep & {
         validate?: () => Promise<boolean> | boolean;
       };
 
@@ -210,7 +311,7 @@ export class StForm extends LitElement {
           if (!stepPassed) {
             isValid = false;
           }
-        } catch (err) {
+        } catch {
           isValid = false;
         } finally {
           this.loading = false;
@@ -273,8 +374,9 @@ export class StForm extends LitElement {
     const isValid = await this._validateCurrentContext();
     if (!isValid) return;
 
-    const hasSteps = this._stepElements.length > 0;
-    const isLastStep = hasSteps ? this._currentStepIndex === this._stepElements.length - 1 : true;
+    const steps = this._steps;
+    const hasSteps = steps.length > 0;
+    const isLastStep = hasSteps ? this._currentStepIndex === steps.length - 1 : true;
 
     if (hasSteps && !isLastStep) {
       this._currentStepIndex++;
@@ -295,8 +397,9 @@ export class StForm extends LitElement {
   }
 
   render() {
-    const hasSteps = this._stepElements?.length > 0;
-    const isLastStep = hasSteps ? this._currentStepIndex === this._stepElements.length - 1 : true;
+    const steps = this._steps;
+    const hasSteps = steps.length > 0;
+    const isInModal = !!this.closest("st-modal");
 
     return html`
       <div class="${hasSteps ? "has-steps" : ""}" aria-busy=${this.loading}>
@@ -310,7 +413,7 @@ export class StForm extends LitElement {
         ${hasSteps
           ? html`
               <div class="progress-nav" role="tablist">
-                ${this._stepElements.map((step, index) => {
+                ${steps.map((step, index) => {
                   const isActive = index === this._currentStepIndex;
                   const isCompleted = index < this._currentStepIndex;
 
@@ -329,7 +432,7 @@ export class StForm extends LitElement {
                       </div>
                       <span>${step.title || `Step ${index + 1}`}</span>
                     </div>
-                    ${index < this._stepElements.length - 1
+                    ${index < steps.length - 1
                       ? html` <div class="step-connector ${isCompleted ? "completed" : ""}"></div> `
                       : ""}
                   `;
@@ -349,29 +452,33 @@ export class StForm extends LitElement {
         <form @submit=${this._handleSubmit}>
           <slot @slotchange=${this._handleSlotChange}></slot>
 
-          <div class="form-actions">
-            ${hasSteps && this._currentStepIndex > 0
-              ? html`
+          ${!isInModal
+            ? html`
+                <div class="form-actions">
+                  ${hasSteps && this._currentStepIndex > 0
+                    ? html`
+                        <st-button
+                          variant="secondary"
+                          type="button"
+                          @click=${this._prevStep}
+                          ?disabled=${this.loading}
+                        >
+                          Back
+                        </st-button>
+                      `
+                    : ""}
+
                   <st-button
-                    variant="secondary"
+                    color="primary"
                     type="button"
-                    @click=${this._prevStep}
+                    @click=${this._triggerSubmission}
                     ?disabled=${this.loading}
                   >
-                    Back
+                    ${this.loading ? "Submitting..." : hasSteps && this._currentStepIndex === steps.length - 1 ? "Submit" : hasSteps ? "Continue" : "Submit"}
                   </st-button>
-                `
-              : ""}
-
-            <st-button
-              color="primary"
-              type="button"
-              @click=${this._triggerSubmission}
-              ?disabled=${this.loading}
-            >
-              ${this.loading ? "Submitting..." : isLastStep ? "Submit" : "Continue"}
-            </st-button>
-          </div>
+                </div>
+              `
+            : ""}
         </form>
       </div>
     `;