@uportal/form-builder 2.0.0 → 2.1.1

package/dist/form-builder.js

@@ -3,39 +3,91 @@
  * Copyright 2019 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
-const t$2=globalThis,e$3=t$2.ShadowRoot&&(void 0===t$2.ShadyCSS||t$2.ShadyCSS.nativeShadow)&&"adoptedStyleSheets"in Document.prototype&&"replace"in CSSStyleSheet.prototype,s$2=Symbol(),o$4=new WeakMap;let n$3 = class n{constructor(t,e,o){if(this._$cssResult$=true,o!==s$2)throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");this.cssText=t,this.t=e;}get styleSheet(){let t=this.o;const s=this.t;if(e$3&&void 0===t){const e=void 0!==s&&1===s.length;e&&(t=o$4.get(s)),void 0===t&&((this.o=t=new CSSStyleSheet).replaceSync(this.cssText),e&&o$4.set(s,t));}return t}toString(){return this.cssText}};const r$3=t=>new n$3("string"==typeof t?t:t+"",void 0,s$2),i$3=(t,...e)=>{const o=1===t.length?t[0]:e.reduce(((e,s,o)=>e+(t=>{if(true===t._$cssResult$)return t.cssText;if("number"==typeof t)return t;throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(s)+t[o+1]),t[0]);return new n$3(o,t,s$2)},S$1=(s,o)=>{if(e$3)s.adoptedStyleSheets=o.map((t=>t instanceof CSSStyleSheet?t:t.styleSheet));else for(const e of o){const o=document.createElement("style"),n=t$2.litNonce;void 0!==n&&o.setAttribute("nonce",n),o.textContent=e.cssText,s.appendChild(o);}},c$2=e$3?t=>t:t=>t instanceof CSSStyleSheet?(t=>{let e="";for(const s of t.cssRules)e+=s.cssText;return r$3(e)})(t):t;
+const t$1=globalThis,e$2=t$1.ShadowRoot&&(void 0===t$1.ShadyCSS||t$1.ShadyCSS.nativeShadow)&&"adoptedStyleSheets"in Document.prototype&&"replace"in CSSStyleSheet.prototype,s$2=Symbol(),o$3=new WeakMap;let n$2 = class n{constructor(t,e,o){if(this._$cssResult$=true,o!==s$2)throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");this.cssText=t,this.t=e;}get styleSheet(){let t=this.o;const s=this.t;if(e$2&&void 0===t){const e=void 0!==s&&1===s.length;e&&(t=o$3.get(s)),void 0===t&&((this.o=t=new CSSStyleSheet).replaceSync(this.cssText),e&&o$3.set(s,t));}return t}toString(){return this.cssText}};const r$2=t=>new n$2("string"==typeof t?t:t+"",void 0,s$2),i$3=(t,...e)=>{const o=1===t.length?t[0]:e.reduce(((e,s,o)=>e+(t=>{if(true===t._$cssResult$)return t.cssText;if("number"==typeof t)return t;throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(s)+t[o+1]),t[0]);return new n$2(o,t,s$2)},S$1=(s,o)=>{if(e$2)s.adoptedStyleSheets=o.map((t=>t instanceof CSSStyleSheet?t:t.styleSheet));else for(const e of o){const o=document.createElement("style"),n=t$1.litNonce;void 0!==n&&o.setAttribute("nonce",n),o.textContent=e.cssText,s.appendChild(o);}},c$2=e$2?t=>t:t=>t instanceof CSSStyleSheet?(t=>{let e="";for(const s of t.cssRules)e+=s.cssText;return r$2(e)})(t):t;
 
 /**
  * @license
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
- */const{is:i$2,defineProperty:e$2,getOwnPropertyDescriptor:h$1,getOwnPropertyNames:r$2,getOwnPropertySymbols:o$3,getPrototypeOf:n$2}=Object,a$1=globalThis,c$1=a$1.trustedTypes,l$1=c$1?c$1.emptyScript:"",p$1=a$1.reactiveElementPolyfillSupport,d$1=(t,s)=>t,u$1={toAttribute(t,s){switch(s){case Boolean:t=t?l$1:null;break;case Object:case Array:t=null==t?t:JSON.stringify(t);}return t},fromAttribute(t,s){let i=t;switch(s){case Boolean:i=null!==t;break;case Number:i=null===t?null:Number(t);break;case Object:case Array:try{i=JSON.parse(t);}catch(t){i=null;}}return i}},f$1=(t,s)=>!i$2(t,s),b={attribute:true,type:String,converter:u$1,reflect:false,useDefault:false,hasChanged:f$1};Symbol.metadata??=Symbol("metadata"),a$1.litPropertyMetadata??=new WeakMap;let y$1 = class y extends HTMLElement{static addInitializer(t){this._$Ei(),(this.l??=[]).push(t);}static get observedAttributes(){return this.finalize(),this._$Eh&&[...this._$Eh.keys()]}static createProperty(t,s=b){if(s.state&&(s.attribute=false),this._$Ei(),this.prototype.hasOwnProperty(t)&&((s=Object.create(s)).wrapped=true),this.elementProperties.set(t,s),!s.noAccessor){const i=Symbol(),h=this.getPropertyDescriptor(t,i,s);void 0!==h&&e$2(this.prototype,t,h);}}static getPropertyDescriptor(t,s,i){const{get:e,set:r}=h$1(this.prototype,t)??{get(){return this[s]},set(t){this[s]=t;}};return {get:e,set(s){const h=e?.call(this);r?.call(this,s),this.requestUpdate(t,h,i);},configurable:true,enumerable:true}}static getPropertyOptions(t){return this.elementProperties.get(t)??b}static _$Ei(){if(this.hasOwnProperty(d$1("elementProperties")))return;const t=n$2(this);t.finalize(),void 0!==t.l&&(this.l=[...t.l]),this.elementProperties=new Map(t.elementProperties);}static finalize(){if(this.hasOwnProperty(d$1("finalized")))return;if(this.finalized=true,this._$Ei(),this.hasOwnProperty(d$1("properties"))){const t=this.properties,s=[...r$2(t),...o$3(t)];for(const i of s)this.createProperty(i,t[i]);}const t=this[Symbol.metadata];if(null!==t){const s=litPropertyMetadata.get(t);if(void 0!==s)for(const[t,i]of s)this.elementProperties.set(t,i);}this._$Eh=new Map;for(const[t,s]of this.elementProperties){const i=this._$Eu(t,s);void 0!==i&&this._$Eh.set(i,t);}this.elementStyles=this.finalizeStyles(this.styles);}static finalizeStyles(s){const i=[];if(Array.isArray(s)){const e=new Set(s.flat(1/0).reverse());for(const s of e)i.unshift(c$2(s));}else void 0!==s&&i.push(c$2(s));return i}static _$Eu(t,s){const i=s.attribute;return  false===i?void 0:"string"==typeof i?i:"string"==typeof t?t.toLowerCase():void 0}constructor(){super(),this._$Ep=void 0,this.isUpdatePending=false,this.hasUpdated=false,this._$Em=null,this._$Ev();}_$Ev(){this._$ES=new Promise((t=>this.enableUpdating=t)),this._$AL=new Map,this._$E_(),this.requestUpdate(),this.constructor.l?.forEach((t=>t(this)));}addController(t){(this._$EO??=new Set).add(t),void 0!==this.renderRoot&&this.isConnected&&t.hostConnected?.();}removeController(t){this._$EO?.delete(t);}_$E_(){const t=new Map,s=this.constructor.elementProperties;for(const i of s.keys())this.hasOwnProperty(i)&&(t.set(i,this[i]),delete this[i]);t.size>0&&(this._$Ep=t);}createRenderRoot(){const t=this.shadowRoot??this.attachShadow(this.constructor.shadowRootOptions);return S$1(t,this.constructor.elementStyles),t}connectedCallback(){this.renderRoot??=this.createRenderRoot(),this.enableUpdating(true),this._$EO?.forEach((t=>t.hostConnected?.()));}enableUpdating(t){}disconnectedCallback(){this._$EO?.forEach((t=>t.hostDisconnected?.()));}attributeChangedCallback(t,s,i){this._$AK(t,i);}_$ET(t,s){const i=this.constructor.elementProperties.get(t),e=this.constructor._$Eu(t,i);if(void 0!==e&&true===i.reflect){const h=(void 0!==i.converter?.toAttribute?i.converter:u$1).toAttribute(s,i.type);this._$Em=t,null==h?this.removeAttribute(e):this.setAttribute(e,h),this._$Em=null;}}_$AK(t,s){const i=this.constructor,e=i._$Eh.get(t);if(void 0!==e&&this._$Em!==e){const t=i.getPropertyOptions(e),h="function"==typeof t.converter?{fromAttribute:t.converter}:void 0!==t.converter?.fromAttribute?t.converter:u$1;this._$Em=e;const r=h.fromAttribute(s,t.type);this[e]=r??this._$Ej?.get(e)??r,this._$Em=null;}}requestUpdate(t,s,i){if(void 0!==t){const e=this.constructor,h=this[t];if(i??=e.getPropertyOptions(t),!((i.hasChanged??f$1)(h,s)||i.useDefault&&i.reflect&&h===this._$Ej?.get(t)&&!this.hasAttribute(e._$Eu(t,i))))return;this.C(t,s,i);} false===this.isUpdatePending&&(this._$ES=this._$EP());}C(t,s,{useDefault:i,reflect:e,wrapped:h},r){i&&!(this._$Ej??=new Map).has(t)&&(this._$Ej.set(t,r??s??this[t]),true!==h||void 0!==r)||(this._$AL.has(t)||(this.hasUpdated||i||(s=void 0),this._$AL.set(t,s)),true===e&&this._$Em!==t&&(this._$Eq??=new Set).add(t));}async _$EP(){this.isUpdatePending=true;try{await this._$ES;}catch(t){Promise.reject(t);}const t=this.scheduleUpdate();return null!=t&&await t,!this.isUpdatePending}scheduleUpdate(){return this.performUpdate()}performUpdate(){if(!this.isUpdatePending)return;if(!this.hasUpdated){if(this.renderRoot??=this.createRenderRoot(),this._$Ep){for(const[t,s]of this._$Ep)this[t]=s;this._$Ep=void 0;}const t=this.constructor.elementProperties;if(t.size>0)for(const[s,i]of t){const{wrapped:t}=i,e=this[s];true!==t||this._$AL.has(s)||void 0===e||this.C(s,void 0,i,e);}}let t=false;const s=this._$AL;try{t=this.shouldUpdate(s),t?(this.willUpdate(s),this._$EO?.forEach((t=>t.hostUpdate?.())),this.update(s)):this._$EM();}catch(s){throw t=false,this._$EM(),s}t&&this._$AE(s);}willUpdate(t){}_$AE(t){this._$EO?.forEach((t=>t.hostUpdated?.())),this.hasUpdated||(this.hasUpdated=true,this.firstUpdated(t)),this.updated(t);}_$EM(){this._$AL=new Map,this.isUpdatePending=false;}get updateComplete(){return this.getUpdateComplete()}getUpdateComplete(){return this._$ES}shouldUpdate(t){return  true}update(t){this._$Eq&&=this._$Eq.forEach((t=>this._$ET(t,this[t]))),this._$EM();}updated(t){}firstUpdated(t){}};y$1.elementStyles=[],y$1.shadowRootOptions={mode:"open"},y$1[d$1("elementProperties")]=new Map,y$1[d$1("finalized")]=new Map,p$1?.({ReactiveElement:y$1}),(a$1.reactiveElementVersions??=[]).push("2.1.1");
+ */const{is:i$2,defineProperty:e$1,getOwnPropertyDescriptor:h$1,getOwnPropertyNames:r$1,getOwnPropertySymbols:o$2,getPrototypeOf:n$1}=Object,a$1=globalThis,c$1=a$1.trustedTypes,l$1=c$1?c$1.emptyScript:"",p$1=a$1.reactiveElementPolyfillSupport,d$1=(t,s)=>t,u$1={toAttribute(t,s){switch(s){case Boolean:t=t?l$1:null;break;case Object:case Array:t=null==t?t:JSON.stringify(t);}return t},fromAttribute(t,s){let i=t;switch(s){case Boolean:i=null!==t;break;case Number:i=null===t?null:Number(t);break;case Object:case Array:try{i=JSON.parse(t);}catch(t){i=null;}}return i}},f$1=(t,s)=>!i$2(t,s),b={attribute:true,type:String,converter:u$1,reflect:false,useDefault:false,hasChanged:f$1};Symbol.metadata??=Symbol("metadata"),a$1.litPropertyMetadata??=new WeakMap;let y$1 = class y extends HTMLElement{static addInitializer(t){this._$Ei(),(this.l??=[]).push(t);}static get observedAttributes(){return this.finalize(),this._$Eh&&[...this._$Eh.keys()]}static createProperty(t,s=b){if(s.state&&(s.attribute=false),this._$Ei(),this.prototype.hasOwnProperty(t)&&((s=Object.create(s)).wrapped=true),this.elementProperties.set(t,s),!s.noAccessor){const i=Symbol(),h=this.getPropertyDescriptor(t,i,s);void 0!==h&&e$1(this.prototype,t,h);}}static getPropertyDescriptor(t,s,i){const{get:e,set:r}=h$1(this.prototype,t)??{get(){return this[s]},set(t){this[s]=t;}};return {get:e,set(s){const h=e?.call(this);r?.call(this,s),this.requestUpdate(t,h,i);},configurable:true,enumerable:true}}static getPropertyOptions(t){return this.elementProperties.get(t)??b}static _$Ei(){if(this.hasOwnProperty(d$1("elementProperties")))return;const t=n$1(this);t.finalize(),void 0!==t.l&&(this.l=[...t.l]),this.elementProperties=new Map(t.elementProperties);}static finalize(){if(this.hasOwnProperty(d$1("finalized")))return;if(this.finalized=true,this._$Ei(),this.hasOwnProperty(d$1("properties"))){const t=this.properties,s=[...r$1(t),...o$2(t)];for(const i of s)this.createProperty(i,t[i]);}const t=this[Symbol.metadata];if(null!==t){const s=litPropertyMetadata.get(t);if(void 0!==s)for(const[t,i]of s)this.elementProperties.set(t,i);}this._$Eh=new Map;for(const[t,s]of this.elementProperties){const i=this._$Eu(t,s);void 0!==i&&this._$Eh.set(i,t);}this.elementStyles=this.finalizeStyles(this.styles);}static finalizeStyles(s){const i=[];if(Array.isArray(s)){const e=new Set(s.flat(1/0).reverse());for(const s of e)i.unshift(c$2(s));}else void 0!==s&&i.push(c$2(s));return i}static _$Eu(t,s){const i=s.attribute;return  false===i?void 0:"string"==typeof i?i:"string"==typeof t?t.toLowerCase():void 0}constructor(){super(),this._$Ep=void 0,this.isUpdatePending=false,this.hasUpdated=false,this._$Em=null,this._$Ev();}_$Ev(){this._$ES=new Promise((t=>this.enableUpdating=t)),this._$AL=new Map,this._$E_(),this.requestUpdate(),this.constructor.l?.forEach((t=>t(this)));}addController(t){(this._$EO??=new Set).add(t),void 0!==this.renderRoot&&this.isConnected&&t.hostConnected?.();}removeController(t){this._$EO?.delete(t);}_$E_(){const t=new Map,s=this.constructor.elementProperties;for(const i of s.keys())this.hasOwnProperty(i)&&(t.set(i,this[i]),delete this[i]);t.size>0&&(this._$Ep=t);}createRenderRoot(){const t=this.shadowRoot??this.attachShadow(this.constructor.shadowRootOptions);return S$1(t,this.constructor.elementStyles),t}connectedCallback(){this.renderRoot??=this.createRenderRoot(),this.enableUpdating(true),this._$EO?.forEach((t=>t.hostConnected?.()));}enableUpdating(t){}disconnectedCallback(){this._$EO?.forEach((t=>t.hostDisconnected?.()));}attributeChangedCallback(t,s,i){this._$AK(t,i);}_$ET(t,s){const i=this.constructor.elementProperties.get(t),e=this.constructor._$Eu(t,i);if(void 0!==e&&true===i.reflect){const h=(void 0!==i.converter?.toAttribute?i.converter:u$1).toAttribute(s,i.type);this._$Em=t,null==h?this.removeAttribute(e):this.setAttribute(e,h),this._$Em=null;}}_$AK(t,s){const i=this.constructor,e=i._$Eh.get(t);if(void 0!==e&&this._$Em!==e){const t=i.getPropertyOptions(e),h="function"==typeof t.converter?{fromAttribute:t.converter}:void 0!==t.converter?.fromAttribute?t.converter:u$1;this._$Em=e;const r=h.fromAttribute(s,t.type);this[e]=r??this._$Ej?.get(e)??r,this._$Em=null;}}requestUpdate(t,s,i){if(void 0!==t){const e=this.constructor,h=this[t];if(i??=e.getPropertyOptions(t),!((i.hasChanged??f$1)(h,s)||i.useDefault&&i.reflect&&h===this._$Ej?.get(t)&&!this.hasAttribute(e._$Eu(t,i))))return;this.C(t,s,i);} false===this.isUpdatePending&&(this._$ES=this._$EP());}C(t,s,{useDefault:i,reflect:e,wrapped:h},r){i&&!(this._$Ej??=new Map).has(t)&&(this._$Ej.set(t,r??s??this[t]),true!==h||void 0!==r)||(this._$AL.has(t)||(this.hasUpdated||i||(s=void 0),this._$AL.set(t,s)),true===e&&this._$Em!==t&&(this._$Eq??=new Set).add(t));}async _$EP(){this.isUpdatePending=true;try{await this._$ES;}catch(t){Promise.reject(t);}const t=this.scheduleUpdate();return null!=t&&await t,!this.isUpdatePending}scheduleUpdate(){return this.performUpdate()}performUpdate(){if(!this.isUpdatePending)return;if(!this.hasUpdated){if(this.renderRoot??=this.createRenderRoot(),this._$Ep){for(const[t,s]of this._$Ep)this[t]=s;this._$Ep=void 0;}const t=this.constructor.elementProperties;if(t.size>0)for(const[s,i]of t){const{wrapped:t}=i,e=this[s];true!==t||this._$AL.has(s)||void 0===e||this.C(s,void 0,i,e);}}let t=false;const s=this._$AL;try{t=this.shouldUpdate(s),t?(this.willUpdate(s),this._$EO?.forEach((t=>t.hostUpdate?.())),this.update(s)):this._$EM();}catch(s){throw t=false,this._$EM(),s}t&&this._$AE(s);}willUpdate(t){}_$AE(t){this._$EO?.forEach((t=>t.hostUpdated?.())),this.hasUpdated||(this.hasUpdated=true,this.firstUpdated(t)),this.updated(t);}_$EM(){this._$AL=new Map,this.isUpdatePending=false;}get updateComplete(){return this.getUpdateComplete()}getUpdateComplete(){return this._$ES}shouldUpdate(t){return  true}update(t){this._$Eq&&=this._$Eq.forEach((t=>this._$ET(t,this[t]))),this._$EM();}updated(t){}firstUpdated(t){}};y$1.elementStyles=[],y$1.shadowRootOptions={mode:"open"},y$1[d$1("elementProperties")]=new Map,y$1[d$1("finalized")]=new Map,p$1?.({ReactiveElement:y$1}),(a$1.reactiveElementVersions??=[]).push("2.1.1");
 
 /**
  * @license
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
-const t$1=globalThis,i$1=t$1.trustedTypes,s$1=i$1?i$1.createPolicy("lit-html",{createHTML:t=>t}):void 0,e$1="$lit$",h=`lit$${Math.random().toFixed(9).slice(2)}$`,o$2="?"+h,n$1=`<${o$2}>`,r$1=document,l=()=>r$1.createComment(""),c=t=>null===t||"object"!=typeof t&&"function"!=typeof t,a=Array.isArray,u=t=>a(t)||"function"==typeof t?.[Symbol.iterator],d="[ \t\n\f\r]",f=/<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g,v=/-->/g,_=/>/g,m=RegExp(`>|${d}(?:([^\\s"'>=/]+)(${d}*=${d}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`,"g"),p=/'/g,g=/"/g,$=/^(?:script|style|textarea|title)$/i,y=t=>(i,...s)=>({_$litType$:t,strings:i,values:s}),x=y(1),T=Symbol.for("lit-noChange"),E=Symbol.for("lit-nothing"),A=new WeakMap,C=r$1.createTreeWalker(r$1,129);function P(t,i){if(!a(t)||!t.hasOwnProperty("raw"))throw Error("invalid template strings array");return void 0!==s$1?s$1.createHTML(i):i}const V=(t,i)=>{const s=t.length-1,o=[];let r,l=2===i?"<svg>":3===i?"<math>":"",c=f;for(let i=0;i<s;i++){const s=t[i];let a,u,d=-1,y=0;for(;y<s.length&&(c.lastIndex=y,u=c.exec(s),null!==u);)y=c.lastIndex,c===f?"!--"===u[1]?c=v:void 0!==u[1]?c=_:void 0!==u[2]?($.test(u[2])&&(r=RegExp("</"+u[2],"g")),c=m):void 0!==u[3]&&(c=m):c===m?">"===u[0]?(c=r??f,d=-1):void 0===u[1]?d=-2:(d=c.lastIndex-u[2].length,a=u[1],c=void 0===u[3]?m:'"'===u[3]?g:p):c===g||c===p?c=m:c===v||c===_?c=f:(c=m,r=void 0);const x=c===m&&t[i+1].startsWith("/>")?" ":"";l+=c===f?s+n$1:d>=0?(o.push(a),s.slice(0,d)+e$1+s.slice(d)+h+x):s+h+(-2===d?i:x);}return [P(t,l+(t[s]||"<?>")+(2===i?"</svg>":3===i?"</math>":"")),o]};class N{constructor({strings:t,_$litType$:s},n){let r;this.parts=[];let c=0,a=0;const u=t.length-1,d=this.parts,[f,v]=V(t,s);if(this.el=N.createElement(f,n),C.currentNode=this.el.content,2===s||3===s){const t=this.el.content.firstChild;t.replaceWith(...t.childNodes);}for(;null!==(r=C.nextNode())&&d.length<u;){if(1===r.nodeType){if(r.hasAttributes())for(const t of r.getAttributeNames())if(t.endsWith(e$1)){const i=v[a++],s=r.getAttribute(t).split(h),e=/([.?@])?(.*)/.exec(i);d.push({type:1,index:c,name:e[2],strings:s,ctor:"."===e[1]?H:"?"===e[1]?I:"@"===e[1]?L:k}),r.removeAttribute(t);}else t.startsWith(h)&&(d.push({type:6,index:c}),r.removeAttribute(t));if($.test(r.tagName)){const t=r.textContent.split(h),s=t.length-1;if(s>0){r.textContent=i$1?i$1.emptyScript:"";for(let i=0;i<s;i++)r.append(t[i],l()),C.nextNode(),d.push({type:2,index:++c});r.append(t[s],l());}}}else if(8===r.nodeType)if(r.data===o$2)d.push({type:2,index:c});else {let t=-1;for(;-1!==(t=r.data.indexOf(h,t+1));)d.push({type:7,index:c}),t+=h.length-1;}c++;}}static createElement(t,i){const s=r$1.createElement("template");return s.innerHTML=t,s}}function S(t,i,s=t,e){if(i===T)return i;let h=void 0!==e?s._$Co?.[e]:s._$Cl;const o=c(i)?void 0:i._$litDirective$;return h?.constructor!==o&&(h?._$AO?.(false),void 0===o?h=void 0:(h=new o(t),h._$AT(t,s,e)),void 0!==e?(s._$Co??=[])[e]=h:s._$Cl=h),void 0!==h&&(i=S(t,h._$AS(t,i.values),h,e)),i}class M{constructor(t,i){this._$AV=[],this._$AN=void 0,this._$AD=t,this._$AM=i;}get parentNode(){return this._$AM.parentNode}get _$AU(){return this._$AM._$AU}u(t){const{el:{content:i},parts:s}=this._$AD,e=(t?.creationScope??r$1).importNode(i,true);C.currentNode=e;let h=C.nextNode(),o=0,n=0,l=s[0];for(;void 0!==l;){if(o===l.index){let i;2===l.type?i=new R(h,h.nextSibling,this,t):1===l.type?i=new l.ctor(h,l.name,l.strings,this,t):6===l.type&&(i=new z(h,this,t)),this._$AV.push(i),l=s[++n];}o!==l?.index&&(h=C.nextNode(),o++);}return C.currentNode=r$1,e}p(t){let i=0;for(const s of this._$AV) void 0!==s&&(void 0!==s.strings?(s._$AI(t,s,i),i+=s.strings.length-2):s._$AI(t[i])),i++;}}class R{get _$AU(){return this._$AM?._$AU??this._$Cv}constructor(t,i,s,e){this.type=2,this._$AH=E,this._$AN=void 0,this._$AA=t,this._$AB=i,this._$AM=s,this.options=e,this._$Cv=e?.isConnected??true;}get parentNode(){let t=this._$AA.parentNode;const i=this._$AM;return void 0!==i&&11===t?.nodeType&&(t=i.parentNode),t}get startNode(){return this._$AA}get endNode(){return this._$AB}_$AI(t,i=this){t=S(this,t,i),c(t)?t===E||null==t||""===t?(this._$AH!==E&&this._$AR(),this._$AH=E):t!==this._$AH&&t!==T&&this._(t):void 0!==t._$litType$?this.$(t):void 0!==t.nodeType?this.T(t):u(t)?this.k(t):this._(t);}O(t){return this._$AA.parentNode.insertBefore(t,this._$AB)}T(t){this._$AH!==t&&(this._$AR(),this._$AH=this.O(t));}_(t){this._$AH!==E&&c(this._$AH)?this._$AA.nextSibling.data=t:this.T(r$1.createTextNode(t)),this._$AH=t;}$(t){const{values:i,_$litType$:s}=t,e="number"==typeof s?this._$AC(t):(void 0===s.el&&(s.el=N.createElement(P(s.h,s.h[0]),this.options)),s);if(this._$AH?._$AD===e)this._$AH.p(i);else {const t=new M(e,this),s=t.u(this.options);t.p(i),this.T(s),this._$AH=t;}}_$AC(t){let i=A.get(t.strings);return void 0===i&&A.set(t.strings,i=new N(t)),i}k(t){a(this._$AH)||(this._$AH=[],this._$AR());const i=this._$AH;let s,e=0;for(const h of t)e===i.length?i.push(s=new R(this.O(l()),this.O(l()),this,this.options)):s=i[e],s._$AI(h),e++;e<i.length&&(this._$AR(s&&s._$AB.nextSibling,e),i.length=e);}_$AR(t=this._$AA.nextSibling,i){for(this._$AP?.(false,true,i);t!==this._$AB;){const i=t.nextSibling;t.remove(),t=i;}}setConnected(t){ void 0===this._$AM&&(this._$Cv=t,this._$AP?.(t));}}class k{get tagName(){return this.element.tagName}get _$AU(){return this._$AM._$AU}constructor(t,i,s,e,h){this.type=1,this._$AH=E,this._$AN=void 0,this.element=t,this.name=i,this._$AM=e,this.options=h,s.length>2||""!==s[0]||""!==s[1]?(this._$AH=Array(s.length-1).fill(new String),this.strings=s):this._$AH=E;}_$AI(t,i=this,s,e){const h=this.strings;let o=false;if(void 0===h)t=S(this,t,i,0),o=!c(t)||t!==this._$AH&&t!==T,o&&(this._$AH=t);else {const e=t;let n,r;for(t=h[0],n=0;n<h.length-1;n++)r=S(this,e[s+n],i,n),r===T&&(r=this._$AH[n]),o||=!c(r)||r!==this._$AH[n],r===E?t=E:t!==E&&(t+=(r??"")+h[n+1]),this._$AH[n]=r;}o&&!e&&this.j(t);}j(t){t===E?this.element.removeAttribute(this.name):this.element.setAttribute(this.name,t??"");}}class H extends k{constructor(){super(...arguments),this.type=3;}j(t){this.element[this.name]=t===E?void 0:t;}}class I extends k{constructor(){super(...arguments),this.type=4;}j(t){this.element.toggleAttribute(this.name,!!t&&t!==E);}}class L extends k{constructor(t,i,s,e,h){super(t,i,s,e,h),this.type=5;}_$AI(t,i=this){if((t=S(this,t,i,0)??E)===T)return;const s=this._$AH,e=t===E&&s!==E||t.capture!==s.capture||t.once!==s.once||t.passive!==s.passive,h=t!==E&&(s===E||e);e&&this.element.removeEventListener(this.name,this,s),h&&this.element.addEventListener(this.name,this,t),this._$AH=t;}handleEvent(t){"function"==typeof this._$AH?this._$AH.call(this.options?.host??this.element,t):this._$AH.handleEvent(t);}}class z{constructor(t,i,s){this.element=t,this.type=6,this._$AN=void 0,this._$AM=i,this.options=s;}get _$AU(){return this._$AM._$AU}_$AI(t){S(this,t);}}const j=t$1.litHtmlPolyfillSupport;j?.(N,R),(t$1.litHtmlVersions??=[]).push("3.3.1");const B=(t,i,s)=>{const e=s?.renderBefore??i;let h=e._$litPart$;if(void 0===h){const t=s?.renderBefore??null;e._$litPart$=h=new R(i.insertBefore(l(),t),t,void 0,s??{});}return h._$AI(t),h};
+const t=globalThis,i$1=t.trustedTypes,s$1=i$1?i$1.createPolicy("lit-html",{createHTML:t=>t}):void 0,e="$lit$",h=`lit$${Math.random().toFixed(9).slice(2)}$`,o$1="?"+h,n=`<${o$1}>`,r=document,l=()=>r.createComment(""),c=t=>null===t||"object"!=typeof t&&"function"!=typeof t,a=Array.isArray,u=t=>a(t)||"function"==typeof t?.[Symbol.iterator],d="[ \t\n\f\r]",f=/<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g,v=/-->/g,_=/>/g,m=RegExp(`>|${d}(?:([^\\s"'>=/]+)(${d}*=${d}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`,"g"),p=/'/g,g=/"/g,$=/^(?:script|style|textarea|title)$/i,y=t=>(i,...s)=>({_$litType$:t,strings:i,values:s}),x=y(1),T=Symbol.for("lit-noChange"),E=Symbol.for("lit-nothing"),A=new WeakMap,C=r.createTreeWalker(r,129);function P(t,i){if(!a(t)||!t.hasOwnProperty("raw"))throw Error("invalid template strings array");return void 0!==s$1?s$1.createHTML(i):i}const V=(t,i)=>{const s=t.length-1,o=[];let r,l=2===i?"<svg>":3===i?"<math>":"",c=f;for(let i=0;i<s;i++){const s=t[i];let a,u,d=-1,y=0;for(;y<s.length&&(c.lastIndex=y,u=c.exec(s),null!==u);)y=c.lastIndex,c===f?"!--"===u[1]?c=v:void 0!==u[1]?c=_:void 0!==u[2]?($.test(u[2])&&(r=RegExp("</"+u[2],"g")),c=m):void 0!==u[3]&&(c=m):c===m?">"===u[0]?(c=r??f,d=-1):void 0===u[1]?d=-2:(d=c.lastIndex-u[2].length,a=u[1],c=void 0===u[3]?m:'"'===u[3]?g:p):c===g||c===p?c=m:c===v||c===_?c=f:(c=m,r=void 0);const x=c===m&&t[i+1].startsWith("/>")?" ":"";l+=c===f?s+n:d>=0?(o.push(a),s.slice(0,d)+e+s.slice(d)+h+x):s+h+(-2===d?i:x);}return [P(t,l+(t[s]||"<?>")+(2===i?"</svg>":3===i?"</math>":"")),o]};class N{constructor({strings:t,_$litType$:s},n){let r;this.parts=[];let c=0,a=0;const u=t.length-1,d=this.parts,[f,v]=V(t,s);if(this.el=N.createElement(f,n),C.currentNode=this.el.content,2===s||3===s){const t=this.el.content.firstChild;t.replaceWith(...t.childNodes);}for(;null!==(r=C.nextNode())&&d.length<u;){if(1===r.nodeType){if(r.hasAttributes())for(const t of r.getAttributeNames())if(t.endsWith(e)){const i=v[a++],s=r.getAttribute(t).split(h),e=/([.?@])?(.*)/.exec(i);d.push({type:1,index:c,name:e[2],strings:s,ctor:"."===e[1]?H:"?"===e[1]?I:"@"===e[1]?L:k}),r.removeAttribute(t);}else t.startsWith(h)&&(d.push({type:6,index:c}),r.removeAttribute(t));if($.test(r.tagName)){const t=r.textContent.split(h),s=t.length-1;if(s>0){r.textContent=i$1?i$1.emptyScript:"";for(let i=0;i<s;i++)r.append(t[i],l()),C.nextNode(),d.push({type:2,index:++c});r.append(t[s],l());}}}else if(8===r.nodeType)if(r.data===o$1)d.push({type:2,index:c});else {let t=-1;for(;-1!==(t=r.data.indexOf(h,t+1));)d.push({type:7,index:c}),t+=h.length-1;}c++;}}static createElement(t,i){const s=r.createElement("template");return s.innerHTML=t,s}}function S(t,i,s=t,e){if(i===T)return i;let h=void 0!==e?s._$Co?.[e]:s._$Cl;const o=c(i)?void 0:i._$litDirective$;return h?.constructor!==o&&(h?._$AO?.(false),void 0===o?h=void 0:(h=new o(t),h._$AT(t,s,e)),void 0!==e?(s._$Co??=[])[e]=h:s._$Cl=h),void 0!==h&&(i=S(t,h._$AS(t,i.values),h,e)),i}class M{constructor(t,i){this._$AV=[],this._$AN=void 0,this._$AD=t,this._$AM=i;}get parentNode(){return this._$AM.parentNode}get _$AU(){return this._$AM._$AU}u(t){const{el:{content:i},parts:s}=this._$AD,e=(t?.creationScope??r).importNode(i,true);C.currentNode=e;let h=C.nextNode(),o=0,n=0,l=s[0];for(;void 0!==l;){if(o===l.index){let i;2===l.type?i=new R(h,h.nextSibling,this,t):1===l.type?i=new l.ctor(h,l.name,l.strings,this,t):6===l.type&&(i=new z(h,this,t)),this._$AV.push(i),l=s[++n];}o!==l?.index&&(h=C.nextNode(),o++);}return C.currentNode=r,e}p(t){let i=0;for(const s of this._$AV) void 0!==s&&(void 0!==s.strings?(s._$AI(t,s,i),i+=s.strings.length-2):s._$AI(t[i])),i++;}}class R{get _$AU(){return this._$AM?._$AU??this._$Cv}constructor(t,i,s,e){this.type=2,this._$AH=E,this._$AN=void 0,this._$AA=t,this._$AB=i,this._$AM=s,this.options=e,this._$Cv=e?.isConnected??true;}get parentNode(){let t=this._$AA.parentNode;const i=this._$AM;return void 0!==i&&11===t?.nodeType&&(t=i.parentNode),t}get startNode(){return this._$AA}get endNode(){return this._$AB}_$AI(t,i=this){t=S(this,t,i),c(t)?t===E||null==t||""===t?(this._$AH!==E&&this._$AR(),this._$AH=E):t!==this._$AH&&t!==T&&this._(t):void 0!==t._$litType$?this.$(t):void 0!==t.nodeType?this.T(t):u(t)?this.k(t):this._(t);}O(t){return this._$AA.parentNode.insertBefore(t,this._$AB)}T(t){this._$AH!==t&&(this._$AR(),this._$AH=this.O(t));}_(t){this._$AH!==E&&c(this._$AH)?this._$AA.nextSibling.data=t:this.T(r.createTextNode(t)),this._$AH=t;}$(t){const{values:i,_$litType$:s}=t,e="number"==typeof s?this._$AC(t):(void 0===s.el&&(s.el=N.createElement(P(s.h,s.h[0]),this.options)),s);if(this._$AH?._$AD===e)this._$AH.p(i);else {const t=new M(e,this),s=t.u(this.options);t.p(i),this.T(s),this._$AH=t;}}_$AC(t){let i=A.get(t.strings);return void 0===i&&A.set(t.strings,i=new N(t)),i}k(t){a(this._$AH)||(this._$AH=[],this._$AR());const i=this._$AH;let s,e=0;for(const h of t)e===i.length?i.push(s=new R(this.O(l()),this.O(l()),this,this.options)):s=i[e],s._$AI(h),e++;e<i.length&&(this._$AR(s&&s._$AB.nextSibling,e),i.length=e);}_$AR(t=this._$AA.nextSibling,i){for(this._$AP?.(false,true,i);t!==this._$AB;){const i=t.nextSibling;t.remove(),t=i;}}setConnected(t){ void 0===this._$AM&&(this._$Cv=t,this._$AP?.(t));}}class k{get tagName(){return this.element.tagName}get _$AU(){return this._$AM._$AU}constructor(t,i,s,e,h){this.type=1,this._$AH=E,this._$AN=void 0,this.element=t,this.name=i,this._$AM=e,this.options=h,s.length>2||""!==s[0]||""!==s[1]?(this._$AH=Array(s.length-1).fill(new String),this.strings=s):this._$AH=E;}_$AI(t,i=this,s,e){const h=this.strings;let o=false;if(void 0===h)t=S(this,t,i,0),o=!c(t)||t!==this._$AH&&t!==T,o&&(this._$AH=t);else {const e=t;let n,r;for(t=h[0],n=0;n<h.length-1;n++)r=S(this,e[s+n],i,n),r===T&&(r=this._$AH[n]),o||=!c(r)||r!==this._$AH[n],r===E?t=E:t!==E&&(t+=(r??"")+h[n+1]),this._$AH[n]=r;}o&&!e&&this.j(t);}j(t){t===E?this.element.removeAttribute(this.name):this.element.setAttribute(this.name,t??"");}}class H extends k{constructor(){super(...arguments),this.type=3;}j(t){this.element[this.name]=t===E?void 0:t;}}class I extends k{constructor(){super(...arguments),this.type=4;}j(t){this.element.toggleAttribute(this.name,!!t&&t!==E);}}class L extends k{constructor(t,i,s,e,h){super(t,i,s,e,h),this.type=5;}_$AI(t,i=this){if((t=S(this,t,i,0)??E)===T)return;const s=this._$AH,e=t===E&&s!==E||t.capture!==s.capture||t.once!==s.once||t.passive!==s.passive,h=t!==E&&(s===E||e);e&&this.element.removeEventListener(this.name,this,s),h&&this.element.addEventListener(this.name,this,t),this._$AH=t;}handleEvent(t){"function"==typeof this._$AH?this._$AH.call(this.options?.host??this.element,t):this._$AH.handleEvent(t);}}class z{constructor(t,i,s){this.element=t,this.type=6,this._$AN=void 0,this._$AM=i,this.options=s;}get _$AU(){return this._$AM._$AU}_$AI(t){S(this,t);}}const j=t.litHtmlPolyfillSupport;j?.(N,R),(t.litHtmlVersions??=[]).push("3.3.1");const B=(t,i,s)=>{const e=s?.renderBefore??i;let h=e._$litPart$;if(void 0===h){const t=s?.renderBefore??null;e._$litPart$=h=new R(i.insertBefore(l(),t),t,void 0,s??{});}return h._$AI(t),h};
 
 /**
  * @license
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
- */const s=globalThis;class i extends y$1{constructor(){super(...arguments),this.renderOptions={host:this},this._$Do=void 0;}createRenderRoot(){const t=super.createRenderRoot();return this.renderOptions.renderBefore??=t.firstChild,t}update(t){const r=this.render();this.hasUpdated||(this.renderOptions.isConnected=this.isConnected),super.update(t),this._$Do=B(r,this.renderRoot,this.renderOptions);}connectedCallback(){super.connectedCallback(),this._$Do?.setConnected(true);}disconnectedCallback(){super.disconnectedCallback(),this._$Do?.setConnected(false);}render(){return T}}i._$litElement$=true,i["finalized"]=true,s.litElementHydrateSupport?.({LitElement:i});const o$1=s.litElementPolyfillSupport;o$1?.({LitElement:i});(s.litElementVersions??=[]).push("4.2.1");
+ */const s=globalThis;class i extends y$1{constructor(){super(...arguments),this.renderOptions={host:this},this._$Do=void 0;}createRenderRoot(){const t=super.createRenderRoot();return this.renderOptions.renderBefore??=t.firstChild,t}update(t){const r=this.render();this.hasUpdated||(this.renderOptions.isConnected=this.isConnected),super.update(t),this._$Do=B(r,this.renderRoot,this.renderOptions);}connectedCallback(){super.connectedCallback(),this._$Do?.setConnected(true);}disconnectedCallback(){super.disconnectedCallback(),this._$Do?.setConnected(false);}render(){return T}}i._$litElement$=true,i["finalized"]=true,s.litElementHydrateSupport?.({LitElement:i});const o=s.litElementPolyfillSupport;o?.({LitElement:i});(s.litElementVersions??=[]).push("4.2.1");
 
-function e(e){this.message=e;}e.prototype=new Error,e.prototype.name="InvalidCharacterError";var r="undefined"!=typeof window&&window.atob&&window.atob.bind(window)||function(r){var t=String(r).replace(/=+$/,"");if(t.length%4==1)throw new e("'atob' failed: The string to be decoded is not correctly encoded.");for(var n,o,a=0,i=0,c="";o=t.charAt(i++);~o&&(n=a%4?64*n+o:o,a++%4)?c+=String.fromCharCode(255&n>>(-2*a&6)):0)o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(o);return c};function t(e){var t=e.replace(/-/g,"+").replace(/_/g,"/");switch(t.length%4){case 0:break;case 2:t+="==";break;case 3:t+="=";break;default:throw "Illegal base64url string!"}try{return function(e){return decodeURIComponent(r(e).replace(/(.)/g,(function(e,r){var t=r.charCodeAt(0).toString(16).toUpperCase();return t.length<2&&(t="0"+t),"%"+t})))}(t)}catch(e){return r(t)}}function n(e){this.message=e;}function o(e,r){if("string"!=typeof e)throw new n("Invalid token specified");var o=true===(r=r||{}).header?0:1;try{return JSON.parse(t(e.split(".")[o]))}catch(e){throw new n("Invalid token specified: "+e.message)}}n.prototype=new Error,n.prototype.name="InvalidTokenError";
-
-function delay(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
+class InvalidTokenError extends Error {
+}
+InvalidTokenError.prototype.name = "InvalidTokenError";
+function b64DecodeUnicode(str) {
+    return decodeURIComponent(atob(str).replace(/(.)/g, (m, p) => {
+        let code = p.charCodeAt(0).toString(16).toUpperCase();
+        if (code.length < 2) {
+            code = "0" + code;
+        }
+        return "%" + code;
+    }));
+}
+function base64UrlDecode(str) {
+    let output = str.replace(/-/g, "+").replace(/_/g, "/");
+    switch (output.length % 4) {
+        case 0:
+            break;
+        case 2:
+            output += "==";
+            break;
+        case 3:
+            output += "=";
+            break;
+        default:
+            throw new Error("base64 string is not of the correct length");
+    }
+    try {
+        return b64DecodeUnicode(output);
+    }
+    catch (err) {
+        return atob(output);
+    }
+}
+function jwtDecode(token, options) {
+    if (typeof token !== "string") {
+        throw new InvalidTokenError("Invalid token specified: must be a string");
+    }
+    options || (options = {});
+    const pos = options.header === true ? 0 : 1;
+    const part = token.split(".")[pos];
+    if (typeof part !== "string") {
+        throw new InvalidTokenError(`Invalid token specified: missing part #${pos + 1}`);
+    }
+    let decoded;
+    try {
+        decoded = base64UrlDecode(part);
+    }
+    catch (e) {
+        throw new InvalidTokenError(`Invalid token specified: invalid base64 for part #${pos + 1} (${e.message})`);
+    }
+    try {
+        return JSON.parse(decoded);
+    }
+    catch (e) {
+        throw new InvalidTokenError(`Invalid token specified: invalid json for part #${pos + 1} (${e.message})`);
+    }
 }
 
 /**
  * Dynamic Form Builder Web Component
  * Fetches JSON schema and form data, then renders a dynamic form
- * 
+ *
  * @element form-builder
- * 
+ *
  * @attr {string} fbms-base-url - Base URL of the form builder microservice
  * @attr {string} fbms-form-fname - Form name to fetch
  * @attr {string} oidc-url - OpenID Connect URL for authentication
@@ -50,7 +102,7 @@ class FormBuilder extends i {
 
     // Internal state
     schema: { type: Object, state: true },
-    formData: { type: Object, state: true },
+    _formData: { type: Object, state: true },
     uiSchema: { type: Object, state: true },
     fbmsFormVersion: { type: String, state: true },
     loading: { type: Boolean, state: true },
@@ -58,12 +110,20 @@ class FormBuilder extends i {
     error: { type: String, state: true },
     token: { type: String, state: true },
     decoded: { type: Object, state: true },
+    submitSuccess: { type: Boolean, state: true },
+    validationFailed: { type: Boolean, state: true },
+    initialFormData: { type: Object, state: true },
+    hasChanges: { type: Boolean, state: true },
+    submissionStatus: { type: Object, state: true },
+    formCompleted: { type: Boolean, state: true },
+    submissionError: { type: String, state: true },
   };
 
   static styles = i$3`
     :host {
       display: block;
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+      font-family:
+        -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
     }
 
     .container {
@@ -96,7 +156,27 @@ class FormBuilder extends i {
     .form-group {
       display: flex;
       flex-direction: column;
-      gap: 8px;
+      gap: 4px;
+      margin: 14px 0px;
+    }
+
+    .nested-object {
+      margin-left: 20px;
+      padding-left: 20px;
+      border-left: 2px solid #e0e0e0;
+      margin-top: 10px;
+    }
+
+    .nested-object-title {
+      font-weight: 600;
+      color: #333;
+      margin-bottom: 10px;
+    }
+
+    .nested-object-description {
+      font-size: 0.875rem;
+      color: #666;
+      margin-bottom: 15px;
     }
 
     label {
@@ -115,11 +195,11 @@ class FormBuilder extends i {
       margin-top: 4px;
     }
 
-    input[type="text"],
-    input[type="email"],
-    input[type="number"],
-    input[type="date"],
-    input[type="tel"],
+    input[type='text'],
+    input[type='email'],
+    input[type='number'],
+    input[type='date'],
+    input[type='tel'],
     textarea,
     select {
       padding: 8px 12px;
@@ -139,16 +219,40 @@ class FormBuilder extends i {
       box-shadow: 0 0 0 3px rgba(0, 102, 204, 0.1);
     }
 
+    select[multiple] {
+      min-height: 120px;
+      padding: 4px;
+    }
+
+    select[multiple] option {
+      padding: 4px 8px;
+    }
+
     textarea {
       min-height: 100px;
       resize: vertical;
     }
 
-    input[type="checkbox"],
-    input[type="radio"] {
+    input[type='checkbox'],
+    input[type='radio'] {
       margin-right: 8px;
     }
 
+    fieldset {
+      border: none;
+      padding: 0;
+      margin: 0;
+      min-width: 0; /* Fix for some browsers */
+    }
+
+    legend {
+      font-weight: 700;
+      color: #333;
+      padding: 0;
+      margin-bottom: 8px;
+      font-size: 1rem;
+    }
+
     .checkbox-group,
     .radio-group {
       display: flex;
@@ -162,6 +266,18 @@ class FormBuilder extends i {
       align-items: center;
     }
 
+    .checkbox-group.inline,
+    .radio-group.inline {
+      flex-direction: row;
+      flex-wrap: wrap;
+      gap: 16px;
+    }
+
+    .checkbox-group.inline .checkbox-item,
+    .radio-group.inline .radio-item {
+      margin-right: 0;
+    }
+
     .error-message {
       color: #c00;
       font-size: 0.875rem;
@@ -184,21 +300,21 @@ class FormBuilder extends i {
       transition: background-color 0.2s;
     }
 
-    button[type="submit"] {
+    button[type='submit'] {
       background-color: #0066cc;
       color: white;
     }
 
-    button[type="submit"]:hover {
+    button[type='submit']:hover {
       background-color: #0052a3;
     }
 
-    button[type="button"] {
+    button[type='button'] {
       background-color: #c0c0c0;
       color: #333;
     }
 
-    button[type="button"]:hover {
+    button[type='button']:hover {
       background-color: #e0e0e0;
     }
 
@@ -220,7 +336,9 @@ class FormBuilder extends i {
     }
 
     @keyframes spin {
-      to { transform: rotate(360deg); }
+      to {
+        transform: rotate(360deg);
+      }
     }
 
     .button-content {
@@ -228,20 +346,117 @@ class FormBuilder extends i {
       align-items: center;
       justify-content: center;
     }
+
+    .status-message {
+      padding: 12px 16px;
+      border-radius: 4px;
+      margin-bottom: 20px;
+      font-weight: 500;
+    }
+
+    .status-message.success {
+      background-color: #d4edda;
+      border: 1px solid #c3e6cb;
+      color: #155724;
+    }
+
+    .status-message.validation-error {
+      background-color: #fff3cd;
+      border: 1px solid #ffeaa7;
+      color: #856404;
+    }
+
+    .status-message.error {
+      background-color: #f8d7da;
+      border: 1px solid #f5c6cb;
+      color: #721c24;
+    }
+
+    .status-message ul {
+      margin: 8px 0 0 0;
+      padding-left: 20px;
+    }
+
+    .status-message li {
+      margin: 4px 0;
+    }
+
+    form.submitting input,
+    form.submitting textarea,
+    form.submitting select,
+    form.submitting button:not([type='submit']) {
+      opacity: 0.6;
+      pointer-events: none;
+      cursor: not-allowed;
+    }
+
+    .info-only {
+      padding: 20px 0;
+    }
+
+    .info-only p {
+      line-height: 1.6;
+      color: #333;
+    }
+
+    .info-label {
+      font-weight: 500;
+      color: #333;
+      display: block;
+    }
   `;
 
+  // Getter and setter for formData
+  get formData() {
+    return this._formData;
+  }
+
+  set formData(value) {
+    const oldValue = this._formData;
+    this._formData = value;
+    this.requestUpdate('formData', oldValue);
+    this.updateStateFlags();
+  }
+
+  /**
+   * Get custom error message from schema if available
+   * Follows the pattern: schema.properties.fieldName.messages.ruleName
+   * For nested fields: schema.properties.parent.properties.child.messages.ruleName
+   * Returns null if field, messages, or rule doesn't exist
+   */
+  getCustomErrorMessage(fieldPath, ruleName) {
+    const pathParts = fieldPath.split('.');
+    let current = this.schema;
+
+    // Navigate to the field schema
+    for (const part of pathParts) {
+      current = current?.properties?.[part];
+      if (!current) return null;
+    }
+
+    // Check for custom message
+    return current?.messages?.[ruleName] ?? null;
+  }
+
   constructor() {
     super();
     this.loading = true;
     this.submitting = false;
     this.error = null;
     this.schema = null;
-    this.formData = {};
+    this._formData = {};
     this.uiSchema = null;
     this.fbmsFormVersion = null;
     this.token = null;
-    this.decoded = {sub: 'unknown'};
+    this.decoded = { sub: 'unknown' };
     this.fieldErrors = {};
+    this.submitSuccess = false;
+    this.validationFailed = false;
+    this.initialFormData = {};
+    this.hasChanges = false;
+    this.submissionStatus = null;
+    this.formCompleted = false;
+    this.submissionError = null;
   }
 
   async connectedCallback() {
@@ -260,10 +475,7 @@ class FormBuilder extends i {
       }
 
       // Fetch form schema and data
-      await Promise.all([
-        this.fetchSchema(),
-        this.fetchFormData(),
-      ]);
+      await Promise.all([this.fetchSchema(), this.fetchFormData()]);
 
       this.loading = false;
     } catch (err) {
@@ -272,6 +484,80 @@ class FormBuilder extends i {
     }
   }
 
+  /**
+   * Deep clone an object, handling Dates and other types
+   * Uses structuredClone if available, otherwise falls back to manual recursive
+   */
+  deepClone(obj) {
+    if (obj === null || obj === undefined) return obj;
+
+    // Use structuredClone if available (modern browsers)
+    if (typeof structuredClone === 'function') {
+      try {
+        return structuredClone(obj);
+      } catch (err) {
+        console.warn('structuredClone failed, falling back to manual clone:', err);
+      }
+    }
+
+    // Fallback: manual deep clone handling common types
+    if (obj instanceof Date) {
+      return new Date(obj.getTime());
+    }
+
+    if (Array.isArray(obj)) {
+      return obj.map((item) => this.deepClone(item));
+    }
+
+    if (typeof obj === 'object') {
+      const cloned = {};
+      for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+          cloned[key] = this.deepClone(obj[key]);
+        }
+      }
+      return cloned;
+    }
+
+    // Primitives
+    return obj;
+  }
+
+  /**
+   * Deep equality check, handling Dates and other types
+   */
+  deepEqual(obj1, obj2) {
+    if (obj1 === obj2) return true;
+
+    if (obj1 === null || obj2 === null) return false;
+    if (obj1 === undefined || obj2 === undefined) return false;
+
+    if (obj1 instanceof Date && obj2 instanceof Date) {
+      return obj1.getTime() === obj2.getTime();
+    }
+
+    // If only one is a Date, they are not equal
+    if (obj1 instanceof Date || obj2 instanceof Date) {
+      return false;
+    }
+
+    if (Array.isArray(obj1) && Array.isArray(obj2)) {
+      if (obj1.length !== obj2.length) return false;
+      return obj1.every((item, index) => this.deepEqual(item, obj2[index]));
+    }
+
+    if (typeof obj1 === 'object' && typeof obj2 === 'object') {
+      const keys1 = Object.keys(obj1);
+      const keys2 = Object.keys(obj2);
+
+      if (keys1.length !== keys2.length) return false;
+
+      return keys1.every((key) => this.deepEqual(obj1[key], obj2[key]));
+    }
+
+    return false;
+  }
+
   async fetchToken() {
     try {
       const response = await fetch(this.oidcUrl, {
@@ -284,7 +570,13 @@ class FormBuilder extends i {
 
       const data = await response.text();
       this.token = data;
-      this.decoded = o(this.token);
+      try {
+        this.decoded = jwtDecode(this.token);
+      } catch (_err) {
+        // Only need this to get the name, so warn
+        console.warn('Security Token failed to decode -- setting user to unknown');
+        this.decoded = { sub: 'unknown' };
+      }
     } catch (err) {
       console.error('Token fetch error:', err);
       throw new Error('Authentication failed');
@@ -334,66 +626,250 @@ class FormBuilder extends i {
 
       if (response.ok) {
         const payload = await response.json();
-        this.formData = payload.answers;
+        this._formData = payload?.answers ?? {}; // Use private property
+        this.initialFormData = this.deepClone(this._formData); // Use deepClone
       } else {
-        // It's OK if there's no existing data
-        this.formData = {};
+        this._formData = {};
+        this.initialFormData = {};
       }
+      this.hasChanges = false;
+      this.requestUpdate();
     } catch (err) {
       // Non-critical error
       console.warn('Could not fetch form data:', err);
-      this.formData = {};
+      this._formData = {};
+      this.initialFormData = {};
+      this.hasChanges = false;
+      this.requestUpdate();
     }
   }
 
-  handleInputChange(fieldName, event) {
-    const { type, value, checked } = event.target;
+  updateStateFlags() {
+    // Clear status messages when user makes changes
+    this.submitSuccess = false;
+    this.validationFailed = false;
+    this.submissionError = null;
 
-    this.formData = {
-      ...this.formData,
-      [fieldName]: type === 'checkbox' ? checked : value,
-    };
+    // Check if form data has changed from initial state
+    this.hasChanges = !this.deepEqual(this.formData, this.initialFormData);
+  }
+
+  /**
+   * Get nested value from formData using dot notation path
+   * e.g., "contact_information.email" => formData.contact_information.email
+   */
+  getNestedValue(path) {
+    if (!path || typeof path !== 'string') return undefined;
+
+    const parts = path.split('.').filter((part) => part.length > 0);
+    if (parts.length === 0) return undefined;
+
+    let value = this.formData;
+    for (const part of parts) {
+      value = value?.[part];
+    }
+    return value;
+  }
+
+  /**
+   * Sanitize a string for use as an HTML ID
+   * Replaces spaces and special characters with hyphens and collapses consecutive hyphens
+   * Ensures the ID starts with a letter by adding a prefix if necessary
+   */
+  sanitizeId(str) {
+    if (typeof str !== 'string') {
+      str = String(str ?? '');
+    }
+
+    // Replace invalid characters and collapse multiple hyphens
+    let sanitized = str.replace(/[^a-zA-Z0-9-_.]/g, '-').replace(/-+/g, '-');
+
+    // Trim leading/trailing hyphens that may have been introduced
+    sanitized = sanitized.replace(/^-+/, '').replace(/-+$/, '');
+
+    // Ensure we have some content
+    if (!sanitized) {
+      sanitized = 'id';
+    }
+
+    // Ensure the ID starts with a letter
+    if (!/^[A-Za-z]/.test(sanitized)) {
+      sanitized = 'id-' + sanitized;
+    }
+
+    return sanitized;
+  }
+
+  /**
+   * Set nested value in formData using dot notation path
+   */
+  setNestedValue(path, value) {
+    if (!path || typeof path !== 'string') return;
+
+    const parts = path.split('.').filter((part) => part.length > 0);
+    if (parts.length === 0) return;
+
+    const newData = { ...this.formData };
+    let current = newData;
+
+    for (let i = 0; i < parts.length - 1; i++) {
+      const part = parts[i];
+      const existing = current[part];
+      // Note: Arrays are not currently supported in schemas, but we preserve them
+      // to maintain data integrity. Setting properties on arrays may produce unexpected results.
+      if (Array.isArray(existing)) {
+        current[part] = [...existing];
+      } else if (!existing || typeof existing !== 'object') {
+        current[part] = {};
+      } else {
+        current[part] = { ...existing };
+      }
+      current = current[part];
+    }
+
+    current[parts[parts.length - 1]] = value;
+    this.formData = newData;
+  }
+
+  /**
+   * Get the schema object at a given path
+   * e.g., "contact_information" => schema.properties.contact_information
+   */
+  getSchemaAtPath(path) {
+    if (!path) return this.schema; // Handle empty string/null/undefined
+
+    const parts = path.split('.').filter((part) => part.length > 0);
+    if (parts.length === 0) return this.schema; // All segments were empty
+
+    let schema = this.schema;
+
+    for (const part of parts) {
+      schema = schema.properties?.[part];
+      if (!schema) return null;
+    }
+
+    return schema;
+  }
+
+  handleInputChange(fieldPath, event) {
+    const { type, value, checked } = event.target;
+    this.setNestedValue(fieldPath, type === 'checkbox' ? checked : value);
 
     // Clear field error on change
-    if (this.fieldErrors[fieldName]) {
+    if (this.fieldErrors[fieldPath]) {
       this.fieldErrors = { ...this.fieldErrors };
-      delete this.fieldErrors[fieldName];
+      delete this.fieldErrors[fieldPath];
     }
+
+    this.updateStateFlags();
   }
 
-  handleArrayChange(fieldName, index, event) {
-    const currentArray = this.formData[fieldName] || [];
+  handleArrayChange(fieldPath, index, event) {
+    const currentArray = this.getNestedValue(fieldPath) || [];
     const newArray = [...currentArray];
     newArray[index] = event.target.value;
+    this.setNestedValue(fieldPath, newArray);
 
-    this.formData = {
-      ...this.formData,
-      [fieldName]: newArray,
-    };
+    this.updateStateFlags();
   }
 
-  validateForm() {
+  handleMultiSelectChange(fieldPath, event) {
+    const selectedOptions = Array.from(event.target.selectedOptions);
+    const values = selectedOptions.map((option) => option.value);
+
+    this.setNestedValue(fieldPath, values);
+
+    // Clear field error on change
+    if (this.fieldErrors[fieldPath]) {
+      this.fieldErrors = { ...this.fieldErrors };
+      delete this.fieldErrors[fieldPath];
+    }
+
+    this.updateStateFlags();
+  }
+
+  handleCheckboxArrayChange(fieldPath, optionValue, event) {
+    const { checked } = event.target;
+    const currentArray = this.getNestedValue(fieldPath) || [];
+
+    let newArray;
+    if (checked) {
+      // Add to array if not already present
+      newArray = currentArray.includes(optionValue) ? currentArray : [...currentArray, optionValue];
+    } else {
+      // Remove from array
+      newArray = currentArray.filter((v) => v !== optionValue);
+    }
+
+    this.setNestedValue(fieldPath, newArray);
+
+    // Clear field error on change
+    if (this.fieldErrors[fieldPath]) {
+      this.fieldErrors = { ...this.fieldErrors };
+      delete this.fieldErrors[fieldPath];
+    }
+
+    this.updateStateFlags();
+  }
+
+  /**
+   * Recursively validate form fields including nested objects
+   */
+  validateFormFields(properties, required = [], basePath = '', depth = 0) {
+    const MAX_DEPTH = 10;
+    if (depth > MAX_DEPTH) {
+      console.warn(`Schema nesting exceeds maximum depth of ${MAX_DEPTH} at path: ${basePath}`);
+      return {};
+    }
+
     const errors = {};
-    const { properties = {}, required = [] } = this.schema;
 
     // Check required fields
-    required.forEach(fieldName => {
-      const value = this.formData[fieldName];
+    required.forEach((fieldName) => {
+      const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
+      const value = this.getNestedValue(fieldPath);
       if (value === undefined || value === null || value === '') {
-        errors[fieldName] = 'This field is required';
+        const customMsg = this.getCustomErrorMessage(fieldPath, 'required');
+        errors[fieldPath] = customMsg || 'This field is required';
       }
     });
 
     // Type validation
     Object.entries(properties).forEach(([fieldName, fieldSchema]) => {
-      const value = this.formData[fieldName];
+      const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
+      const value = this.getNestedValue(fieldPath);
+
+      // Handle nested objects recursively
+      if (fieldSchema.type === 'object' && fieldSchema.properties) {
+        const nestedErrors = this.validateFormFields(
+          fieldSchema.properties,
+          fieldSchema.required || [],
+          fieldPath,
+          depth + 1
+        );
+        Object.assign(errors, nestedErrors);
+        return;
+      }
 
       if (value !== undefined && value !== null && value !== '') {
         // Email validation
         if (fieldSchema.format === 'email') {
           const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
           if (!emailRegex.test(value)) {
-            errors[fieldName] = 'Invalid email address';
+            // Support both 'format' (generic) and 'email' (specific) custom message keys
+            const customMsg =
+              this.getCustomErrorMessage(fieldPath, 'format') ||
+              this.getCustomErrorMessage(fieldPath, 'email');
+            errors[fieldPath] = customMsg || 'Invalid email address';
+          }
+        }
+
+        // Pattern validation
+        if (fieldSchema.pattern) {
+          const regex = new RegExp(fieldSchema.pattern);
+          if (!regex.test(value)) {
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'pattern');
+            errors[fieldPath] = customMsg || 'Invalid format';
           }
         }
 
@@ -401,13 +877,16 @@ class FormBuilder extends i {
         if (fieldSchema.type === 'number' || fieldSchema.type === 'integer') {
           const num = Number(value);
           if (isNaN(num)) {
-            errors[fieldName] = 'Must be a number';
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'type');
+            errors[fieldPath] = customMsg || 'Must be a number';
           } else {
             if (fieldSchema.minimum !== undefined && num < fieldSchema.minimum) {
-              errors[fieldName] = `Must be at least ${fieldSchema.minimum}`;
+              const customMsg = this.getCustomErrorMessage(fieldPath, 'minimum');
+              errors[fieldPath] = customMsg || `Must be at least ${fieldSchema.minimum}`;
             }
             if (fieldSchema.maximum !== undefined && num > fieldSchema.maximum) {
-              errors[fieldName] = `Must be at most ${fieldSchema.maximum}`;
+              const customMsg = this.getCustomErrorMessage(fieldPath, 'maximum');
+              errors[fieldPath] = customMsg || `Must be at most ${fieldSchema.maximum}`;
             }
           }
         }
@@ -415,24 +894,41 @@ class FormBuilder extends i {
         // String length validation
         if (fieldSchema.type === 'string') {
           if (fieldSchema.minLength && value.length < fieldSchema.minLength) {
-            errors[fieldName] = `Must be at least ${fieldSchema.minLength} characters`;
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'minLength');
+            errors[fieldPath] = customMsg || `Must be at least ${fieldSchema.minLength} characters`;
           }
           if (fieldSchema.maxLength && value.length > fieldSchema.maxLength) {
-            errors[fieldName] = `Must be at most ${fieldSchema.maxLength} characters`;
+            const customMsg = this.getCustomErrorMessage(fieldPath, 'maxLength');
+            errors[fieldPath] = customMsg || `Must be at most ${fieldSchema.maxLength} characters`;
           }
         }
       }
     });
 
-    this.fieldErrors = errors;
-    return Object.keys(errors).length === 0;
+    return errors;
+  }
+
+  validateForm() {
+    const { properties = {}, required = [] } = this.schema;
+    this.fieldErrors = this.validateFormFields(properties, required);
+    return Object.keys(this.fieldErrors).length === 0;
   }
 
   async handleSubmit(event) {
     event.preventDefault();
 
+    // Clear previous status messages
+    this.submitSuccess = false;
+    this.validationFailed = false;
     if (!this.validateForm()) {
-      this.requestUpdate();
+      this.validationFailed = true;
+      await this.updateComplete; // Wait for render to complete
+
+      // Scroll to validation warning banner at top of form
+      const validationWarning = this.shadowRoot.querySelector('.status-message.validation-error');
+      if (validationWarning) {
+        validationWarning.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }
       return;
     }
 
@@ -441,17 +937,25 @@ class FormBuilder extends i {
       return;
     }
 
+    await this.submitWithRetry(false);
+  }
+
+  async submitWithRetry(isRetry = false) {
     try {
-      this.submitting = true;
-      this.error = null;
+      // Only set submitting on the first call, not on retry
+      if (!isRetry) {
+        this.submitting = true;
+      }
+      this.submissionError = null;
+      this.submissionStatus = null; // Clear previous messages
+
       const body = {
         username: this.decoded.sub,
         formFname: this.fbmsFormFname,
         formVersion: this.fbmsFormVersion,
         timestamp: Date.now(),
-        answers: this.formData
+        answers: this.formData,
       };
-      await delay(300);
 
       const url = `${this.fbmsBaseUrl}/api/v1/submissions/${this.fbmsFormFname}`;
       const headers = {
@@ -469,27 +973,121 @@ class FormBuilder extends i {
         body: JSON.stringify(body),
       });
 
+      // Try to parse response body for messages (even on error)
+      let responseData = null;
+      try {
+        responseData = await response.json();
+        this.submissionStatus = responseData;
+      } catch (jsonErr) {
+        // Response might not be JSON
+        console.warn('Could not parse response as JSON:', jsonErr);
+      }
+
+      // Handle 403 - token may be stale
+      if (response.status === 403 && !isRetry) {
+        console.warn('Received 403, attempting to refresh token and retry...');
+
+        // Re-fetch token if OIDC URL is configured
+        if (this.oidcUrl) {
+          try {
+            await this.fetchToken();
+            console.warn('Token refreshed successfully, retrying submission...');
+
+            // Retry once with new token (submitting flag stays true)
+            return await this.submitWithRetry(true);
+          } catch (tokenError) {
+            console.error('Failed to refresh token:', tokenError);
+            // Fall through to handle the original 403 error
+            throw new Error('Authentication failed: Unable to refresh token');
+          }
+        } else {
+          console.warn('OIDC URL is not configured; cannot refresh token. Skipping retry.');
+          // Fall through to handle the 403 error normally
+        }
+      }
+
       if (!response.ok) {
-        throw new Error(`Failed to submit form: ${response.statusText}`);
+        // Provide specific error for 403 after retry
+        if (response.status === 403 && isRetry) {
+          throw new Error(
+            'Authorization failed: Access denied even after token refresh. You may not have permission to submit this form.'
+          );
+        }
+
+        // Use server error message if available
+        const errorMessage =
+          responseData?.messageHeader ||
+          responseData?.message ||
+          `Failed to submit form: ${response.statusText}`;
+        throw new Error(errorMessage);
       }
 
-      // Dispatch success event
-      this.dispatchEvent(new CustomEvent('form-submit-success', {
-        detail: { data: body },
-        bubbles: true,
-        composed: true,
-      }));
+      // Check for form forwarding header (safely handle missing headers object)
+      const formForward = response.headers?.get ? response.headers.get('x-fbms-formforward') : null;
+      if (formForward) {
+        // eslint-disable-next-line no-console
+        console.info(`Form submitted successfully. Forwarding to next form: ${formForward}`);
+        this.fbmsFormFname = formForward;
+
+        // Keep success state and messages visible for the forwarded form
+        this.submitSuccess = true;
+        // Note: submissionStatus is preserved to show server messages on the next form
+        this.formCompleted = false;
+
+        // Re-initialize with the new form
+        this.loading = true;
+        try {
+          await this.initialize();
+          return; // Exit early, don't show success message for intermediate form
+          // Note: finally block will set submitting = false
+        } catch (forwardingError) {
+          console.error('Failed to load forwarded form:', forwardingError);
+          this.loading = false;
+          this.submissionError =
+            forwardingError?.message || 'Form was submitted, but loading the next form failed.';
+        }
+      }
 
-      // Optional: Reset or show success message
-      this.error = null;
+      // Dispatch success event
+      this.dispatchEvent(
+        new CustomEvent('form-submit-success', {
+          detail: { data: body },
+          bubbles: true,
+          composed: true,
+        })
+      );
+
+      // No form forward - this is the final form completion
+      this.formCompleted = true;
+      this.submitSuccess = true;
+      this.submissionError = null;
+      this.initialFormData = this.deepClone(this.formData);
+      this.hasChanges = false;
+
+      await this.updateComplete;
+
+      // Scroll to success message
+      const successMsg = this.shadowRoot.querySelector('.status-message.success');
+      if (successMsg) {
+        successMsg.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }
     } catch (err) {
-      this.error = err.message || 'Failed to submit form';
-
-      this.dispatchEvent(new CustomEvent('form-submit-error', {
-        detail: { error: err.message },
-        bubbles: true,
-        composed: true,
-      }));
+      this.submissionError = err.message || 'Failed to submit form';
+
+      this.dispatchEvent(
+        new CustomEvent('form-submit-error', {
+          detail: { error: err.message },
+          bubbles: true,
+          composed: true,
+        })
+      );
+
+      // Scroll to error message at top of form
+      await this.updateComplete;
+      const errorMsg = this.shadowRoot.querySelector('.status-message.error');
+      if (errorMsg) {
+        errorMsg.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }
     } finally {
       this.submitting = false;
     }
@@ -501,49 +1099,211 @@ class FormBuilder extends i {
     this.requestUpdate();
   }
 
-  renderField(fieldName, fieldSchema) {
-    const value = this.formData[fieldName];
-    const error = this.fieldErrors[fieldName];
-    const required = this.schema.required?.includes(fieldName);
-    const uiOptions = this.uiSchema?.[fieldName] || {};
+  /**
+   * Render a field - can be a simple input or a nested object
+   */
+  renderField(fieldName, fieldSchema, basePath = '', depth = 0) {
+    const MAX_DEPTH = 10;
+    if (depth > MAX_DEPTH) {
+      console.warn(`Schema nesting exceeds maximum depth of ${MAX_DEPTH}`);
+      return x`<div class="error">Schema too deeply nested</div>`;
+    }
+
+    const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
+
+    // Handle nested objects with properties
+    if (fieldSchema.type === 'object' && fieldSchema.properties) {
+      return this.renderNestedObject(fieldName, fieldSchema, basePath, depth);
+    }
+
+    // Single-value enum - render as informational text only (title serves as the message)
+    if (fieldSchema.enum && fieldSchema.enum.length === 1) {
+      return x`
+        <div class="form-group">
+          <span class="info-label">${fieldSchema.title || fieldName}</span>
+          ${fieldSchema.description
+            ? x`<span class="description">${fieldSchema.description}</span>`
+            : ''}
+        </div>
+      `;
+    }
+
+    // Regular field
+    const value = this.getNestedValue(fieldPath);
+    const error = this.fieldErrors[fieldPath];
+    // For nested fields, check the parent schema's required array
+    const parentSchema = basePath ? this.getSchemaAtPath(basePath) : this.schema;
+    const required = parentSchema?.required?.includes(fieldName) ?? false;
+    const uiSchemaPath = fieldPath.split('.');
+    let uiOptions = this.uiSchema;
+    for (const part of uiSchemaPath) {
+      uiOptions = uiOptions?.[part];
+    }
+    uiOptions = uiOptions || {};
+
+    const widget = uiOptions['ui:widget'];
+    const isGroupedInput = widget === 'radio' || widget === 'checkboxes';
 
     return x`
       <div class="form-group">
-        <label class="${required ? 'required' : ''}" for="${fieldName}">
-          ${fieldSchema.title || fieldName}
-        </label>
-
-        ${fieldSchema.description ? x`
-          <span class="description">${fieldSchema.description}</span>
-        ` : ''}
+        ${!isGroupedInput
+          ? x`
+              <label class="${required ? 'required' : ''}" for="${fieldPath}">
+                ${fieldSchema.title || fieldName}
+              </label>
+            `
+          : ''}
+        ${fieldSchema.description && !isGroupedInput
+          ? x` <span class="description">${fieldSchema.description}</span> `
+          : ''}
+        ${this.renderInput(fieldPath, fieldSchema, value, uiOptions)}
+        ${error ? x` <span class="error-message">${error}</span> ` : ''}
+      </div>
+    `;
+  }
 
-        ${this.renderInput(fieldName, fieldSchema, value, uiOptions)}
+  /**
+   * Render a nested object with its own properties
+   */
+  renderNestedObject(fieldName, fieldSchema, basePath = '', depth = 0) {
+    const fieldPath = basePath ? `${basePath}.${fieldName}` : fieldName;
 
-        ${error ? x`
-          <span class="error-message">${error}</span>
-        ` : ''}
+    return x`
+      <div class="nested-object">
+        ${fieldSchema.title
+          ? x`<div class="nested-object-title">${fieldSchema.title}</div>`
+          : ''}
+        ${fieldSchema.description
+          ? x`<div class="nested-object-description">${fieldSchema.description}</div>`
+          : ''}
+        ${Object.entries(fieldSchema.properties).map(([nestedFieldName, nestedFieldSchema]) =>
+          this.renderField(nestedFieldName, nestedFieldSchema, fieldPath, depth + 1)
+        )}
       </div>
     `;
   }
 
-  renderInput(fieldName, fieldSchema, value, uiOptions) {
-    const { type, enum: enumValues, format } = fieldSchema;
+  renderInput(fieldPath, fieldSchema, value, uiOptions) {
+    const { type, enum: enumValues, format, items } = fieldSchema;
+    const widget = uiOptions['ui:widget'];
+    const isInline = uiOptions['ui:options']?.inline;
+
+    // Single-value enum - no input needed, title/label already displays the message
+    if (enumValues && enumValues.length === 1) {
+      return x``;
+    }
+
+    // Array of enums with checkboxes widget - render as checkboxes
+    if (type === 'array' && items?.enum && widget === 'checkboxes') {
+      const selectedValues = Array.isArray(value) ? value : [];
+      const containerClass = isInline ? 'checkbox-group inline' : 'checkbox-group';
+
+      // Extract basePath and fieldName from fieldPath
+      const pathParts = fieldPath.split('.');
+      const fieldName = pathParts[pathParts.length - 1];
+      const basePath = pathParts.slice(0, -1).join('.');
+
+      const parentSchema = basePath ? this.getSchemaAtPath(basePath) : this.schema;
+      const isRequired = parentSchema?.required?.includes(fieldName) ?? false;
+
+      return x`
+        <fieldset class="${containerClass}">
+          <legend class="${isRequired ? 'required' : ''}">${fieldSchema.title || fieldName}</legend>
+          ${fieldSchema.description
+            ? x`<span class="description">${fieldSchema.description}</span>`
+            : ''}
+          ${items.enum.map((opt) => {
+            const sanitizedId = this.sanitizeId(`${fieldPath}-${opt}`);
+            return x`
+              <div class="checkbox-item">
+                <input
+                  type="checkbox"
+                  id="${sanitizedId}"
+                  name="${fieldPath}"
+                  value="${opt}"
+                  .checked="${selectedValues.includes(opt)}"
+                  @change="${(e) => this.handleCheckboxArrayChange(fieldPath, opt, e)}"
+                />
+                <label for="${sanitizedId}">${opt}</label>
+              </div>
+            `;
+          })}
+        </fieldset>
+      `;
+    }
+
+    // Array of enums without widget - render as multi-select dropdown (default)
+    if (type === 'array' && items?.enum) {
+      const selectedValues = Array.isArray(value) ? value : [];
 
-    // Enum - render as select
+      return x`
+        <select
+          id="${fieldPath}"
+          name="${fieldPath}"
+          multiple
+          size="5"
+          @change="${(e) => this.handleMultiSelectChange(fieldPath, e)}"
+        >
+          ${items.enum.map(
+            (opt) => x`
+              <option value="${opt}" ?selected="${selectedValues.includes(opt)}">${opt}</option>
+            `
+          )}
+        </select>
+      `;
+    }
+
+    // Enum with radio widget - render as radio buttons
+    if (enumValues && widget === 'radio') {
+      const containerClass = isInline ? 'radio-group inline' : 'radio-group';
+
+      // Extract basePath and fieldName from fieldPath
+      const pathParts = fieldPath.split('.');
+      const fieldName = pathParts[pathParts.length - 1];
+      const basePath = pathParts.slice(0, -1).join('.');
+
+      const parentSchema = basePath ? this.getSchemaAtPath(basePath) : this.schema;
+      const isRequired = parentSchema?.required?.includes(fieldName) ?? false;
+
+      return x`
+        <fieldset class="${containerClass}">
+          <legend class="${isRequired ? 'required' : ''}">${fieldSchema.title || fieldName}</legend>
+          ${fieldSchema.description
+            ? x`<span class="description">${fieldSchema.description}</span>`
+            : ''}
+          ${enumValues.map((opt) => {
+            const sanitizedId = this.sanitizeId(`${fieldPath}-${opt}`);
+            return x`
+              <div class="radio-item">
+                <input
+                  type="radio"
+                  id="${sanitizedId}"
+                  name="${fieldPath}"
+                  value="${opt}"
+                  .checked="${value === opt}"
+                  @change="${(e) => this.handleInputChange(fieldPath, e)}"
+                />
+                <label for="${sanitizedId}">${opt}</label>
+              </div>
+            `;
+          })}
+        </fieldset>
+      `;
+    }
+
+    // Enum - render as select (default)
     if (enumValues) {
       return x`
         <select
-          id="${fieldName}"
-          name="${fieldName}"
+          id="${fieldPath}"
+          name="${fieldPath}"
           .value="${value || ''}"
-          @change="${(e) => this.handleInputChange(fieldName, e)}"
+          @change="${(e) => this.handleInputChange(fieldPath, e)}"
         >
           <option value="">-- Select --</option>
-          ${enumValues.map(opt => x`
-            <option value="${opt}" ?selected="${value === opt}">
-              ${opt}
-            </option>
-          `)}
+          ${enumValues.map(
+            (opt) => x` <option value="${opt}" ?selected="${value === opt}">${opt}</option> `
+          )}
         </select>
       `;
     }
@@ -554,12 +1314,12 @@ class FormBuilder extends i {
         <div class="checkbox-item">
           <input
             type="checkbox"
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .checked="${!!value}"
-            @change="${(e) => this.handleInputChange(fieldName, e)}"
+            @change="${(e) => this.handleInputChange(fieldPath, e)}"
           />
-          <label for="${fieldName}">${fieldSchema.title || fieldName}</label>
+          <label for="${fieldPath}">${fieldSchema.title || fieldPath.split('.').pop()}</label>
         </div>
       `;
     }
@@ -570,10 +1330,10 @@ class FormBuilder extends i {
         return x`
           <input
             type="email"
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .value="${value || ''}"
-            @input="${(e) => this.handleInputChange(fieldName, e)}"
+            @input="${(e) => this.handleInputChange(fieldPath, e)}"
           />
         `;
       }
@@ -582,10 +1342,10 @@ class FormBuilder extends i {
         return x`
           <input
             type="date"
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .value="${value || ''}"
-            @input="${(e) => this.handleInputChange(fieldName, e)}"
+            @input="${(e) => this.handleInputChange(fieldPath, e)}"
           />
         `;
       }
@@ -593,10 +1353,10 @@ class FormBuilder extends i {
       if (uiOptions['ui:widget'] === 'textarea') {
         return x`
           <textarea
-            id="${fieldName}"
-            name="${fieldName}"
+            id="${fieldPath}"
+            name="${fieldPath}"
             .value="${value || ''}"
-            @input="${(e) => this.handleInputChange(fieldName, e)}"
+            @input="${(e) => this.handleInputChange(fieldPath, e)}"
           ></textarea>
         `;
       }
@@ -605,10 +1365,10 @@ class FormBuilder extends i {
       return x`
         <input
           type="text"
-          id="${fieldName}"
-          name="${fieldName}"
+          id="${fieldPath}"
+          name="${fieldPath}"
           .value="${value || ''}"
-          @input="${(e) => this.handleInputChange(fieldName, e)}"
+          @input="${(e) => this.handleInputChange(fieldPath, e)}"
         />
       `;
     }
@@ -618,11 +1378,11 @@ class FormBuilder extends i {
       return x`
         <input
           type="number"
-          id="${fieldName}"
-          name="${fieldName}"
+          id="${fieldPath}"
+          name="${fieldPath}"
           .value="${value || ''}"
           step="${type === 'integer' ? '1' : 'any'}"
-          @input="${(e) => this.handleInputChange(fieldName, e)}"
+          @input="${(e) => this.handleInputChange(fieldPath, e)}"
         />
       `;
     }
@@ -631,29 +1391,27 @@ class FormBuilder extends i {
     return x`
       <input
         type="text"
-        id="${fieldName}"
-        name="${fieldName}"
+        id="${fieldPath}"
+        name="${fieldPath}"
         .value="${value || ''}"
-        @input="${(e) => this.handleInputChange(fieldName, e)}"
+        @input="${(e) => this.handleInputChange(fieldPath, e)}"
       />
     `;
   }
 
   render() {
-    if (this.loading) {
+    if (this.error) {
       return x`
         <div class="container">
-          <div class="loading">Loading form...</div>
+          <div class="error"><strong>Error:</strong> ${this.error}</div>
         </div>
       `;
     }
 
-    if (this.error) {
+    if (this.loading) {
       return x`
         <div class="container">
-          <div class="error">
-            <strong>Error:</strong> ${this.error}
-          </div>
+          <div class="loading">Loading form...</div>
         </div>
       `;
     }
@@ -666,30 +1424,106 @@ class FormBuilder extends i {
       `;
     }
 
-    return x`
-      ${this.customStyles ? x`<style>${this.customStyles}</style>` : ''}
+    // NEW: Success-only view when form is completed
+    if (this.formCompleted) {
+      return x`
+        ${this.customStyles
+          ? x`<style>
+              ${this.customStyles}
+            </style>`
+          : ''}
 
-      <div class="container">
-        <form @submit="${this.handleSubmit}">
-          ${this.schema.title ? x`<h2>${this.schema.title}</h2>` : ''}
-          ${this.schema.description ? x`<p>${this.schema.description}</p>` : ''}
+        <div class="container">
+          <div class="status-message success">
+            <h2>✓ Form submitted successfully!</h2>
+            ${this.submissionStatus?.messages?.length > 0
+              ? x`
+                  <ul>
+                    ${this.submissionStatus.messages.map((msg) => x`<li>${msg}</li>`)}
+                  </ul>
+                `
+              : ''}
+          </div>
+        </div>
+      `;
+    }
 
-          ${Object.entries(this.schema.properties).map(([fieldName, fieldSchema]) =>
-            this.renderField(fieldName, fieldSchema)
-          )}
+    // Regular form view (rest of existing render code)
+    const hasFields = Object.keys(this.schema.properties).length > 0;
 
-          <div class="buttons">
-            <button type="submit" ?disabled="${this.submitting}">
-              <span class="button-content">
-                ${this.submitting ? x`<span class="spinner"></span>` : ''}
-                ${this.submitting ? 'Submitting...' : 'Submit'}
-              </span>
-            </button>
-            <button type="button" @click="${this.handleReset}" ?disabled="${this.submitting}">
-              Reset
-            </button>
-          </div>
-        </form>
+    return x`
+      ${this.customStyles
+        ? x`<style>
+            ${this.customStyles}
+          </style>`
+        : ''}
+
+      <div class="container">
+        ${this.submitSuccess
+          ? x`
+              <div class="status-message success">
+                ✓ Your form was successfully submitted.
+                ${this.submissionStatus?.messages?.length > 0
+                  ? x`
+                      <ul>
+                        ${this.submissionStatus.messages.map((msg) => x`<li>${msg}</li>`)}
+                      </ul>
+                    `
+                  : ''}
+              </div>
+            `
+          : ''}
+        ${hasFields
+          ? x`
+              <form @submit="${this.handleSubmit}" class="${this.submitting ? 'submitting' : ''}">
+                ${this.schema.title ? x`<h2>${this.schema.title}</h2>` : ''}
+                ${this.schema.description ? x`<p>${this.schema.description}</p>` : ''}
+                ${this.validationFailed
+                  ? x`
+                      <div class="status-message validation-error">
+                        ⚠ Please correct the errors below before submitting.
+                      </div>
+                    `
+                  : ''}
+                ${this.submissionError
+                  ? x`
+                      <div class="status-message error">
+                        <strong>Error:</strong> ${this.submissionError}
+                        ${this.submissionStatus?.messages?.length > 0
+                          ? x`
+                              <ul>
+                                ${this.submissionStatus.messages.map(
+                                  (msg) => x`<li>${msg}</li>`
+                                )}
+                              </ul>
+                            `
+                          : ''}
+                      </div>
+                    `
+                  : ''}
+                ${Object.entries(this.schema.properties).map(([fieldName, fieldSchema]) =>
+                  this.renderField(fieldName, fieldSchema)
+                )}
+
+                <div class="buttons">
+                  <button type="submit" ?disabled="${this.submitting}">
+                    <span class="button-content">
+                      ${this.submitting ? x`<span class="spinner"></span>` : ''}
+                      ${this.submitting ? 'Submitting...' : 'Submit'}
+                    </span>
+                  </button>
+                  <button type="button" @click="${this.handleReset}" ?disabled="${this.submitting}">
+                    Reset
+                  </button>
+                </div>
+              </form>
+            `
+          : x`
+              <div class="info-only">
+                ${this.schema.title ? x`<h2>${this.schema.title}</h2>` : ''}
+                ${this.schema.description ? x`<p>${this.schema.description}</p>` : ''}
+              </div>
+            `}
       </div>
     `;
   }