@descope/web-components-ui 1.0.114 → 1.0.115

package/dist/cjs/index.cjs.js

@@ -506,7 +506,7 @@ const globals = {
 	shadow,
 	fonts
 };
-const vars$l = getThemeVars(globals);
+const vars$m = getThemeVars(globals);
 
 const createCssVarFallback = (first, ...rest) =>
 	`var(${first}${rest.length ? ` , ${createCssVarFallback(...rest)}` : ''})`;
@@ -597,14 +597,15 @@ const createClassSelectorSpecifier = (className, numOfRepeats) => Array(numOfRep
 
 const STYLE_OVERRIDE_ATTR_PREFIX = 'st';
 
-
 const createStyleMixin =
-	({ mappings = {} }) => (superclass) =>
-		class CustomStyleMixinClass extends superclass {
+	({ mappings = {}, componentNameOverride = '' }) => (superclass) => {
+		const componentName = componentNameOverride || superclass.componentName;
+
+		return class CustomStyleMixinClass extends superclass {
 			static get cssVarList() {
 				return {
 					...superclass.cssVarList,
-					...createCssVarsList(superclass.componentName, {
+					...createCssVarsList(componentName, {
 						...mappings,
 					})
 				};
@@ -643,30 +644,32 @@ const createStyleMixin =
 				this.#createOverridesStyle();
 			}
 
-			get componentTheme() {
-				return componentsThemeManager.currentTheme?.[superclass.componentName] || ''
+			get #componentTheme() {
+				return componentsThemeManager.currentTheme?.[componentName] || ''
 			}
 
 			#onComponentThemeChange() {
-				this.#themeStyleEle.innerHTML = this.componentTheme[this.#themeSection];
+				this.#themeStyleEle.innerHTML = this.#componentTheme[this.#themeSection];
 			}
 
 			#createComponentTheme() {
 				this.#themeStyleEle = document.createElement('style');
-				this.#themeStyleEle.id = 'style-mixin-theme';
+				this.#themeStyleEle.id = `style-mixin-theme__${componentName}`;
 				this.#rootElement.prepend(this.#themeStyleEle);
 				this.#disconnectThemeManager = componentsThemeManager.onCurrentThemeChange(this.#onComponentThemeChange.bind(this));
 				this.#onComponentThemeChange();
 			}
 
 			#createOverridesStyle() {
-				this.#overrideStyleEle = document.createElement('style');
-				this.#overrideStyleEle.id = 'style-mixin-overrides';
+				if (this.#styleAttributes.length) {
+					this.#overrideStyleEle = document.createElement('style');
+					this.#overrideStyleEle.id = `style-mixin-overrides__${componentName}`;
 
-				const classSpecifier = createClassSelectorSpecifier(superclass.componentName, CSS_SELECTOR_SPECIFIER_MULTIPLY);
+					const classSpecifier = createClassSelectorSpecifier(componentName, CSS_SELECTOR_SPECIFIER_MULTIPLY);
 
-				this.#overrideStyleEle.innerText = `:host(${classSpecifier}) {}`;
-				this.#rootElement.append(this.#overrideStyleEle);
+					this.#overrideStyleEle.innerText = `:host(${classSpecifier}) {}`;
+					this.#rootElement.append(this.#overrideStyleEle);
+				}
 			}
 
 			#setAttrOverride(attrName, value) {
@@ -674,37 +677,44 @@ const createStyleMixin =
 				if (!style) return;
 
 				const varName = getCssVarName(
-					superclass.componentName,
+					componentName,
 					attrName.replace(new RegExp(`^${STYLE_OVERRIDE_ATTR_PREFIX}-`), '')
 				);
 
 				if (value) style?.setProperty(varName, value);
-				else { 
+				else {
 					style?.removeProperty(varName);
 					this.removeAttribute(attrName);
 				}
 			}
 
 			#updateOverridesStyle(attrs = []) {
+				let shouldUpdate = false;
+
 				for (const attr of attrs) {
 					if (this.#styleAttributes.includes(attr)) {
 						this.#setAttrOverride(attr, this.getAttribute(attr));
+						shouldUpdate = true;
 					}
 				}
 
-				// we are rewriting the style back to the style tag
-				this.#overrideStyleEle.innerHTML = this.#overrideStyleEle?.sheet?.cssRules[0].cssText;
+				if (shouldUpdate) {
+					// we are rewriting the style back to the style tag
+					this.#overrideStyleEle.innerHTML = this.#overrideStyleEle?.sheet?.cssRules[0].cssText;
+				}
 			}
 
 			#createMappingStyle() {
-				const themeStyle = document.createElement('style');
-				themeStyle.id = 'style-mixin-mappings';
-				themeStyle.innerHTML = createStyle(
-					kebabCaseJoin(superclass.componentName, this.#componentNameSuffix),
-					this.#baseSelector,
-					mappings
-				);
-				this.#rootElement.prepend(themeStyle);
+				if (Object.keys(mappings).length) {
+					const themeStyle = document.createElement('style');
+					themeStyle.id = `style-mixin-mappings__${componentName}`;
+					themeStyle.innerHTML = createStyle(
+						kebabCaseJoin(componentName, this.#componentNameSuffix),
+						this.#baseSelector,
+						mappings
+					);
+					this.#rootElement.prepend(themeStyle);
+				}
 			}
 
 			#addClassName(className) {
@@ -714,7 +724,7 @@ const createStyleMixin =
 			init() {
 				super.init?.();
 				if (this.shadowRoot.isConnected) {
-					this.#addClassName(superclass.componentName);
+					this.#addClassName(componentName);
 
 					// this is instead attributeChangedCallback because we cannot use static methods in this case
 					observeAttributes(this, this.#updateOverridesStyle.bind(this), {});
@@ -726,7 +736,8 @@ const createStyleMixin =
 
 				this.#disconnectThemeManager?.();
 			}
-		};
+		}
+	};
 
 const draggableMixin = (superclass) =>
 	class DraggableMixinClass extends superclass {
@@ -1043,13 +1054,16 @@ const inputValidationMixin = (superclass) => class InputValidationMixinClass ext
       stepMismatch,
       tooShort,
       tooLong,
+      rangeOverflow,
+      rangeUnderflow,
+      badInput,
       customError
     } = flags;
     switch (true) {
       case valueMissing:
         return this.getAttribute(errorAttributes.valueMissing) ||
           this.defaultErrorMsgValueMissing
-      case patternMismatch || typeMismatch || stepMismatch:
+      case patternMismatch || typeMismatch || stepMismatch || rangeOverflow || rangeUnderflow || badInput:
         return this.getAttribute(errorAttributes.patternMismatch) ||
           this.defaultErrorMsgPatternMismatch
       case tooShort:
@@ -1269,10 +1283,14 @@ const proxyInputMixin = (superclass) =>
 			propertyObserver(this, this.inputElement, 'selectionStart');
 			this.setSelectionRange = this.inputElement.setSelectionRange?.bind(this.inputElement);
 
-			forwardAttrs(this, this.inputElement, {includeAttrs: ['inputmode']});
+			forwardAttrs(this, this.inputElement, { includeAttrs: ['inputmode'] });
 		}
 	};
 
+const composedProxyInputMixin = compose(
+	proxyInputMixin,
+	createStyleMixin({ componentNameOverride: getComponentName('input-wrapper') }));
+
 // this is needed because we might generate the same css vars names
 // e.g. "overlayColor" attribute in style mixin's mapping, 
 // will generate the same var as "color" attribute in portals's mapping 
@@ -1429,17 +1447,19 @@ const inputEventsDispatchingMixin = (superclass) => class InputEventsDispatching
   }
 };
 
-const componentName$n = getComponentName('button');
+const componentName$o = getComponentName('button');
 
 const resetStyles = `
 	:host {
 		display: inline-block;
+		box-sizing: border-box;
 	}
 	vaadin-button {
 		margin: 0;
 		min-width: 0;
 		width: 100%;
 		height: auto;
+		box-shadow: none;
 	}
 	vaadin-button::part(label) {
 		padding: 0;
@@ -1461,7 +1481,7 @@ const iconStyles = `
 
 const editorOverrides = `vaadin-button::part(label) { pointer-events: none; }`;
 
-const { host: host$a, label: label$7 } = {
+const { host: host$c, label: label$9 } = {
 	host: { selector: () => ':host' },
 	label: { selector: '::part(label)' },
 };
@@ -1469,17 +1489,23 @@ const { host: host$a, label: label$7 } = {
 const ButtonClass = compose(
 	createStyleMixin({
 		mappings: {
-			color: {},
-			textDecoration: label$7,
-			fontSize: {},
+			hostWidth: { ...host$c, property: 'width' },
+			fontSize: { property: 'font-size' },
+			fontFamily: { property: 'font-family' },
+
 			cursor: {},
 			backgroundColor: {},
+
+			outlineOffset: {},
+			outlineColor: {},
+			outlineStyle: {},
+			outlineWidth: {},
+
 			borderRadius: {},
 			borderColor: {},
 			borderStyle: {},
 			borderWidth: {},
-			width: host$a,
-			gap: label$7,
+
 			verticalPadding: [
 				{ property: 'padding-top' },
 				{ property: 'padding-bottom' },
@@ -1487,7 +1513,12 @@ const ButtonClass = compose(
 			horizontalPadding: [
 				{ property: 'padding-left' },
 				{ property: 'padding-right' },
-			]
+			],
+
+			labelTextColor: { property: 'color' },
+			labelTextDecoration: { ...label$9, property: 'text-decoration' },
+			labelSpacing: { ...label$9, property: 'gap' },
+
 		}
 	}),
 	draggableMixin,
@@ -1501,9 +1532,12 @@ const ButtonClass = compose(
 			${iconStyles}
 			${loadingIndicatorStyles}
 			${editorOverrides}
+			:host {
+				padding: calc(var(${ButtonClass.cssVarList.outlineWidth}) + var(${ButtonClass.cssVarList.outlineOffset}))
+			}
 		`,
 		excludeAttrsSync: ['tabindex'],
-		componentName: componentName$n
+		componentName: componentName$o
 	})
 );
 
@@ -1536,47 +1570,54 @@ const loadingIndicatorStyles = `
 	}
 `;
 
-const globalRefs$e = getThemeRefs(globals);
+const globalRefs$c = getThemeRefs(globals);
 const compVars$2 = ButtonClass.cssVarList;
 
 const mode = {
-	primary: globalRefs$e.colors.primary,
-	secondary: globalRefs$e.colors.secondary,
-	success: globalRefs$e.colors.success,
-	error: globalRefs$e.colors.error,
-	surface: globalRefs$e.colors.surface
+	primary: globalRefs$c.colors.primary,
+	secondary: globalRefs$c.colors.secondary,
+	success: globalRefs$c.colors.success,
+	error: globalRefs$c.colors.error,
+	surface: globalRefs$c.colors.surface
 };
 
-const [helperTheme$2, helperRefs$2, helperVars$2] = createHelperVars({ mode }, componentName$n);
+const [helperTheme$3, helperRefs$3, helperVars$2] = createHelperVars({ mode }, componentName$o);
 
 const verticalPaddingRatio = 3;
 const horizontalPaddingRatio = 2;
 
 const button = {
-	...helperTheme$2,
+	...helperTheme$3,
+
+	[compVars$2.fontFamily]: globalRefs$c.fonts.font1.family,
 
 	[compVars$2.cursor]: 'pointer',
 
-	[compVars$2.borderRadius]: globalRefs$e.radius.sm,
+	[compVars$2.borderRadius]: globalRefs$c.radius.sm,
 	[compVars$2.borderWidth]: '2px',
 	[compVars$2.borderStyle]: 'solid',
 	[compVars$2.borderColor]: 'transparent',
 
-	[compVars$2.gap]: '0.25em',
+	[compVars$2.labelSpacing]: '0.25em',
 
 	[compVars$2.verticalPadding]: `calc(var(${compVars$2.fontSize}) / ${verticalPaddingRatio})`,
 	[compVars$2.horizontalPadding]: `calc(var(${compVars$2.fontSize}) / ${horizontalPaddingRatio})`,
 
+	[compVars$2.outlineWidth]: globals.border.sm,
+	[compVars$2.outlineOffset]: '1px',
+	[compVars$2.outlineStyle]: 'solid',
+	[compVars$2.outlineColor]: 'transparent',
+
 	size: {
-		xs: { [compVars$2.fontSize]: '12px' },
-		sm: { [compVars$2.fontSize]: '14px' },
-		md: { [compVars$2.fontSize]: '18px' },
-		lg: { [compVars$2.fontSize]: '22px' },
-		xl: { [compVars$2.fontSize]: '26px' }
+		xs: { [compVars$2.fontSize]: '8px' },
+		sm: { [compVars$2.fontSize]: '10px' },
+		md: { [compVars$2.fontSize]: '14px' },
+		lg: { [compVars$2.fontSize]: '20px' },
+		xl: { [compVars$2.fontSize]: '25px' }
 	},
 
 	_fullWidth: {
-		[compVars$2.width]: '100%'
+		[compVars$2.hostWidth]: '100%'
 	},
 
 	_loading: {
@@ -1585,98 +1626,209 @@ const button = {
 
 	variant: {
 		contained: {
-			[compVars$2.color]: helperRefs$2.contrast,
-			[compVars$2.backgroundColor]: helperRefs$2.main,
+			[compVars$2.labelTextColor]: helperRefs$3.contrast,
+			[compVars$2.backgroundColor]: helperRefs$3.main,
 			_hover: {
-				[compVars$2.backgroundColor]: helperRefs$2.dark
+				[compVars$2.backgroundColor]: helperRefs$3.dark
 			},
 			_active: {
-				[compVars$2.backgroundColor]: helperRefs$2.dark
+				[compVars$2.backgroundColor]: helperRefs$3.dark
 			}
 		},
 
 		outline: {
-			[compVars$2.color]: helperRefs$2.main,
+			[compVars$2.labelTextColor]: helperRefs$3.main,
 			[compVars$2.borderColor]: 'currentColor',
 			_hover: {
-				[compVars$2.color]: helperRefs$2.dark,
+				[compVars$2.labelTextColor]: helperRefs$3.dark,
 			},
 			_active: {
-				[compVars$2.color]: helperRefs$2.light,
+				[compVars$2.labelTextColor]: helperRefs$3.light,
 			}
 		},
 
 		link: {
-			[compVars$2.color]: helperRefs$2.main,
+			[compVars$2.labelTextColor]: helperRefs$3.main,
 			_hover: {
-				[compVars$2.color]: helperRefs$2.main,
-				[compVars$2.textDecoration]: 'underline'
+				[compVars$2.labelTextColor]: helperRefs$3.main,
+				[compVars$2.labelTextDecoration]: 'underline'
 			},
 			_active: {
-				[compVars$2.color]: helperRefs$2.dark
+				[compVars$2.labelTextColor]: helperRefs$3.dark
 			}
 		}
+	},
+
+	_focused: {
+		[compVars$2.outlineColor]: globals.colors.surface.main,
 	}
 };
-const vars$k = { ...compVars$2, ...helperVars$2 };
+
+const vars$l = {
+	...compVars$2,
+	...helperVars$2
+};
 
 var button$1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	default: button,
-	vars: vars$k
+	vars: vars$l
 });
 
-const selectors$3 = {
-	label: '::part(label)',
-	inputWrapper: '::part(input-field)',
-	readOnlyInput: '[readonly]::part(input-field)::after',
-	placeholder: '> input:placeholder-shown',
-	host: () => ':host',
-	input: 'input'
+const {
+	host: host$b,
+	label: label$8,
+	placeholder: placeholder$2,
+	requiredIndicator: requiredIndicator$7,
+	inputField: inputField$4,
+	input,
+	readOnlyInput,
+	helperText: helperText$7,
+	errorMessage: errorMessage$7
+} = {
+	host: { selector: () => ':host' },
+	label: { selector: '::part(label)' },
+	requiredIndicator: { selector: '[required]::part(required-indicator)::after' },
+	placeholder: { selector: '> input:placeholder-shown' },
+	inputField: { selector: '::part(input-field)' },
+	input: { selector: 'input' },
+	readOnlyInput: { selector: '[readonly]::part(input-field)::after' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' }
 };
 
 var textFieldMappings = {
-	backgroundColor: { selector: selectors$3.inputWrapper },
-	labelTextColor: { selector: selectors$3.label, property: 'color' },
-	color: { selector: selectors$3.inputWrapper },
-	width: { selector: selectors$3.host },
-	borderColor: [
-		{ selector: selectors$3.inputWrapper },
-		{ selector: selectors$3.readOnlyInput }
+	// we apply font-size also on the host so we can set its width with em
+	fontSize: [
+		{ property: 'font-size' },
+		{ ...host$b, property: 'font-size' }
 	],
-	borderWidth: [
-		{ selector: selectors$3.inputWrapper },
-		{ selector: selectors$3.readOnlyInput }
+	fontFamily: [
+		{ ...label$8, property: 'font-family' },
+		{ ...inputField$4, property: 'font-family' },
+		{ ...helperText$7, property: 'font-family' },
+		{ ...errorMessage$7, property: 'font-family' }
 	],
-	borderStyle: [
-		{ selector: selectors$3.inputWrapper },
-		{ selector: selectors$3.readOnlyInput }
+
+	hostWidth: { ...host$b, property: 'width' },
+
+	inputBackgroundColor: { ...inputField$4, property: 'background-color' },
+
+	labelTextColor: [
+		{ ...label$8, property: 'color' },
+		{ ...requiredIndicator$7, property: 'color' }
 	],
-	borderRadius: { selector: selectors$3.inputWrapper },
-	boxShadow: { selector: selectors$3.inputWrapper },
 
-	// we apply font-size also on the host so we can set its width with em
-	fontSize: [{}, { selector: selectors$3.host }],
-
-	height: { selector: selectors$3.inputWrapper },
-	padding: { selector: selectors$3.inputWrapper },
-	margin: { selector: selectors$3.inputWrapper },
-	caretColor: { selector: selectors$3.input },
-	outlineColor: { selector: selectors$3.inputWrapper },
-	outlineStyle: { selector: selectors$3.inputWrapper },
-	outlineWidth: [
-		{ selector: selectors$3.inputWrapper },
-		// we need to make sure there is enough space for the outline
-		{ property: 'padding' }
+	inputValueTextColor: { ...inputField$4, property: 'color' },
+	inputCaretTextColor: { ...input, property: 'color' },
+
+	labelRequiredIndicator: { ...requiredIndicator$7, property: 'content' },
+
+	inputBorderColor: [
+		{ ...inputField$4, property: 'border-color' },
+		{ ...readOnlyInput, property: 'border-color' }
+	],
+	inputBorderWidth: [
+		{ ...inputField$4, property: 'border-width' },
+		{ ...readOnlyInput, property: 'border-width' }
+	],
+	inputBorderStyle: [
+		{ ...inputField$4, property: 'border-style' },
+		{ ...readOnlyInput, property: 'border-style' }
 	],
-	outlineOffset: { selector: selectors$3.inputWrapper },
-	textAlign: { selector: selectors$3.input },
-	placeholderColor: { selector: selectors$3.placeholder, property: 'color' }
+	inputBorderRadius: { ...inputField$4, property: 'border-radius' },
+
+	inputHeight: { ...inputField$4, property: 'height' },
+	inputPadding: { ...inputField$4, property: 'padding' },
+
+	inputOutlineColor: { ...inputField$4, property: 'outline-color' },
+	inputOutlineStyle: { ...inputField$4, property: 'outline-style' },
+	inputOutlineWidth: { ...inputField$4, property: 'outline-width' },
+	inputOutlineOffset: { ...inputField$4, property: 'outline-offset' },
+
+	inputTextAlign: { ...input, property: 'text-align' },
+
+	inputPlaceholderColor: { ...placeholder$2, property: 'color' }
 };
 
-const componentName$m = getComponentName('text-field');
+const resetInputOverrides = (name, cssVarList) => `
+    ${resetInputContainer(name)}
+    ${resetInputCursor(name)}
+    ${resetInputPlaceholder(name)}
+    ${resetInputField(name)}
+    ${resetInputAutoFill(name, cssVarList)}
+
+    ${name}::before {
+		height: unset;
+	}
+
+    ${name} > input {
+		-webkit-mask-image: none;
+		min-height: 0;
+	}
+
+    ${name}::part(input-field)::after {
+		opacity: 0 !important;
+    }
+`;
+
+const resetInputContainer = (name) => `
+    ${name} {
+        margin: 0;
+        padding: 0;
+        width: 100%;
+        height: 100%;
+        box-sizing: border-box;
+    }
+`;
+
+const resetInputField = (name) => `
+    ${name}::part(input-field) {
+        overflow: hidden;
+        padding: 0;
+        box-shadow: none;
+    }
+`;
+
+const resetInputCursor = (name) => `
+    ${name} > label,
+    ${name}::part(label),
+    ${name}::part(required-indicator) {
+        cursor: pointer;
+    }
+`;
+
+const resetInputPlaceholder = (name, ele = 'input') => `
+    ${name}[disabled] > ${ele}:placeholder-shown,
+	${name}[readonly] > ${ele}:placeholder-shown {
+		opacity: 1;
+	}    
+`;
+
+const resetInputAutoFill = (name, cssVarList) => `
+    ${name} input:-webkit-autofill,
+    ${name} input:-webkit-autofill::first-line,
+    ${name} input:-webkit-autofill:hover,
+    ${name} input:-webkit-autofill:active,
+    ${name} input:-webkit-autofill:focus {
+        -webkit-text-fill-color: var(${cssVarList.inputValueTextColor});
+        box-shadow: 0 0 0 var(${cssVarList.inputHeight}) var(${cssVarList.inputBackgroundColor}) inset;
+    } 
+`;
+
+const resetInputFieldDefaultWidth = () => `
+    :host {
+        --vaadin-field-default-width: auto;
+    }
+`;
 
-let overrides$4 = ``;
+const resetInputReadonlyStyle = (name) => `
+    ${name}::part(input-field)::after {
+        opacity: 0;
+    }
+`;
+
+const componentName$n = getComponentName('text-field');
 
 const observedAttrs = ['type'];
 
@@ -1705,142 +1857,125 @@ const TextFieldClass = compose(
 		mappings: textFieldMappings
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin,
 	customMixin$3
 )(
 	createProxy({
 		slots: ['prefix', 'suffix'],
 		wrappedEleName: 'vaadin-text-field',
-		style: () => overrides$4,
+		style: () => `
+			:host {
+				display: inline-block;
+				max-width: 100%;
+				min-width: 10em;
+				padding: calc(var(${TextFieldClass.cssVarList.inputOutlineWidth}) + var(${TextFieldClass.cssVarList.inputOutlineOffset}));
+			}
+			${resetInputFieldDefaultWidth()}
+			${resetInputOverrides('vaadin-text-field', TextFieldClass.cssVarList)}
+		`,
 		excludeAttrsSync: ['tabindex'],
-		componentName: componentName$m
+		componentName: componentName$n
 	})
 );
 
-overrides$4 = `
-	:host {
-		display: inline-block;
-		--vaadin-field-default-width: auto;
-		max-width: 100%;
-		min-width: 10em;
-
-	}
-	vaadin-text-field {
-		margin: 0;
-		width: 100%;
-		height: 100%;
-		box-sizing: border-box;
-	}
-
-	vaadin-text-field::part(input-field) {
-		overflow: hidden;
-		padding: 0;
-	}
-	vaadin-text-field[disabled] > input:placeholder-shown,
-	vaadin-text-field[readonly] > input:placeholder-shown {
-		opacity: 1;
-	}
-	vaadin-text-field input:-webkit-autofill,
-	vaadin-text-field input:-webkit-autofill::first-line,
-	vaadin-text-field input:-webkit-autofill:hover,
-	vaadin-text-field input:-webkit-autofill:active,
-	vaadin-text-field input:-webkit-autofill:focus {
-		-webkit-text-fill-color: var(${TextFieldClass.cssVarList.color});
-		box-shadow: 0 0 0 var(${TextFieldClass.cssVarList.height}) var(${TextFieldClass.cssVarList.backgroundColor}) inset;
-	}
-
-	vaadin-text-field > input {
-		-webkit-mask-image: none;
-		min-height: 0;
-	}
-
-	vaadin-text-field[required]::part(required-indicator)::after {
-		content: "*";
-		color: var(${TextFieldClass.cssVarList.color});
-	}
-	vaadin-text-field::part(input-field)::after {
-		opacity: 0 !important;
-	}
+const componentName$m = getComponentName('input-wrapper');
+const globalRefs$b = getThemeRefs(globals);
 
-	vaadin-text-field::before {
-		height: unset;
-	}
-`;
+const [theme$1, refs, vars$k] = createHelperVars({
+    labelTextColor: globalRefs$b.colors.surface.contrast,
+    valueTextColor: globalRefs$b.colors.surface.contrast,
+    placeholderTextColor: globalRefs$b.colors.surface.main,
+    requiredIndicator: "'*'",
 
-const globalRefs$d = getThemeRefs(globals);
+    borderWidth: globalRefs$b.border.xs,
+    borderRadius: globalRefs$b.radius.xs,
+    borderColor: 'transparent',
 
-const vars$j = TextFieldClass.cssVarList;
+    outlineWidth: globalRefs$b.border.sm,
+    outlineStyle: 'solid',
+    outlineColor: 'transparent',
+    outlineOffset: '0px', // we need to keep the px unit even for 0 value, as this var is used for calc in different component classes
 
-const textField = (vars) => ({
-	[vars.padding]: '0 1em',
+    inputHeight: '2em',
 
-	[vars.outlineWidth]: '2px',
-	[vars.outlineStyle]: 'solid',
-	[vars.outlineColor]: 'transparent',
+    backgroundColor: globalRefs$b.colors.surface.light,
 
-	[vars.height]: '2em',
+    fontFamily: globalRefs$b.fonts.font1.family,
 
-	size: {
-		xs: {
-			[vars.fontSize]: '8px',
-		},
-		sm: {
-			[vars.fontSize]: '10px',
-		},
-		md: {
-			[vars.fontSize]: '14px',
-		},
-		lg: {
-			[vars.fontSize]: '20px',
-		},
-		xl: {
-			[vars.fontSize]: '25px',
-		}
-	},
+    size: {
+        xs: { fontSize: '8px' },
+        sm: { fontSize: '10px' },
+        md: { fontSize: '14px' },
+        lg: { fontSize: '20px' },
+        xl: { fontSize: '25px' }
+    },
 
-	[vars.color]: globalRefs$d.colors.surface.contrast,
-	[vars.labelTextColor]: globalRefs$d.colors.surface.contrast,
-	[vars.placeholderColor]: globalRefs$d.colors.surface.main,
+    _fullWidth: {
+        width: '100%',
+    },
 
-	[vars.backgroundColor]: globalRefs$d.colors.surface.light,
+    _focused: {
+        outlineColor: globalRefs$b.colors.surface.main,
+        _invalid: {
+            outlineColor: globalRefs$b.colors.error.light,
+        }
+    },
 
-	[vars.borderWidth]: '1px',
-	[vars.borderStyle]: 'solid',
-	[vars.borderColor]: 'transparent',
-	[vars.borderRadius]: globalRefs$d.radius.xs,
+    _bordered: {
+        borderColor: globalRefs$b.colors.surface.main,
+        borderStyle: 'solid',
+        _invalid: {
+            borderColor: globalRefs$b.colors.error.main,
+        }
+    },
 
-	_disabled: {
-		[vars.color]: globalRefs$d.colors.surface.dark,
-		[vars.placeholderColor]: globalRefs$d.colors.surface.light,
-		[vars.backgroundColor]: globalRefs$d.colors.surface.main
-	},
+    _disabled: {
+        labelTextColor: globalRefs$b.colors.surface.main,
+        valueTextColor: globalRefs$b.colors.surface.dark,
+        placeholderTextColor: globalRefs$b.colors.surface.dark,
+        backgroundColor: globalRefs$b.colors.surface.main
+    },
 
-	_fullWidth: {
-		[vars.width]: '100%'
-	},
+    _invalid: {
+        labelTextColor: globalRefs$b.colors.error.main,
+        valueTextColor: globalRefs$b.colors.error.main,
+        placeholderTextColor: globalRefs$b.colors.error.light,
+    }
+}, componentName$m);
 
-	_focused: {
-		[vars.outlineColor]: globalRefs$d.colors.surface.main
-	},
+var inputWrapper = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	default: theme$1,
+	refs: refs,
+	vars: vars$k
+});
 
-	_bordered: {
-		[vars.borderColor]: globalRefs$d.colors.surface.main
-	},
+const vars$j = TextFieldClass.cssVarList;
 
-	_invalid: {
-		[vars.borderColor]: globalRefs$d.colors.error.main,
-		[vars.color]: globalRefs$d.colors.error.main,
-		[vars.outlineColor]: globalRefs$d.colors.error.light,
-		[vars.placeholderColor]: globalRefs$d.colors.error.light
-	}
+const textField = ({
+	[vars$j.hostWidth]: refs.width,
+	[vars$j.fontSize]: refs.fontSize,
+	[vars$j.fontFamily]: refs.fontFamily,
+	[vars$j.labelTextColor]: refs.labelTextColor,
+	[vars$j.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$j.inputValueTextColor]: refs.valueTextColor,
+	[vars$j.inputPlaceholderColor]: refs.placeholderTextColor,
+	[vars$j.inputBorderWidth]: refs.borderWidth,
+	[vars$j.inputBorderStyle]: refs.borderStyle,
+	[vars$j.inputBorderColor]: refs.borderColor,
+	[vars$j.inputBorderRadius]: refs.borderRadius,
+	[vars$j.inputOutlineWidth]: refs.outlineWidth,
+	[vars$j.inputOutlineStyle]: refs.outlineStyle,
+	[vars$j.inputOutlineColor]: refs.outlineColor,
+	[vars$j.inputOutlineOffset]: refs.outlineOffset,
+	[vars$j.inputBackgroundColor]: refs.backgroundColor,
+	[vars$j.inputHeight]: refs.inputHeight,
 });
 
-var textField$1 = textField(vars$j);
-
-var textField$2 = /*#__PURE__*/Object.freeze({
+var textField$1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	default: textField$1,
+	default: textField,
 	textField: textField,
 	vars: vars$j
 });
@@ -1881,91 +2016,94 @@ const passwordDraggableMixin = (superclass) => class PasswordDraggableMixinClass
 const componentName$l = getComponentName('password-field');
 
 const {
-	host: host$9,
-	inputWrapper: inputWrapper$1,
+	host: host$a,
+	inputField: inputField$3,
 	inputElement,
 	inputElementPlaceholder,
-	revealButton,
 	revealButtonIcon,
-	revealButtonIconOutline,
-	label: label$6,
-	requiredIndicator: requiredIndicator$5
+	label: label$7,
+	requiredIndicator: requiredIndicator$6,
+	errorMessage: errorMessage$6,
+	helperText: helperText$6
 } = {
 	host: { selector: () => ':host' },
-	inputWrapper: { selector: '::part(input-field)' },
+	inputField: { selector: '::part(input-field)' },
 	inputElement: { selector: '> input' },
 	inputElementPlaceholder: { selector: '> input:placeholder-shown' },
-	revealButton: { selector: 'vaadin-password-field-button' },
 	revealButtonIcon: { selector: () => '::part(reveal-button)::before' },
-	revealButtonIconOutline: { selector: () => 'vaadin-password-field-button[focus-ring]' },
 	label: { selector: '::part(label)' },
-	requiredIndicator: { selector: '::part(required-indicator)::after' },
+	requiredIndicator: { selector: '[required]::part(required-indicator)::after' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' }
 };
 
 const PasswordFieldClass = compose(
 	createStyleMixin({
 		mappings: {
-			width: host$9,
-			wrapperBorderStyle: { ...inputWrapper$1, property: 'border-style' },
-			wrapperBorderWidth: { ...inputWrapper$1, property: 'border-width' },
-			wrapperBorderColor: { ...inputWrapper$1, property: 'border-color' },
-			wrapperBorderRadius: { ...inputWrapper$1, property: 'border-radius' },
-
-			revealButtonOutlineBoxShadow: [
-				{
-					...revealButtonIconOutline,
-					property: 'box-shadow'
-				}
+			hostWidth: { ...host$a, property: 'width' },
+			fontSize: [
+				{ property: 'font-size' },
+				{ ...host$a, property: 'font-size' }
 			],
+			fontFamily: [
+				label$7,
+				inputField$3,
+				errorMessage$6,
+				helperText$6
+			],
+			inputHeight: { ...inputField$3, property: 'height' },
+			inputBackgroundColor: { ...inputField$3, property: 'background-color' },
+
+			inputBorderStyle: { ...inputField$3, property: 'border-style' },
+			inputBorderWidth: { ...inputField$3, property: 'border-width' },
+			inputBorderColor: { ...inputField$3, property: 'border-color' },
+			inputBorderRadius: { ...inputField$3, property: 'border-radius' },
+
+			inputOutlineColor: { ...inputField$3, property: 'outline-color' },
+			inputOutlineStyle: { ...inputField$3, property: 'outline-style' },
+			inputOutlineOffset: { ...inputField$3, property: 'outline-offset' },
+			inputOutlineWidth: { ...inputField$3, property: 'outline-width' },
 
 			labelTextColor: [
-				{ ...label$6, property: 'color' },
-				{ ...requiredIndicator$5, property: 'color' }
+				{ ...label$7, property: 'color' },
+				{ ...requiredIndicator$6, property: 'color' }
 			],
-			inputTextColor: [
+			labelRequiredIndicator: { ...requiredIndicator$6, property: 'content' },
+
+			inputValueTextColor: [
 				{ ...inputElement, property: 'color' },
 				{ ...revealButtonIcon, property: 'color' }
 			],
-			placeholderTextColor: { ...inputElementPlaceholder, property: 'color' },
-			fontSize: [{}, host$9],
-			height: inputWrapper$1,
-			padding: inputWrapper$1,
-			pointerCursor: [
-				{ ...revealButton, property: 'cursor' },
-				{ ...label$6, property: 'cursor' },
-				{ ...requiredIndicator$5, property: 'cursor' }
-			],
-			outlineColor: inputWrapper$1,
-			outlineStyle: inputWrapper$1,
-			outlineWidth: [
-				inputWrapper$1,
-				// we need to make sure there is enough space for the outline
-				{ property: 'padding' }
-			],
-			backgroundColor: inputWrapper$1
+			inputPlaceholderTextColor: { ...inputElementPlaceholder, property: 'color' },
 		}
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin,
 	passwordDraggableMixin
 )(
 	createProxy({
 		slots: ['suffix'],
 		wrappedEleName: 'vaadin-password-field',
-		style: `
+		style: () => `
 			:host {
 				display: inline-block;
 				min-width: 10em;
 				max-width: 100%;
+				box-sizing: border-box;				
+				padding: calc(var(${PasswordFieldClass.cssVarList.inputOutlineWidth}) + var(${PasswordFieldClass.cssVarList.inputOutlineOffset}));
 			}
 			vaadin-password-field {
 				width: 100%;
 				box-sizing: border-box;
+				padding: 0;
 			}
 			vaadin-password-field::part(input-field) {
 				padding: 0;
 			}
+			vaadin-password-field[focus-ring]::part(input-field) {
+				box-shadow: none;
+			}			
 			vaadin-password-field > input {
 				min-height: 0;
 				-webkit-mask-image: none;
@@ -1978,84 +2116,46 @@ const PasswordFieldClass = compose(
 			}
 			vaadin-password-field::part(input-field)::after {
 				opacity: 0;
-			}	
-			vaadin-password-field[required]::part(required-indicator)::after {
-				content: "*";
 			}
+			vaadin-password-field-button {
+				cursor: pointer;
+			}
+
+			${resetInputCursor('vaadin-password-field')}
+
 			[readonly] vaadin-password-field-button {
 				pointer-events: none;
 			}
+
+			vaadin-password-field-button[focus-ring] {
+				box-shadow: 0 0 0 2px var(${PasswordFieldClass.cssVarList.inputOutlineColor});
+			}
 		`,
 		excludeAttrsSync: ['tabindex'],
 		componentName: componentName$l
 	})
 );
 
-const globalRefs$c = getThemeRefs(globals);
-
 const vars$i = PasswordFieldClass.cssVarList;
 
 const passwordField = {
-	[vars$i.wrapperBorderStyle]: 'solid',
-	[vars$i.wrapperBorderWidth]: '1px',
-	[vars$i.wrapperBorderColor]: 'transparent',
-	[vars$i.wrapperBorderRadius]: globalRefs$c.radius.xs,
-	[vars$i.backgroundColor]: globalRefs$c.colors.surface.light,
-
-	[vars$i.outlineWidth]: '2px',
-	[vars$i.outlineStyle]: 'solid',
-	[vars$i.outlineColor]: 'transparent',
-
-	[vars$i.revealButtonOutlineBoxShadow]: `0 0 0 2px ${globalRefs$c.colors.surface.main}`,
-
-
-	[vars$i.labelTextColor]: globalRefs$c.colors.surface.contrast,
-	[vars$i.inputTextColor]: globalRefs$c.colors.surface.contrast,
-	[vars$i.placeholderTextColor]: globalRefs$c.colors.surface.main,
-
-	[vars$i.pointerCursor]: 'pointer',
-
-	[vars$i.padding]: '0',
-	[vars$i.height]: '2em',
-
-	size: {
-		xs: {
-			[vars$i.fontSize]: '8px',
-		},
-		sm: {
-			[vars$i.fontSize]: '10px',
-		},
-		md: {
-			[vars$i.fontSize]: '14px',
-		},
-		lg: {
-			[vars$i.fontSize]: '20px',
-		},
-		xl: {
-			[vars$i.fontSize]: '25px',
-		}
-	},
-
-	_bordered: {
-		[vars$i.padding]: '0 0.5em',
-		[vars$i.wrapperBorderColor]: globalRefs$c.colors.surface.main
-	},
-
-	_fullWidth: {
-		[vars$i.width]: '100%'
-	},
-
-	_focused: {
-		[vars$i.outlineColor]: globalRefs$c.colors.surface.main
-	},
-
-	_invalid: {
-		[vars$i.labelTextColor]: globalRefs$c.colors.error.main,
-		[vars$i.inputTextColor]: globalRefs$c.colors.error.main,
-		[vars$i.placeholderTextColor]: globalRefs$c.colors.error.light,
-		[vars$i.wrapperBorderColor]: globalRefs$c.colors.error.main,
-		[vars$i.outlineColor]: globalRefs$c.colors.error.light,
-	},
+	[vars$i.hostWidth]: refs.width,
+	[vars$i.fontSize]: refs.fontSize,
+	[vars$i.fontFamily]: refs.fontFamily,
+	[vars$i.labelTextColor]: refs.labelTextColor,
+	[vars$i.inputHeight]: refs.inputHeight,
+	[vars$i.inputBackgroundColor]: refs.backgroundColor,
+	[vars$i.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$i.inputValueTextColor]: refs.valueTextColor,
+	[vars$i.inputPlaceholderTextColor]: refs.placeholderTextColor,
+	[vars$i.inputBorderWidth]: refs.borderWidth,
+	[vars$i.inputBorderStyle]: refs.borderStyle,
+	[vars$i.inputBorderColor]: refs.borderColor,
+	[vars$i.inputBorderRadius]: refs.borderRadius,
+	[vars$i.inputOutlineWidth]: refs.outlineWidth,
+	[vars$i.inputOutlineStyle]: refs.outlineStyle,
+	[vars$i.inputOutlineColor]: refs.outlineColor,
+	[vars$i.inputOutlineOffset]: refs.outlineOffset,
 };
 
 var passwordField$1 = /*#__PURE__*/Object.freeze({
@@ -2066,68 +2166,52 @@ var passwordField$1 = /*#__PURE__*/Object.freeze({
 
 const componentName$k = getComponentName('number-field');
 
-let overrides$3 = ``;
-
 const NumberFieldClass = compose(
 	createStyleMixin({
-		mappings: {
-			...textFieldMappings
-		}
+		mappings: textFieldMappings
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin
 )(
 	createProxy({
 		slots: ['prefix', 'suffix'],
 		wrappedEleName: 'vaadin-number-field',
-		style: () => overrides$3,
+		style: () => `
+			:host {
+				display: inline-block;
+				max-width: 100%;
+				min-width: 10em;
+				padding: calc(var(${NumberFieldClass.cssVarList.inputOutlineWidth}) + var(${NumberFieldClass.cssVarList.inputOutlineOffset}));
+			}
+			${resetInputOverrides('vaadin-number-field', NumberFieldClass.cssVarList)}
+		`,
 		excludeAttrsSync: ['tabindex'],
 		componentName: componentName$k
 	})
 );
 
-overrides$3 = `
-	:host {
-		display: inline-block;
-		min-width: 10em;
-		max-width: 100%;
-	}
-	vaadin-number-field {
-		margin: 0;
-		padding: 0;
-		width: 100%;
-	}
-	vaadin-number-field > input {
-		-webkit-mask-image: none;
-	}
-	vaadin-number-field::part(input-field) {
-		padding: 0;
-	}
-	vaadin-number-field[readonly] > input:placeholder-shown {
-		opacity: 1;
-	}
-	vaadin-number-field input:-webkit-autofill,
-	vaadin-number-field input:-webkit-autofill::first-line,
-	vaadin-number-field input:-webkit-autofill:hover,
-	vaadin-number-field input:-webkit-autofill:active,
-	vaadin-number-field input:-webkit-autofill:focus {
-		-webkit-text-fill-color: var(${NumberFieldClass.cssVarList.color});
-		box-shadow: 0 0 0 var(${NumberFieldClass.cssVarList.height}) var(${NumberFieldClass.cssVarList.backgroundColor}) inset;
-	}
-	vaadin-number-field[required]::part(required-indicator)::after {
-		content: "*";
-		color: var(${NumberFieldClass.cssVarList.color});
-	}
-	vaadin-number-field[readonly]::part(input-field)::after {
-		border: 0 solid;
-	}
-`;
+const vars$h = NumberFieldClass.cssVarList;
 
 const numberField = {
-	...textField(NumberFieldClass.cssVarList)
+	[vars$h.hostWidth]: refs.width,
+	[vars$h.fontSize]: refs.fontSize,
+	[vars$h.fontFamily]: refs.fontFamily,
+	[vars$h.labelTextColor]: refs.labelTextColor,
+	[vars$h.inputValueTextColor]: refs.valueTextColor,
+	[vars$h.inputPlaceholderColor]: refs.placeholderTextColor,
+	[vars$h.inputBorderWidth]: refs.borderWidth,
+	[vars$h.inputBorderStyle]: refs.borderStyle,
+	[vars$h.inputBorderColor]: refs.borderColor,
+	[vars$h.inputBorderRadius]: refs.borderRadius,
+	[vars$h.inputOutlineWidth]: refs.outlineWidth,
+	[vars$h.inputOutlineStyle]: refs.outlineStyle,
+	[vars$h.inputOutlineColor]: refs.outlineColor,
+	[vars$h.inputOutlineOffset]: refs.outlineOffset,
+	[vars$h.inputBackgroundColor]: refs.backgroundColor,
+	[vars$h.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$h.inputHeight]: refs.inputHeight,
 };
-const vars$h = NumberFieldClass.cssVarList;
 
 var numberField$1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -2137,72 +2221,52 @@ var numberField$1 = /*#__PURE__*/Object.freeze({
 
 const componentName$j = getComponentName('email-field');
 
-let overrides$2 = ``;
-
 const EmailFieldClass = compose(
 	createStyleMixin({
-		mappings: {
-			...textFieldMappings
-		}
+		mappings: textFieldMappings
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin
 )(
 	createProxy({
 		slots: ['suffix'],
 		wrappedEleName: 'vaadin-email-field',
-		style: () => overrides$2,
+		style: () => `
+			:host {
+				display: inline-block;
+				max-width: 100%;
+				min-width: 10em;
+				padding: calc(var(${EmailFieldClass.cssVarList.inputOutlineWidth}) + var(${EmailFieldClass.cssVarList.inputOutlineOffset}))
+			}
+			${resetInputOverrides('vaadin-email-field', EmailFieldClass.cssVarList)}		
+		`,
 		excludeAttrsSync: ['tabindex'],
 		componentName: componentName$j
 	})
 );
 
-overrides$2 = `
-	:host {
-		display: inline-block;
-		min-width: 10em;
-		max-width: 100%;
-	}
-	vaadin-email-field {
-		margin: 0;
-		width: 100%;
-		box-sizing: border-box;
-	}
-	vaadin-email-field::before {
-		height: 0;
-	}
-	vaadin-email-field > input {
-		-webkit-mask-image: none;
-	}
-	vaadin-email-field::part(input-field) {
-		overflow: hidden;
-		padding: 0;
-	}
-	vaadin-email-field[readonly] > input:placeholder-shown {
-		opacity: 1;
-	}
-	vaadin-email-field input:-webkit-autofill,
-	vaadin-email-field input:-webkit-autofill::first-line,
-	vaadin-email-field input:-webkit-autofill:hover,
-	vaadin-email-field input:-webkit-autofill:active,
-	vaadin-email-field input:-webkit-autofill:focus {
-		-webkit-text-fill-color: var(${EmailFieldClass.cssVarList.color});
-		box-shadow: 0 0 0 var(${EmailFieldClass.cssVarList.height}) var(${EmailFieldClass.cssVarList.backgroundColor}) inset;
-	}
-	vaadin-email-field[required]::part(required-indicator)::after {
-		content: "*";
-		color: var(${EmailFieldClass.cssVarList.color});
-	}
-	vaadin-email-field[readonly]::part(input-field)::after {
-		border: 0 solid;
-	}
-`;
+const vars$g = EmailFieldClass.cssVarList;
 
 const emailField = {
-	...textField(EmailFieldClass.cssVarList)
+	[vars$g.hostWidth]: refs.width,
+	[vars$g.fontSize]: refs.fontSize,
+	[vars$g.fontFamily]: refs.fontFamily,
+	[vars$g.labelTextColor]: refs.labelTextColor,
+	[vars$g.inputValueTextColor]: refs.valueTextColor,
+	[vars$g.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$g.inputPlaceholderColor]: refs.placeholderTextColor,
+	[vars$g.inputBorderWidth]: refs.borderWidth,
+	[vars$g.inputBorderStyle]: refs.borderStyle,
+	[vars$g.inputBorderColor]: refs.borderColor,
+	[vars$g.inputBorderRadius]: refs.borderRadius,
+	[vars$g.inputOutlineWidth]: refs.outlineWidth,
+	[vars$g.inputOutlineStyle]: refs.outlineStyle,
+	[vars$g.inputOutlineColor]: refs.outlineColor,
+	[vars$g.inputOutlineOffset]: refs.outlineOffset,
+	[vars$g.inputBackgroundColor]: refs.backgroundColor,
+	[vars$g.inputHeight]: refs.inputHeight
 };
-const vars$g = EmailFieldClass.cssVarList;
 
 var emailField$1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -2213,130 +2277,111 @@ var emailField$1 = /*#__PURE__*/Object.freeze({
 const componentName$i = getComponentName('text-area');
 
 const {
-	host: host$8,
+	host: host$9,
+	label: label$6,
 	placeholder: placeholder$1,
-	input: input$1,
+	inputField: inputField$2,
 	textArea: textArea$2,
-	label: label$5,
-	requiredIndicator: requiredIndicator$4
+	requiredIndicator: requiredIndicator$5,
+	helperText: helperText$5,
+	errorMessage: errorMessage$5
 } = {
 	host: { selector: () => ':host' },
-	textArea: { selector: '> textarea' },
 	label: { selector: '::part(label)' },
-	input: { selector: '::part(input-field)' },
 	placeholder: { selector: 'textarea:placeholder-shown' },
-	requiredIndicator: { selector: '::part(required-indicator)::after' },
+	inputField: { selector: '::part(input-field)' },
+	textArea: { selector: '> textarea' },
+	requiredIndicator: { selector: '[required]::part(required-indicator)::after' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' }
 };
 
-let overrides$1 = ``;
-
 const TextAreaClass = compose(
 	createStyleMixin({
 		mappings: {
-			fontSize: [host$8, textArea$2],
-			resize: textArea$2,
-			color: textArea$2,
-			cursor: {},
-			labelColor: [
-				{ ...label$5, property: 'color' },
-				{ ...requiredIndicator$4, property: 'color' }
+			hostWidth: { ...host$9, property: 'width' },
+			fontSize: [
+				{ ...host$9, property: 'font-size' },
+				{ ...textArea$2, property: 'font-size' }
+			],
+			fontFamily: [
+				{ ...label$6, property: 'font-family' },
+				{ ...inputField$2, property: 'font-family' },
+				{ ...helperText$5, property: 'font-family' },
+				{ ...errorMessage$5, property: 'font-family' }
 			],
-			placeholderColor: { ...placeholder$1, property: 'color' },
-			width: host$8,
-			backgroundColor: input$1,
-			borderWidth: input$1,
-			borderStyle: input$1,
-			borderColor: input$1,
-			borderRadius: input$1,
-			outlineWidth: [input$1, { property: 'padding' }],
-			outlineStyle: input$1,
-			outlineColor: input$1,
-			outlineOffset: input$1,
+			labelTextColor: [
+				{ ...label$6, property: 'color' },
+				{ ...requiredIndicator$5, property: 'color' }
+			],
+			labelRequiredIndicator: { ...requiredIndicator$5, property: 'content' },
+			inputBackgroundColor: { ...inputField$2, property: 'background-color' },
+			inputValueTextColor: { ...textArea$2, property: 'color' },
+			inputPlaceholderTextColor: { ...placeholder$1, property: 'color' },
+			inputBorderWidth: { ...inputField$2, property: 'border-width' },
+			inputBorderStyle: { ...inputField$2, property: 'border-style' },
+			inputBorderColor: { ...inputField$2, property: 'border-color' },
+			inputBorderRadius: { ...inputField$2, property: 'border-radius' },
+			inputOutlineStyle: { ...inputField$2, property: 'outline-Style' },
+			inputOutlineColor: { ...inputField$2, property: 'outline-color' },
+			inputOutlineOffset: { ...inputField$2, property: 'outline-offset' },
+			inputOutlineWidth: { ...inputField$2, property: 'outline-width' },
+			inputResizeType: { ...textArea$2, property: 'resize' },
 		}
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin
 )(
 	createProxy({
 		slots: [],
 		wrappedEleName: 'vaadin-text-area',
-		style: () => overrides$1,
+		style: () => `
+			:host {
+				display: inline-block;
+				min-width: 10em;
+				max-width: 100%;
+				padding: calc(var(${TextAreaClass.cssVarList.inputOutlineWidth}) + var(${TextAreaClass.cssVarList.inputOutlineOffset}));
+			}
+
+			${resetInputContainer('vaadin-text-area')}
+			${resetInputField('vaadin-text-area')}
+			${resetInputPlaceholder('vaadin-text-area', 'textarea')}
+			${resetInputCursor('vaadin-text-area')}
+		`,
 		excludeAttrsSync: ['tabindex'],
 		componentName: componentName$i
 	})
 );
 
-overrides$1 = `
-	:host {
-		display: inline-block;
-		min-width: 10em;
-		max-width: 100%;
-	}
-	vaadin-text-area {
-		margin: 0;
-		width: 100%;
-		box-sizing: border-box;
-	}
-	vaadin-text-area > label,
-	vaadin-text-area::part(input-field) {
-		padding: 0;
-	}
-	vaadin-text-area[required]::part(required-indicator)::after {
-		content: "*";
-	}
-	vaadin-text-area[disabled] > textarea:placeholder-shown,
-	vaadin-text-area[readonly] > textarea:placeholder-shown {
-		opacity: 1;
-	}
-`;
-
-const globalRefs$b = getThemeRefs(globals);
+const globalRefs$a = getThemeRefs(globals);
 const vars$f = TextAreaClass.cssVarList;
 
 const textArea = {
-	[vars$f.labelColor]: globalRefs$b.colors.surface.contrast,
-	[vars$f.placeholderColor]: globalRefs$b.colors.surface.main,
-	[vars$f.color]: globalRefs$b.colors.surface.contrast,
+	[vars$f.hostWidth]: refs.width,
 	[vars$f.fontSize]: '14px',
-
-	[vars$f.backgroundColor]: globalRefs$b.colors.surface.light,
-	[vars$f.resize]: 'vertical',
-
-	[vars$f.borderRadius]: globalRefs$b.radius.sm,
-	[vars$f.borderWidth]: '1px',
-	[vars$f.borderStyle]: 'solid',
-	[vars$f.borderColor]: 'transparent',
-	[vars$f.outlineWidth]: '2px',
-	[vars$f.outlineStyle]: 'solid',
-	[vars$f.outlineColor]: 'transparent',
-	[vars$f.outlineOffset]: '0',
-
-	_fullWidth: {
-		[vars$f.width]: '100%'
-	},
-
-	_focused: {
-		[vars$f.outlineColor]: globalRefs$b.colors.surface.main
-	},
+	[vars$f.fontFamily]: refs.fontFamily,
+	[vars$f.labelTextColor]: refs.labelTextColor,
+	[vars$f.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$f.inputBackgroundColor]: refs.backgroundColor,
+	[vars$f.inputValueTextColor]: refs.valueTextColor,
+	[vars$f.inputPlaceholderTextColor]: refs.placeholderTextColor,
+	[vars$f.inputBorderRadius]: refs.borderRadius,
+	[vars$f.inputBorderWidth]: refs.borderWidth,
+	[vars$f.inputBorderStyle]: refs.borderStyle,
+	[vars$f.inputBorderColor]: refs.borderColor,
+	[vars$f.inputOutlineWidth]: refs.outlineWidth,
+	[vars$f.inputOutlineStyle]: refs.outlineStyle,
+	[vars$f.inputOutlineColor]: refs.outlineColor,
+	[vars$f.inputOutlineOffset]: refs.outlineOffset,
+	[vars$f.inputResizeType]: 'vertical',
 
 	_disabled: {
-		[vars$f.cursor]: 'not-allowed'
-	},
-
-	_bordered: {
-		[vars$f.borderColor]: globalRefs$b.colors.surface.main,
-	},
-
-	_invalid: {
-		[vars$f.labelColor]: globalRefs$b.colors.error.main,
-		[vars$f.borderColor]: globalRefs$b.colors.error.main,
-		[vars$f.outlineColor]: globalRefs$b.colors.error.light,
-		[vars$f.placeholderColor]: globalRefs$b.colors.error.light,
+		[vars$f.inputBackgroundColor]: globalRefs$a.colors.surface.light,
 	},
 
 	_readonly: {
-		[vars$f.resize]: 'none',
+		[vars$f.inputResizeType]: 'none',
 	}
 };
 
@@ -2395,9 +2440,11 @@ const booleanFieldMixin = (superclass) =>
 
 var commonStyles = `
 :host {
-	--vaadin-field-default-width: auto;
 	display: inline-flex;
 }
+
+${resetInputFieldDefaultWidth()}
+
 .wrapper {
 	display: flex;
 }
@@ -2427,9 +2474,6 @@ vaadin-text-field::part(input-field)::after {
 vaadin-text-field[focus-ring]::part(input-field) {
 	box-shadow: none;
 }
-vaadin-text-field[required]::part(required-indicator)::after {
-	content: "*";
-}
 
 vaadin-checkbox [slot="label"] {
     align-self: flex-start;
@@ -2451,91 +2495,101 @@ descope-boolean-field-internal {
 	min-height: 0;
 	padding: 0;
 }
+
+[slot="label"],
+vaadin-checkbox,
+vaadin-checkbox::part(checkbox) {
+	height: 100%;
+	cursor: pointer;
+}
 `;
 
 const componentName$g = getComponentName('checkbox');
 
 const {
-	host: host$7,
+	host: host$8,
 	component: component$1,
 	checkboxElement,
 	checkboxSurface,
 	checkboxHiddenLabel: checkboxHiddenLabel$1,
-	label: label$4,
-	requiredIndicator: requiredIndicator$3
+	label: label$5,
+	requiredIndicator: requiredIndicator$4,
+	helperText: helperText$4,
+	errorMessage: errorMessage$4
 } = {
 	host: { selector: () => ':host' },
 	label: { selector: '::part(label)' },
-	requiredIndicator: { selector: '::part(required-indicator)::after' },
+	requiredIndicator: { selector: '[required]::part(required-indicator)::after' },
 	component: { selector: 'vaadin-checkbox' },
 	checkboxElement: { selector: 'vaadin-checkbox::part(checkbox)' },
 	checkboxSurface: { selector: 'vaadin-checkbox::part(checkbox)::after' },
 	checkboxHiddenLabel: { selector: 'vaadin-checkbox [slot="label"]' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' },
 };
 
 const CheckboxClass = compose(
 	createStyleMixin({
 		mappings: {
-			width: host$7,
-			cursor: component$1,
-
-			// Checkbox
-			checkboxBackgroundColor: { ...checkboxElement, property: 'background-color' },
-			checkboxRadius: { ...checkboxElement, property: 'border-radius' },
+			hostWidth: { ...host$8, property: 'width' },
 
-			checkboxSize: [
-				{ ...checkboxElement, property: 'width' },
-				{ ...label$4, property: 'margin-left' },
-				{ ...checkboxElement, property: 'height' },
-				{ ...checkboxSurface, property: 'font-size' },
-				{ ...component$1, property: 'font-size' },
-				{ ...label$4, property: 'line-height' },
-				{ ...checkboxHiddenLabel$1, property: 'line-height' }
-			],
-
-			checkboxOutlineWidth: { ...checkboxElement, property: 'outline-width' },
-			checkboxOutlineOffset: { ...checkboxElement, property: 'outline-offset' },
-			checkboxOutlineColor: { ...checkboxElement, property: 'outline-color' },
-			checkboxOutlineStyle: { ...checkboxElement, property: 'outline-style' },
-
-			// Checkmark
-			checkmarkTextColor: { ...checkboxSurface, property: 'color' },
-
-			// Label
-			labelFontSize: [
-				{ ...host$7, property: 'font-size' },
+			fontSize: [
+				{ ...host$8, property: 'font-size' },
 				{ ...checkboxElement, property: 'font-size' },
-				{ ...label$4, property: 'font-size' },
+				{ ...label$5, property: 'font-size' },
 				{ ...checkboxHiddenLabel$1, property: 'font-size' }
 			],
+			fontFamily: [
+				{ ...label$5, property: 'font-family' },
+				{ ...checkboxHiddenLabel$1, property: 'font-family' },
+				{ ...helperText$4, property: 'font-family' },
+				{ ...errorMessage$4, property: 'font-family' }
+			],
+
+			labelTextColor: [
+				{ ...label$5, property: 'color' },
+				{ ...requiredIndicator$4, property: 'color' },
+			],
+			labelRequiredIndicator: { ...requiredIndicator$4, property: 'content' },
+
 			labelFontWeight: [
-				{ ...label$4, property: 'font-weight' },
+				{ ...label$5, property: 'font-weight' },
 				{ ...checkboxHiddenLabel$1, property: 'font-weight' }
 			],
-			labelMargin: [
-				{ ...label$4, property: 'left' },
+			labelSpacing: [
+				{ ...label$5, property: 'left' },
 				{ ...checkboxHiddenLabel$1, property: 'padding-left' }
 			],
-			labelTextColor: [
-				{ ...label$4, property: 'color' },
-				{ ...requiredIndicator$3, property: 'color' },
+			inputValueTextColor: { ...checkboxSurface, property: 'color' },
+			inputBackgroundColor: { ...checkboxElement, property: 'background-color' },
+			inputBorderRadius: { ...checkboxElement, property: 'border-radius' },
+			inputOutlineWidth: { ...checkboxElement, property: 'outline-width' },
+			inputOutlineOffset: { ...checkboxElement, property: 'outline-offset' },
+			inputOutlineColor: { ...checkboxElement, property: 'outline-color' },
+			inputOutlineStyle: { ...checkboxElement, property: 'outline-style' },
+			inputSize: [
+				{ ...checkboxElement, property: 'width' },
+				{ ...label$5, property: 'margin-left' },
+				{ ...checkboxElement, property: 'height' },
+				{ ...checkboxSurface, property: 'font-size' },
+				{ ...component$1, property: 'font-size' },
+				{ ...label$5, property: 'line-height' },
+				{ ...checkboxHiddenLabel$1, property: 'line-height' }
 			],
 		},
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin,
 	booleanFieldMixin
 )(
 	createProxy({
 		slots: [],
 		wrappedEleName: 'vaadin-text-field',
-		style: `
+		style: () => `
 		${commonStyles}
-
-		vaadin-checkbox [slot="label"] {
-			height: 100%;
-			cursor: pointer;
+		vaadin-text-field {
+			padding: calc(var(${CheckboxClass.cssVarList.inputOutlineWidth}) + var(${CheckboxClass.cssVarList.inputOutlineOffset}));
 		}
 		`,
 		excludeAttrsSync: ['tabindex'],
@@ -2543,63 +2597,33 @@ const CheckboxClass = compose(
 	})
 );
 
-const globalRefs$a = getThemeRefs(globals);
+const globalRefs$9 = getThemeRefs(globals);
 const vars$e = CheckboxClass.cssVarList;
 
 const checkbox = {
-	[vars$e.checkboxBackgroundColor]: globalRefs$a.colors.surface.main,
-	[vars$e.cursor]: 'pointer',
-
-	[vars$e.checkboxRadius]: globalRefs$a.radius.xs,
-	[vars$e.checkboxSize]: '2em',
-
-	[vars$e.labelTextColor]: globalRefs$a.colors.surface.contrast,
-	[vars$e.labelMargin]: '0.5em',
+	[vars$e.hostWidth]: refs.width,
+	[vars$e.fontSize]: refs.fontSize,
+	[vars$e.fontFamily]: refs.fontFamily,
+	[vars$e.labelTextColor]: refs.labelTextColor,
+	[vars$e.labelRequiredIndicator]: refs.requiredIndicator,
 	[vars$e.labelFontWeight]: '400',
-
-	size: {
-		xs: {
-			[vars$e.labelFontSize]: '8px',
-		},
-		sm: {
-			[vars$e.labelFontSize]: '10px',
-		},
-		md: {
-			[vars$e.labelFontSize]: '14px',
-		},
-		lg: {
-			[vars$e.labelFontSize]: '20px',
-		},
-		xl: {
-			[vars$e.labelFontSize]: '25px',
-		}
-	},
-
-	_fullWidth: {
-		[vars$e.width]: '100%',
-	},
+	[vars$e.labelSpacing]: '0.5em',
+	[vars$e.inputOutlineWidth]: refs.outlineWidth,
+	[vars$e.inputOutlineOffset]: refs.outlineOffset,
+	[vars$e.inputOutlineColor]: refs.outlineColor,
+	[vars$e.inputOutlineStyle]: refs.outlineStyle,
+	[vars$e.inputBorderRadius]: refs.borderRadius,
+	[vars$e.inputBackgroundColor]: globalRefs$9.colors.surface.main,
+	[vars$e.inputSize]: '2em',
 
 	_checked: {
-		[vars$e.checkboxBackgroundColor]: globalRefs$a.colors.primary.main,
-		[vars$e.checkmarkTextColor]: globalRefs$a.colors.primary.contrast,
+		[vars$e.inputBackgroundColor]: globalRefs$9.colors.primary.main,
+		[vars$e.inputValueTextColor]: globalRefs$9.colors.primary.contrast,
 	},
 
 	_disabled: {
-		[vars$e.checkboxBackgroundColor]: globalRefs$a.colors.surface.main,
-	},
-
-	_focused: {
-		[vars$e.checkboxOutlineWidth]: '2px',
-		[vars$e.checkboxOutlineOffset]: '1px',
-		[vars$e.checkboxOutlineColor]: globalRefs$a.colors.primary.main,
-		[vars$e.checkboxOutlineStyle]: 'solid'
+		[vars$e.inputBackgroundColor]: globalRefs$9.colors.surface.main,
 	},
-
-	_invalid: {
-		[vars$e.checkboxOutlineColor]: globalRefs$a.colors.error.main,
-		[vars$e.labelTextColor]: globalRefs$a.colors.error.main
-	},
-
 };
 
 var checkbox$1 = /*#__PURE__*/Object.freeze({
@@ -2611,39 +2635,46 @@ var checkbox$1 = /*#__PURE__*/Object.freeze({
 const componentName$f = getComponentName('switch-toggle');
 
 const {
-	host: host$6,
+	host: host$7,
 	component,
 	checkboxElement: track,
 	checkboxSurface: knob,
 	checkboxHiddenLabel,
-	label: label$3,
-	requiredIndicator: requiredIndicator$2,
+	label: label$4,
+	requiredIndicator: requiredIndicator$3,
+	helperText: helperText$3,
+	errorMessage: errorMessage$3
 } = {
 	host: { selector: () => ':host' },
 	label: { selector: '::part(label)' },
-	requiredIndicator: { selector: '::part(required-indicator)::after' },
+	requiredIndicator: { selector: '[required]::part(required-indicator)::after' },
 	component: { selector: 'vaadin-checkbox' },
 	checkboxElement: { selector: 'vaadin-checkbox::part(checkbox)' },
 	checkboxSurface: { selector: 'vaadin-checkbox::part(checkbox)::after' },
 	checkboxHiddenLabel: { selector: 'vaadin-checkbox [slot="label"]' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' },
 };
 
 const SwitchToggleClass = compose(
 	createStyleMixin({
 		mappings: {
-			width: host$6,
-			cursor: [component, checkboxHiddenLabel, track],
-			fontSize: [component, label$3, checkboxHiddenLabel],
-
-			// Track
+			hostWidth: { ...host$7, property: 'width' },
+			fontSize: [
+				{ ...component, property: 'font-size' },
+				{ ...label$4, property: 'font-size' },
+				{ ...checkboxHiddenLabel, property: 'font-size' },
+			],
+			fontFamily: [
+				{ ...label$4, property: 'font-family' },
+				{ ...helperText$3, property: 'font-family' },
+				{ ...errorMessage$3, property: 'font-family' }
+			],
 			trackBorderWidth: { ...track, property: 'border-width' },
 			trackBorderStyle: { ...track, property: 'border-style' },
 			trackBorderColor: { ...track, property: 'border-color' },
-
-			// Checkbox
 			trackBackgroundColor: { ...track, property: 'background-color' },
-			trackRadius: { ...track, property: 'border-radius' },
-
+			trackBorderRadius: { ...track, property: 'border-radius' },
 			trackWidth: [
 				{ ...track, property: 'width' },
 			],
@@ -2651,44 +2682,43 @@ const SwitchToggleClass = compose(
 				{ ...knob, property: 'font-size' },
 				{ ...track, property: 'height' }
 			],
-			switchOutlineWidth: { ...track, property: 'outline-width' },
-			switchOutlineOffset: { ...track, property: 'outline-offset' },
-			switchOutlineColor: { ...track, property: 'outline-color' },
-			switchOutlineStyle: { ...track, property: 'outline-style' },
 
-			// Knob
 			knobSize: [
 				{ ...knob, property: 'width' },
 				{ ...knob, property: 'height' },
 			],
 			knobTextColor: { ...knob, property: 'color' },
 			knobRadius: { ...knob, property: 'border-radius' },
-			knobTransition: { ...knob, property: 'transition' },
+			knobTransitionDuration: { ...knob, property: 'transition' },
 			knobColor: { ...knob, property: 'background-color' },
 			knobTopOffset: { ...knob, property: 'top' },
-			knobPosition: { ...knob, property: 'left' },
+			knobLeftOffset: { ...knob, property: 'left' },
 
-			// Label
-			labelMargin: [
-				{ ...label$3, property: 'padding-left' },
+			labelSpacing: [
+				{ ...label$4, property: 'padding-left' },
 				{ ...checkboxHiddenLabel, property: 'padding-left' }
 			],
 			labelLineHeight: [
-				{ ...label$3, property: 'line-height' },
+				{ ...label$4, property: 'line-height' },
 				{ ...checkboxHiddenLabel, property: 'line-height' }
 			],
 			labelFontWeight: [
-				{ ...label$3, property: 'font-weight' },
+				{ ...label$4, property: 'font-weight' },
 				{ ...checkboxHiddenLabel, property: 'font-weight' }
 			],
 			labelTextColor: [
-				{ ...label$3, property: 'color' },
-				{ ...requiredIndicator$2, property: 'color' },
+				{ ...label$4, property: 'color' },
+				{ ...requiredIndicator$3, property: 'color' },
 			],
+			labelRequiredIndicator: { ...requiredIndicator$3, property: 'content' },
+			inputOutlineWidth: { ...track, property: 'outline-width' },
+			inputOutlineOffset: { ...track, property: 'outline-offset' },
+			inputOutlineColor: { ...track, property: 'outline-color' },
+			inputOutlineStyle: { ...track, property: 'outline-style' },
 		},
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin,
 	booleanFieldMixin
 )(
@@ -2696,23 +2726,24 @@ const SwitchToggleClass = compose(
 		slots: [],
 		wrappedEleName: 'vaadin-text-field',
 		style: () => `
-		${commonStyles}
-
-		vaadin-text-field::part(label) {
-			left: calc(var(${SwitchToggleClass.cssVarList.trackWidth}) + var(${SwitchToggleClass.cssVarList.trackBorderWidth}) * 2);
-		}
-
-		vaadin-checkbox[active]::part(checkbox) {
-			transform: none;
-		}
-		vaadin-checkbox[checked]::part(checkbox) {
-			background: none;
-		}
-		vaadin-checkbox::part(checkbox)::after {
-			position: absolute;
-			opacity: 1;
-			content: '';
-		}
+			${commonStyles}
+			:host {
+				padding: calc(var(${SwitchToggleClass.cssVarList.inputOutlineWidth}) + var(${SwitchToggleClass.cssVarList.inputOutlineOffset}));
+			}
+			vaadin-text-field::part(label) {
+				left: calc(var(${SwitchToggleClass.cssVarList.trackWidth}) + var(${SwitchToggleClass.cssVarList.trackBorderWidth}) * 2);
+			}
+			vaadin-checkbox[active]::part(checkbox) {
+				transform: none;
+			}
+			vaadin-checkbox[checked]::part(checkbox) {
+				background: none;
+			}
+			vaadin-checkbox::part(checkbox)::after {
+				position: absolute;
+				opacity: 1;
+				content: '';
+			}
 		`,
 		excludeAttrsSync: ['tabindex'],
 		componentName: componentName$f
@@ -2721,73 +2752,58 @@ const SwitchToggleClass = compose(
 
 const knobMargin = '2px';
 const checkboxHeight = '1.25em';
-const trackBorderWidth = '2px';
 
-const globalRefs$9 = getThemeRefs(globals);
+const globalRefs$8 = getThemeRefs(globals);
 const vars$d = SwitchToggleClass.cssVarList;
 
 const switchToggle = {
-    size: {
-        xs: { [vars$d.fontSize]: '8px' },
-        sm: { [vars$d.fontSize]: '12px' },
-        md: { [vars$d.fontSize]: '16px' },
-        lg: { [vars$d.fontSize]: '20px' },
-        xl: { [vars$d.fontSize]: '24px' }
-    },
+    [vars$d.fontSize]: refs.fontSize,
+    [vars$d.fontFamily]: refs.fontFamily,
 
-    [vars$d.cursor]: 'pointer',
-
-    [vars$d.trackBorderStyle]: 'solid',
-    [vars$d.trackBorderWidth]: trackBorderWidth,
-    [vars$d.trackBorderColor]: globalRefs$9.colors.surface.contrast,
+    [vars$d.inputOutlineWidth]: refs.outlineWidth,
+    [vars$d.inputOutlineOffset]: refs.outlineOffset,
+    [vars$d.inputOutlineColor]: refs.outlineColor,
+    [vars$d.inputOutlineStyle]: refs.outlineStyle,
 
+    [vars$d.trackBorderStyle]: refs.borderStyle,
+    [vars$d.trackBorderWidth]: refs.borderWidth, // var `trackBorderWidth` used outside the theme for `left` margin calculation
+    [vars$d.trackBorderColor]: globalRefs$8.colors.surface.contrast,
     [vars$d.trackBackgroundColor]: 'none',
-    [vars$d.trackRadius]: globalRefs$9.radius.md,
-    [vars$d.trackWidth]: '2.5em',
+    [vars$d.trackBorderRadius]: globalRefs$8.radius.md,
+    [vars$d.trackWidth]: '2.5em', // var `trackWidth` used outside the theme for `left` margin calculation
     [vars$d.trackHeight]: checkboxHeight,
 
     [vars$d.knobSize]: `calc(1em - ${knobMargin})`,
     [vars$d.knobRadius]: '50%',
     [vars$d.knobTopOffset]: '1px',
-    [vars$d.knobColor]: globalRefs$9.colors.surface.contrast,
-    [vars$d.knobPosition]: knobMargin,
-    [vars$d.knobTransition]: '0.3s',
+    [vars$d.knobLeftOffset]: knobMargin,
+    [vars$d.knobColor]: refs.valueTextColor,
+    [vars$d.knobTransitionDuration]: '0.3s',
 
-    [vars$d.labelTextColor]: globalRefs$9.colors.surface.contrast,
+    [vars$d.labelTextColor]: refs.labelTextColor,
     [vars$d.labelFontWeight]: '400',
     [vars$d.labelLineHeight]: `calc(${checkboxHeight} + 0.25em)`,
-    [vars$d.labelMargin]: '0.25em',
+    [vars$d.labelSpacing]: '0.25em',
+    [vars$d.labelRequiredIndicator]: refs.requiredIndicator,
 
-    _fullWidth: {
-        [vars$d.width]: '100%',
-    },
+    [vars$d.hostWidth]: refs.width,
 
     _checked: {
-        [vars$d.trackBorderColor]: globalRefs$9.colors.primary.main,
-        [vars$d.knobPosition]: `calc(100% - var(${vars$d.knobSize}) - ${knobMargin})`,
-        [vars$d.knobColor]: globalRefs$9.colors.primary.main,
-        [vars$d.knobTextColor]: globalRefs$9.colors.primary.contrast,
+        [vars$d.trackBorderColor]: globalRefs$8.colors.primary.main,
+        [vars$d.knobLeftOffset]: `calc(100% - var(${vars$d.knobSize}) - ${knobMargin})`,
+        [vars$d.knobColor]: globalRefs$8.colors.primary.main,
+        [vars$d.knobTextColor]: refs.valueTextColor,
     },
 
     _disabled: {
-        [vars$d.cursor]: 'not-allowed', // todo: fix cursor
-        [vars$d.knobColor]: globalRefs$9.colors.surface.main,
-        [vars$d.trackBorderColor]: globalRefs$9.colors.surface.main,
-        [vars$d.trackBackgroundColor]: globalRefs$9.colors.surface.light,
-    },
-
-    _focused: {
-        [vars$d.switchOutlineWidth]: '2px',
-        [vars$d.switchOutlineOffset]: '1px',
-        [vars$d.switchOutlineColor]: globalRefs$9.colors.primary.main,
-        [vars$d.switchOutlineStyle]: 'solid'
+        [vars$d.knobColor]: globalRefs$8.colors.surface.main,
+        [vars$d.trackBorderColor]: globalRefs$8.colors.surface.main,
+        [vars$d.trackBackgroundColor]: globalRefs$8.colors.surface.light,
     },
 
     _invalid: {
-        [vars$d.switchOutlineColor]: globalRefs$9.colors.error.main,
-        [vars$d.trackBorderColor]: globalRefs$9.colors.error.main,
-        [vars$d.knobColor]: globalRefs$9.colors.error.main,
-        [vars$d.labelTextColor]: globalRefs$9.colors.error.main
+        [vars$d.trackBorderColor]: globalRefs$8.colors.error.main,
+        [vars$d.knobColor]: globalRefs$8.colors.error.main,
     },
 };
 
@@ -2810,11 +2826,11 @@ class RawContainer extends createBaseClass({ componentName: componentName$e, bas
 				width: 100%;
 				height: 100%;
 				display: flex;
-				overflow: hidden;
+				overflow: auto;
 			}
 			:host {
 				display: inline-block;
-				overflow: auto;
+				overflow: hidden;
 			}
 		</style>
 		<slot></slot>
@@ -2825,8 +2841,8 @@ class RawContainer extends createBaseClass({ componentName: componentName$e, bas
 const ContainerClass = compose(
 	createStyleMixin({
 		mappings: {
-			height: { selector: () => ':host' },
-			width: { selector: () => ':host' },
+			hostHeight: { selector: () => ':host', property: 'height' },
+			hostWidth: { selector: () => ':host', property: 'width' },
 
 			verticalPadding: [
 				{ property: 'padding-top' },
@@ -2858,7 +2874,7 @@ const ContainerClass = compose(
 	componentNameValidationMixin
 )(RawContainer);
 
-const globalRefs$8 = getThemeRefs(globals);
+const globalRefs$7 = getThemeRefs(globals);
 
 const compVars$1 = ContainerClass.cssVarList;
 
@@ -2874,103 +2890,90 @@ const horizontalAlignment = {
 	end: { horizontalAlignment: 'end' },
 };
 
-const [helperTheme$1, helperRefs$1, helperVars$1] =
+const [helperTheme$2, helperRefs$2, helperVars$1] =
 	createHelperVars({
 		verticalAlignment,
 		horizontalAlignment,
 		shadowColor: '#00000020' //if we want to support transparency vars, we should use different color format
 	}, componentName$e);
 
+const { shadowColor } = helperRefs$2;
+
 const container = {
-	...helperTheme$1,
-	[compVars$1.width]: '100%',
+	...helperTheme$2,
+
+	[compVars$1.hostWidth]: '100%',
 	[compVars$1.boxShadow]: 'none',
-	[compVars$1.backgroundColor]: globalRefs$8.colors.surface.light,
-	[compVars$1.color]: globalRefs$8.colors.surface.contrast,
+	[compVars$1.backgroundColor]: globalRefs$7.colors.surface.light,
+	[compVars$1.color]: globalRefs$7.colors.surface.contrast,
+
 	verticalPadding: {
 		sm: { [compVars$1.verticalPadding]: '5px' },
 		md: { [compVars$1.verticalPadding]: '10px' },
 		lg: { [compVars$1.verticalPadding]: '20px' },
 	},
+
 	horizontalPadding: {
 		sm: { [compVars$1.horizontalPadding]: '5px' },
 		md: { [compVars$1.horizontalPadding]: '10px' },
 		lg: { [compVars$1.horizontalPadding]: '20px' },
 	},
+
 	direction: {
 		row: {
 			[compVars$1.flexDirection]: 'row',
-			[compVars$1.alignItems]: helperRefs$1.verticalAlignment,
-			[compVars$1.justifyContent]: helperRefs$1.horizontalAlignment,
+			[compVars$1.alignItems]: helperRefs$2.verticalAlignment,
+			[compVars$1.justifyContent]: helperRefs$2.horizontalAlignment,
 			[compVars$1.flexWrap]: 'wrap',
 			horizontalAlignment: {
-				spaceBetween: { [helperVars$1.horizontalAlignment]: 'space-between' },
+				spaceBetween: {
+					[helperVars$1.horizontalAlignment]: 'space-between'
+				},
 			}
 		},
-
 		column: {
 			[compVars$1.flexDirection]: 'column',
-			[compVars$1.alignItems]: helperRefs$1.horizontalAlignment,
-			[compVars$1.justifyContent]: helperRefs$1.verticalAlignment,
+			[compVars$1.alignItems]: helperRefs$2.horizontalAlignment,
+			[compVars$1.justifyContent]: helperRefs$2.verticalAlignment,
 			verticalAlignment: {
-				spaceBetween: { [helperVars$1.verticalAlignment]: 'space-between' }
+				spaceBetween: {
+					[helperVars$1.verticalAlignment]: 'space-between'
+				}
 			}
 		},
 	},
 
 	spaceBetween: {
-		sm: {
-			[compVars$1.gap]: '10px'
-		},
-		md: {
-			[compVars$1.gap]: '20px'
-		},
-		lg: {
-			[compVars$1.gap]: '30px'
-		}
+		sm: { [compVars$1.gap]: '10px' },
+		md: { [compVars$1.gap]: '20px' },
+		lg: { [compVars$1.gap]: '30px' }
 	},
 
 	shadow: {
-		sm: {
-			[compVars$1.boxShadow]: `${globalRefs$8.shadow.wide.sm} ${helperRefs$1.shadowColor}, ${globalRefs$8.shadow.narrow.sm} ${helperRefs$1.shadowColor}`
-		},
-		md: {
-			[compVars$1.boxShadow]: `${globalRefs$8.shadow.wide.md} ${helperRefs$1.shadowColor}, ${globalRefs$8.shadow.narrow.md} ${helperRefs$1.shadowColor}`
-		},
-		lg: {
-			[compVars$1.boxShadow]: `${globalRefs$8.shadow.wide.lg} ${helperRefs$1.shadowColor}, ${globalRefs$8.shadow.narrow.lg} ${helperRefs$1.shadowColor}`
-		},
-		xl: {
-			[compVars$1.boxShadow]: `${globalRefs$8.shadow.wide.xl} ${helperRefs$1.shadowColor}, ${globalRefs$8.shadow.narrow.xl} ${helperRefs$1.shadowColor}`
-		},
+		sm: { [compVars$1.boxShadow]: `${globalRefs$7.shadow.wide.sm} ${shadowColor}, ${globalRefs$7.shadow.narrow.sm} ${shadowColor}` },
+		md: { [compVars$1.boxShadow]: `${globalRefs$7.shadow.wide.md} ${shadowColor}, ${globalRefs$7.shadow.narrow.md} ${shadowColor}` },
+		lg: { [compVars$1.boxShadow]: `${globalRefs$7.shadow.wide.lg} ${shadowColor}, ${globalRefs$7.shadow.narrow.lg} ${shadowColor}` },
+		xl: { [compVars$1.boxShadow]: `${globalRefs$7.shadow.wide.xl} ${shadowColor}, ${globalRefs$7.shadow.narrow.xl} ${shadowColor}` },
 		'2xl': {
 			[helperVars$1.shadowColor]: '#00000050', // mimic daisyUI shadow settings 
-			[compVars$1.boxShadow]: `${globalRefs$8.shadow.wide['2xl']} ${helperRefs$1.shadowColor}`
+			[compVars$1.boxShadow]: `${globalRefs$7.shadow.wide['2xl']} ${shadowColor}`
 		},
 	},
 
 	borderRadius: {
-		sm: {
-			[compVars$1.borderRadius]: globalRefs$8.radius.sm
-		},
-		md: {
-			[compVars$1.borderRadius]: globalRefs$8.radius.md
-		},
-		lg: {
-			[compVars$1.borderRadius]: globalRefs$8.radius.lg
-		},
-		xl: {
-			[compVars$1.borderRadius]: globalRefs$8.radius.xl
-		},
-		'2xl': {
-			[compVars$1.borderRadius]: globalRefs$8.radius['2xl']
-		},
-		'3xl': {
-			[compVars$1.borderRadius]: globalRefs$8.radius['3xl']
-		},
+		sm: { [compVars$1.borderRadius]: globalRefs$7.radius.sm },
+		md: { [compVars$1.borderRadius]: globalRefs$7.radius.md },
+		lg: { [compVars$1.borderRadius]: globalRefs$7.radius.lg },
+		xl: { [compVars$1.borderRadius]: globalRefs$7.radius.xl },
+		'2xl': { [compVars$1.borderRadius]: globalRefs$7.radius['2xl'] },
+		'3xl': { [compVars$1.borderRadius]: globalRefs$7.radius['3xl'] },
 	}
 };
-const vars$c = { ...compVars$1, ...helperVars$1 };
+
+const vars$c = {
+	...compVars$1,
+	...helperVars$1
+};
 
 var container$1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -3061,99 +3064,104 @@ class RawText extends createBaseClass({ componentName: componentName$c, baseSele
 const TextClass = compose(
 	createStyleMixin({
 		mappings: {
+			hostWidth: { selector: () => ':host', property: 'width' },
+			fontSize: { property: 'font-size' },
+			textColor: { property: 'color' },
+			textLineHeight: { property: 'line-height' },
+			textLetterSpacing: { property: 'letter-spacing' },
+			textShadow: {},
+			textAlign: {},
+			textTransform: {},
 			fontFamily: {},
-			lineHeight: {},
 			fontStyle: {},
-			fontSize: {},
 			fontWeight: {},
-			width: { selector: () => ':host' },
-			color: {},
-			letterSpacing: {},
-			textShadow: {},
 			borderWidth: {},
 			borderStyle: {},
 			borderColor: {},
-			textTransform: {},
-			textAlign: {},
 		},
 	}),
 	draggableMixin,
 	componentNameValidationMixin
 )(RawText);
 
-const globalRefs$7 = getThemeRefs(globals);
-
+const globalRefs$6 = getThemeRefs(globals);
 const vars$a = TextClass.cssVarList;
 
 const text$2 = {
-	[vars$a.lineHeight]: '1em',
+	[vars$a.textLineHeight]: '1em',
 	[vars$a.textAlign]: 'left',
-	[vars$a.color]: globalRefs$7.colors.surface.dark,
+	[vars$a.textColor]: globalRefs$6.colors.surface.dark,
 	variant: {
 		h1: {
-			[vars$a.fontSize]: globalRefs$7.typography.h1.size,
-			[vars$a.fontWeight]: globalRefs$7.typography.h1.weight,
-			[vars$a.fontFamily]: globalRefs$7.typography.h1.font
+			[vars$a.fontSize]: globalRefs$6.typography.h1.size,
+			[vars$a.fontWeight]: globalRefs$6.typography.h1.weight,
+			[vars$a.fontFamily]: globalRefs$6.typography.h1.font
 		},
 		h2: {
-			[vars$a.fontSize]: globalRefs$7.typography.h2.size,
-			[vars$a.fontWeight]: globalRefs$7.typography.h2.weight,
-			[vars$a.fontFamily]: globalRefs$7.typography.h2.font
+			[vars$a.fontSize]: globalRefs$6.typography.h2.size,
+			[vars$a.fontWeight]: globalRefs$6.typography.h2.weight,
+			[vars$a.fontFamily]: globalRefs$6.typography.h2.font
 		},
 		h3: {
-			[vars$a.fontSize]: globalRefs$7.typography.h3.size,
-			[vars$a.fontWeight]: globalRefs$7.typography.h3.weight,
-			[vars$a.fontFamily]: globalRefs$7.typography.h3.font
+			[vars$a.fontSize]: globalRefs$6.typography.h3.size,
+			[vars$a.fontWeight]: globalRefs$6.typography.h3.weight,
+			[vars$a.fontFamily]: globalRefs$6.typography.h3.font
 		},
 		subtitle1: {
-			[vars$a.fontSize]: globalRefs$7.typography.subtitle1.size,
-			[vars$a.fontWeight]: globalRefs$7.typography.subtitle1.weight,
-			[vars$a.fontFamily]: globalRefs$7.typography.subtitle1.font
+			[vars$a.fontSize]: globalRefs$6.typography.subtitle1.size,
+			[vars$a.fontWeight]: globalRefs$6.typography.subtitle1.weight,
+			[vars$a.fontFamily]: globalRefs$6.typography.subtitle1.font
 		},
 		subtitle2: {
-			[vars$a.fontSize]: globalRefs$7.typography.subtitle2.size,
-			[vars$a.fontWeight]: globalRefs$7.typography.subtitle2.weight,
-			[vars$a.fontFamily]: globalRefs$7.typography.subtitle2.font
+			[vars$a.fontSize]: globalRefs$6.typography.subtitle2.size,
+			[vars$a.fontWeight]: globalRefs$6.typography.subtitle2.weight,
+			[vars$a.fontFamily]: globalRefs$6.typography.subtitle2.font
 		},
 		body1: {
-			[vars$a.fontSize]: globalRefs$7.typography.body1.size,
-			[vars$a.fontWeight]: globalRefs$7.typography.body1.weight,
-			[vars$a.fontFamily]: globalRefs$7.typography.body1.font
+			[vars$a.fontSize]: globalRefs$6.typography.body1.size,
+			[vars$a.fontWeight]: globalRefs$6.typography.body1.weight,
+			[vars$a.fontFamily]: globalRefs$6.typography.body1.font
 		},
 		body2: {
-			[vars$a.fontSize]: globalRefs$7.typography.body2.size,
-			[vars$a.fontWeight]: globalRefs$7.typography.body2.weight,
-			[vars$a.fontFamily]: globalRefs$7.typography.body2.font
+			[vars$a.fontSize]: globalRefs$6.typography.body2.size,
+			[vars$a.fontWeight]: globalRefs$6.typography.body2.weight,
+			[vars$a.fontFamily]: globalRefs$6.typography.body2.font
 		}
 	},
+
 	mode: {
 		primary: {
-			[vars$a.color]: globalRefs$7.colors.primary.main
+			[vars$a.textColor]: globalRefs$6.colors.primary.main
 		},
 		secondary: {
-			[vars$a.color]: globalRefs$7.colors.secondary.main
+			[vars$a.textColor]: globalRefs$6.colors.secondary.main
 		},
 		error: {
-			[vars$a.color]: globalRefs$7.colors.error.main
+			[vars$a.textColor]: globalRefs$6.colors.error.main
 		},
 		success: {
-			[vars$a.color]: globalRefs$7.colors.success.main
+			[vars$a.textColor]: globalRefs$6.colors.success.main
 		}
 	},
+
 	textAlign: {
 		right: { [vars$a.textAlign]: 'right' },
 		left: { [vars$a.textAlign]: 'left' },
 		center: { [vars$a.textAlign]: 'center' }
 	},
+
 	_fullWidth: {
-		[vars$a.width]: '100%',
+		[vars$a.hostWidth]: '100%',
 	},
+
 	_italic: {
 		[vars$a.fontStyle]: 'italic'
 	},
+
 	_uppercase: {
 		[vars$a.textTransform]: 'uppercase'
 	},
+
 	_lowercase: {
 		[vars$a.textTransform]: 'lowercase'
 	}
@@ -3202,43 +3210,47 @@ class RawLink extends createBaseClass({ componentName: componentName$b, baseSele
 	}
 }
 
-const selectors$2 = {
+const selectors$1 = {
 	host: { selector: () => ':host' },
 	anchor: {},
 	wrapper: { selector: () => ':host > div' },
 	text: { selector: () => TextClass.componentName }
 };
 
-const { anchor, text: text$1, host: host$5, wrapper } = selectors$2;
+const { anchor, text: text$1, host: host$6, wrapper } = selectors$1;
 
 const LinkClass = compose(
 	createStyleMixin({
 		mappings: {
-			width: host$5,
+			hostWidth: { ...host$6, property: 'width' },
 			textAlign: wrapper,
-			color: [anchor, { ...text$1, property: TextClass.cssVarList.color }],
+			textColor: [
+				{ ...anchor, property: 'color' },
+				{ ...text$1, property: TextClass.cssVarList.textColor }
+			],
 			cursor: anchor,
-			borderBottomWidth: anchor,
-			borderBottomStyle: anchor,
-			borderBottomColor: anchor
+			textUnderlineWidth: { ...anchor, property: 'border-bottom-width' },
+			textUnderlineStyle: { ...anchor, property: 'border-bottom-style' },
+			textUnderlineColor: { ...anchor, property: 'border-bottom-color' }
 		},
 	}),
 	draggableMixin,
 	componentNameValidationMixin
 )(RawLink);
 
-const globalRefs$6 = getThemeRefs(globals);
+const globalRefs$5 = getThemeRefs(globals);
 const vars$9 = LinkClass.cssVarList;
 
 const link = {
 	[vars$9.cursor]: 'pointer',
-	[vars$9.borderBottomWidth]: '2px',
-	[vars$9.borderBottomStyle]: 'solid',
-	[vars$9.borderBottomColor]: 'transparent',
-	[vars$9.color]: globalRefs$6.colors.primary.main,
+
+	[vars$9.textUnderlineWidth]: '2px',
+	[vars$9.textUnderlineStyle]: 'solid',
+	[vars$9.textUnderlineColor]: 'transparent',
+	[vars$9.textColor]: globalRefs$5.colors.primary.main,
 
 	_hover: {
-		[vars$9.borderBottomColor]: globalRefs$6.colors.primary.main
+		[vars$9.textUnderlineColor]: globalRefs$5.colors.primary.main
 	},
 
 	textAlign: {
@@ -3248,33 +3260,25 @@ const link = {
 	},
 
 	_fullWidth: {
-		[vars$9.width]: '100%'
+		[vars$9.hostWidth]: '100%'
+	},
+
+	_hover: {
+		[vars$9.textUnderlineColor]: 'currentColor'
 	},
 
 	mode: {
 		primary: {
-			[vars$9.color]: globalRefs$6.colors.primary.main,
-			_hover: {
-				[vars$9.borderBottomColor]: globalRefs$6.colors.primary.main
-			}
+			[vars$9.textColor]: globalRefs$5.colors.primary.main,
 		},
 		secondary: {
-			[vars$9.color]: globalRefs$6.colors.secondary.main,
-			_hover: {
-				[vars$9.borderBottomColor]: globalRefs$6.colors.secondary.main
-			}
+			[vars$9.textColor]: globalRefs$5.colors.secondary.main,
 		},
 		error: {
-			[vars$9.color]: globalRefs$6.colors.error.main,
-			_hover: {
-				[vars$9.borderBottomColor]: globalRefs$6.colors.error.main
-			}
+			[vars$9.textColor]: globalRefs$5.colors.error.main,
 		},
 		success: {
-			[vars$9.color]: globalRefs$6.colors.success.main,
-			_hover: {
-				[vars$9.borderBottomColor]: globalRefs$6.colors.success.main
-			}
+			[vars$9.textColor]: globalRefs$5.colors.success.main,
 		}
 	}
 };
@@ -3291,42 +3295,37 @@ class RawDivider extends createBaseClass({ componentName: componentName$a, baseS
 		super();
 
 		this.attachShadow({ mode: 'open' }).innerHTML = `
-		<style>
-			:host {
-				display: inline-block;
-			}
-			:host > div {
-				display: flex;
-				height: 100%;
-				width: 100%;
-			}
-			:host > div::before,
-			:host > div::after {
-				content: '';
-				flex-grow: 1;
-			}
-
-			descope-text {
-				flex-grow: 0;
-				flex-shrink: 0;
-				min-width: fit-content;
-			}
-
-			:host(:empty) descope-text {
-				display: none;
-			}
-
-			:host([vertical="true"]) div {
-				width: fit-content;
-			}
-
-		</style>
-		<div>
-			<descope-text>
-				<slot></slot>
-			</descope-text>
-		</div>
-	`;
+			<style>
+				:host {
+					display: inline-block;
+				}
+				:host > div {
+					display: flex;
+					height: 100%;
+					width: 100%;
+				}
+				:host > div::before,
+				:host > div::after {
+					content: '';
+					flex-grow: 1;
+				}
+				descope-text {
+					flex-grow: 0;
+					flex-shrink: 0;
+				}
+				:host(:empty) descope-text {
+					display: none;
+				}
+				:host([vertical="true"]) div {
+					width: fit-content;
+				}
+			</style>
+			<div>
+				<descope-text>
+					<slot></slot>
+				</descope-text>
+			</div>
+		`;
 
 		this.textComponent = this.shadowRoot.querySelector('descope-text');
 
@@ -3336,69 +3335,104 @@ class RawDivider extends createBaseClass({ componentName: componentName$a, baseS
 	}
 }
 
-const selectors$1 = {
-	root: { selector: '' },
+const {
+	host: host$5,
+	before,
+	after: after$1,
+	text,
+} = {
+	host: { selector: () => ':host' },
 	before: { selector: '::before' },
 	after: { selector: '::after' },
 	text: { selector: 'descope-text' },
-	host: { selector: () => ':host' },
 };
 
-const { root: root$1, before, after: after$1, text, host: host$4 } = selectors$1;
-
 const DividerClass = compose(
 	createStyleMixin({
 		mappings: {
-			maxTextWidth: { ...text, property: 'max-width' },
-			minHeight: root$1,
-			alignItems: root$1,
-			alignSelf: root$1,
-			flexDirection: root$1,
-			textPadding: { ...text, property: 'padding' },
-			width: host$4,
-			padding: host$4,
-			backgroundColor: [before, after$1],
-			opacity: [before, after$1],
-			textWidth: { ...text, property: 'width' },
-			dividerHeight: [{ ...before, property: 'height' }, { ...after$1, property: 'height' }],
-			dividerWidth: [{ ...before, property: 'width' }, { ...after$1, property: 'width' }]
+			hostWidth: { ...host$5, property: 'width' },
+			hostPadding: { ...host$5, property: 'padding' },
+
+			minHeight: {},
+			alignItems: {},
+			alignSelf: {},
+			flexDirection: {},
+
+			labelTextWidth: { ...text, property: 'width' },
+			labelTextMaxWidth: { ...text, property: 'max-width' },
+			labelTextVerticalSpacing: [
+				{ ...text, property: 'padding-top' },
+				{ ...text, property: 'padding-bottom' }
+			],
+			labelTextHorizontalSpacing: [
+				{ ...text, property: 'padding-right' },
+				{ ...text, property: 'padding-left' }
+			],
+
+			stripeColor: [
+				{ ...before, property: 'background-color' },
+				{ ...after$1, property: 'background-color' }
+			],
+			stripeHorizontalThickness: [
+				{ ...before, property: 'height' },
+				{ ...after$1, property: 'height' }
+			],
+			stripeVerticalThickness: [
+				{ ...before, property: 'width' },
+				{ ...after$1, property: 'width' }
+			],
+			stripeColorOpacity: [
+				{ ...before, property: 'opacity' },
+				{ ...after$1, property: 'opacity' }
+			],
 		},
 	}),
 	draggableMixin,
 	componentNameValidationMixin
 )(RawDivider);
 
-const globalRefs$5 = getThemeRefs(globals);
-
+const globalRefs$4 = getThemeRefs(globals);
 const compVars = DividerClass.cssVarList;
 
-const thickness = '2px';
-const textPaddingSize = '10px';
-const [helperTheme, helperRefs, helperVars] = createHelperVars({ thickness, textPaddingSize }, componentName$a);
+const [
+	helperTheme$1,
+	helperRefs$1,
+	helperVars
+] = createHelperVars({
+	thickness: '2px',
+	spacing: '10px'
+}, componentName$a);
 
 const divider = {
-	...helperTheme,
+	...helperTheme$1,
+
 	[compVars.alignItems]: 'center',
-	[compVars.dividerHeight]: helperRefs.thickness,
-	[compVars.backgroundColor]: globalRefs$5.colors.surface.main,
-	[compVars.textPadding]: `0 ${helperRefs.textPaddingSize}`,
-	[compVars.width]: '100%',
 	[compVars.flexDirection]: 'row',
-	[compVars.alignSelf]: 'strech',
-	[compVars.textWidth]: 'fit-content',
-	[compVars.maxTextWidth]: 'calc(100% - 100px)',
+	[compVars.alignSelf]: 'stretch',
+	[compVars.hostWidth]: '100%',
+	[compVars.stripeColor]: globalRefs$4.colors.surface.main,
+	[compVars.stripeColorOpacity]: '0.5',
+	[compVars.stripeHorizontalThickness]: helperRefs$1.thickness,
+	[compVars.labelTextWidth]: 'fit-content',
+	[compVars.labelTextMaxWidth]: 'calc(100% - 100px)',
+	[compVars.labelTextHorizontalSpacing]: helperRefs$1.spacing,
+
 	_vertical: {
-		[compVars.padding]: `0 calc(${thickness} * 3)`,
-		[compVars.width]: 'fit-content',
-		[compVars.textPadding]: `${helperRefs.textPaddingSize} 0`,
-		[compVars.flexDirection]: 'column',
 		[compVars.minHeight]: '200px',
-		[compVars.textWidth]: 'fit-content',
-		[compVars.dividerWidth]: helperRefs.thickness,
-		[compVars.maxTextWidth]: '100%',
+		[compVars.flexDirection]: 'column',
+		[compVars.hostWidth]: 'fit-content',
+		[compVars.hostPadding]: `0 calc(${helperRefs$1.thickness} * 3)`,
+		[compVars.stripeVerticalThickness]: helperRefs$1.thickness,
+		[compVars.labelTextWidth]: 'fit-content',
+		[compVars.labelTextMaxWidth]: '100%',
+		[compVars.labelTextVerticalSpacing]: helperRefs$1.spacing,
 	}
 };
-const vars$8 = { ...compVars, ...helperVars };
+
+const vars$8 = {
+	...compVars,
+	...helperVars
+};
 
 var divider$1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -3459,10 +3493,15 @@ const customMixin$2 = (superclass) =>
 		}
 	};
 
-const { borderStyle, borderWidth, ...restTextFieldMappings } =
-	textFieldMappings;
-
-const { digitField, label: label$2, requiredIndicator: requiredIndicator$1, internalWrapper, focusedDigitField } = {
+const {
+	host: host$4,
+	digitField,
+	label: label$3,
+	requiredIndicator: requiredIndicator$2,
+	internalWrapper,
+	focusedDigitField
+} = {
+	host: () => ':host',
 	focusedDigitField: { selector: () => `${TextFieldClass.componentName}[focused="true"]` },
 	digitField: { selector: () => TextFieldClass.componentName },
 	label: { selector: '::part(label)' },
@@ -3475,26 +3514,29 @@ const textVars$1 = TextFieldClass.cssVarList;
 const PasscodeClass = compose(
 	createStyleMixin({
 		mappings: {
-			...restTextFieldMappings,
-			borderColor: { ...digitField, property: textVars$1.borderColor },
-			outlineColor: { ...digitField, property: textVars$1.outlineColor },
-			outlineWidth: [
-				{ ...digitField, property: textVars$1.outlineWidth },
-				// we want to leave enough space to the digits outline, 
-				// ideally, this would be part of the text field
-				{ ...internalWrapper, property: 'padding' }
+			hostWidth: { property: 'width' },
+			fontFamily: host$4,
+			labelTextColor: [
+				{ ...label$3, property: 'color' },
+				{ ...requiredIndicator$2, property: 'color' },
 			],
-			color: [restTextFieldMappings.color, label$2, requiredIndicator$1],
-			padding: { ...digitField, property: textVars$1.padding },
-			margin: { ...digitField, property: textVars$1.margin },
-			textAlign: { ...digitField, property: textVars$1.textAlign },
-			caretColor: { ...digitField, property: textVars$1.caretColor },
-			digitsGap: { ...internalWrapper, property: 'gap' },
-			focusedDigitFieldOutlineColor: { ...focusedDigitField, property: textVars$1.outlineColor }
+			labelRequiredIndicator: { ...requiredIndicator$2, property: 'content' },
+			digitValueTextColor: {
+				selector: TextFieldClass.componentName,
+				property: textVars$1.inputValueTextColor
+			},
+			digitPadding: { ...digitField, property: textVars$1.inputPadding },
+			digitTextAlign: { ...digitField, property: textVars$1.inputTextAlign },
+			digitCaretTextColor: { ...digitField, property: textVars$1.inputCaretTextColor },
+			digitSpacing: { ...internalWrapper, property: 'gap' },
+			digitOutlineColor: { ...digitField, property: textVars$1.inputOutlineColor },
+			digitOutlineWidth: { ...digitField, property: textVars$1.inputOutlineWidth },
+
+			focusedDigitFieldOutlineColor: { ...focusedDigitField, property: textVars$1.inputOutlineColor }
 		},
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin,
 	customMixin$2
 )(
@@ -3503,11 +3545,11 @@ const PasscodeClass = compose(
 		wrappedEleName: 'vaadin-text-field',
 		style: () => `
 			:host {
-				--vaadin-field-default-width: auto;
 				display: inline-block;
 				max-width: 100%;
 				min-width: calc(var(--passcode-digits-count) * 2em);
 			}
+			${resetInputFieldDefaultWidth()}
 			:host::after {
 				background-color: transparent;
 			}
@@ -3532,7 +3574,7 @@ const PasscodeClass = compose(
 
 			descope-passcode-internal descope-text-field {
 				min-width: 2em;
-				max-width: var(${textVars$1.height});
+				max-width: var(${textVars$1.inputHeight});
 			}
 
 			vaadin-text-field::part(input-field) {
@@ -3556,57 +3598,44 @@ const PasscodeClass = compose(
 				opacity: 1;
 			}
 
-			vaadin-text-field::part(input-field):focus {
-				cursor: text;
-			}
-
-			vaadin-text-field[required]::part(required-indicator)::after {
-				content: "*";
-			}
 			vaadin-text-field[readonly]::part(input-field)::after {
 				border: 0 solid;
 			}
+
+			vaadin-text-field::part(input-field) {
+				box-shadow: none;
+			}
+
+			${resetInputCursor('vaadin-text-field')}
     	`,
 		excludeAttrsSync: ['tabindex'],
 		componentName: componentName$8
 	})
 );
 
+const globalRefs$3 = getThemeRefs(globals);
 const vars$7 = PasscodeClass.cssVarList;
-const globalRefs$4 = getThemeRefs(globals);
 
 const passcode = {
-	[vars$7.backgroundColor]: globalRefs$4.colors.surface.light,
-	[vars$7.outlineWidth]: '2px',
-	[vars$7.outlineColor]: 'transparent',
-	[vars$7.padding]: '0',
-	[vars$7.textAlign]: 'center',
-	[vars$7.borderColor]: 'transparent',
-	[vars$7.digitsGap]: '0',
-	[vars$7.focusedDigitFieldOutlineColor]: globalRefs$4.colors.surface.main,
-	[vars$7.color]: globalRefs$4.colors.surface.contrast,
+	[vars$7.fontFamily]: refs.fontFamily,
+	[vars$7.labelTextColor]: refs.labelTextColor,
+	[vars$7.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$7.digitValueTextColor]: refs.valueTextColor,
+	[vars$7.digitPadding]: '0',
+	[vars$7.digitTextAlign]: 'center',
+	[vars$7.digitSpacing]: '0',
+	[vars$7.hostWidth]: refs.width,
+	[vars$7.digitOutlineColor]: 'transparent',
+	[vars$7.digitOutlineWidth]: '2px',
+	[vars$7.focusedDigitFieldOutlineColor]: globalRefs$3.colors.surface.main,
 
 	_hideCursor: {
-		[vars$7.caretColor]: 'transparent',
-	},
-
-	_disabled: {
-		[vars$7.backgroundColor]: globalRefs$4.colors.surface.main
-	},
-
-	_fullWidth: {
-		[vars$7.width]: '100%'
-	},
-
-	_bordered: {
-		[vars$7.borderColor]: globalRefs$4.colors.surface.main
+		[vars$7.digitCaretTextColor]: 'transparent',
 	},
 
 	_invalid: {
-		[vars$7.borderColor]: globalRefs$4.colors.error.main,
-		[vars$7.color]: globalRefs$4.colors.error.main,
-		[vars$7.focusedDigitFieldOutlineColor]: globalRefs$4.colors.error.light,
-	},
+		[vars$7.focusedDigitFieldOutlineColor]: globalRefs$3.colors.error.light,
+	}
 };
 
 var passcode$1 = /*#__PURE__*/Object.freeze({
@@ -3640,7 +3669,6 @@ class RawLoaderLinear extends createBaseClass({ componentName: componentName$7,
 				position: absolute;
 				left: 0;
 			}
-
 			:host > div {
 				width: 100%;
 			}
@@ -3651,73 +3679,73 @@ class RawLoaderLinear extends createBaseClass({ componentName: componentName$7,
 }
 
 const selectors = {
-	root: {},
 	after: { selector: '::after' },
 	host: { selector: () => ':host' }
 };
 
-const { root, after, host: host$3 } = selectors;
+const { after, host: host$3 } = selectors;
 
 const LoaderLinearClass = compose(
 	createStyleMixin({
 		mappings: {
-			display: root,
-			width: host$3,
-			height: [root, after],
-			borderRadius: [root, after],
-			surfaceColor: [{ property: 'background-color' }],
-			barColor: [{ ...after, property: 'background-color' }],
+			hostDisplay: {},
+			hostWidth: { ...host$3, property: 'width' },
+			barHeight: [
+				{ property: 'height' },
+				{ ...after, property: 'height' }
+			],
+			barBorderRadius: [
+				{ property: 'border-radius' },
+				{ ...after, property: 'border-radius' }
+			],
+			barBackgroundColor: { property: 'background-color' },
+			barColor: { ...after, property: 'background-color' },
 			barWidth: { ...after, property: 'width' },
-			animationDuration: [root, after],
-			animationTimingFunction: [root, after],
-			animationIterationCount: [root, after]
+			animationDuration: [{}, after],
+			animationTimingFunction: [{}, after],
+			animationIterationCount: [{}, after]
 		}
 	}),
 	draggableMixin,
 	componentNameValidationMixin
 )(RawLoaderLinear);
 
-const globalRefs$3 = getThemeRefs(globals);
-
+const globalRefs$2 = getThemeRefs(globals);
 const vars$6 = LoaderLinearClass.cssVarList;
 
 const loaderLinear = {
-	[vars$6.display]: 'inline-block',
-	[vars$6.barColor]: globalRefs$3.colors.surface.contrast,
+	[vars$6.hostDisplay]: 'inline-block',
+	[vars$6.hostWidth]: '100%',
+
+	[vars$6.barColor]: globalRefs$2.colors.surface.contrast,
 	[vars$6.barWidth]: '20%',
-	[vars$6.surfaceColor]: globalRefs$3.colors.surface.main,
-	[vars$6.borderRadius]: '4px',
+
+	[vars$6.barBackgroundColor]: globalRefs$2.colors.surface.main,
+	[vars$6.barBorderRadius]: '4px',
+
 	[vars$6.animationDuration]: '2s',
 	[vars$6.animationTimingFunction]: 'linear',
 	[vars$6.animationIterationCount]: 'infinite',
-	[vars$6.width]: '100%',
+
 	size: {
-		xs: {
-			[vars$6.height]: '6px'
-		},
-		sm: {
-			[vars$6.height]: '8px'
-		},
-		md: {
-			[vars$6.height]: '10px'
-		},
-		lg: {
-			[vars$6.height]: '12px'
-		},
-		xl: {
-			[vars$6.height]: '14px'
-		}
+		xs: { [vars$6.barHeight]: '8px' },
+		sm: { [vars$6.barHeight]: '10px' },
+		md: { [vars$6.barHeight]: '14px' },
+		lg: { [vars$6.barHeight]: '20px' },
+		xl: { [vars$6.barHeight]: '25px' }
 	},
+
 	mode: {
 		primary: {
-			[vars$6.barColor]: globalRefs$3.colors.primary.main
+			[vars$6.barColor]: globalRefs$2.colors.primary.main
 		},
 		secondary: {
-			[vars$6.barColor]: globalRefs$3.colors.secondary.main
+			[vars$6.barColor]: globalRefs$2.colors.secondary.main
 		}
 	},
+
 	_hidden: {
-		[vars$6.display]: 'none'
+		[vars$6.hostDisplay]: 'none'
 	}
 };
 
@@ -3755,17 +3783,18 @@ class RawLoaderRadial extends createBaseClass({ componentName: componentName$6,
 const LoaderRadialClass = compose(
 	createStyleMixin({
 		mappings: {
-			display: {},
-			width: {},
-			height: {},
-			spinnerWidth: { property: 'border-width' },
-			spinnerStyle: { property: 'border-style' },
-			spinnerRadius: { property: 'border-radius' },
-			spinnerTopColor: { property: 'border-top-color' },
-			spinnerBottomColor: { property: 'border-bottom-color' },
-			spinnerRightColor: { property: 'border-right-color' },
-			spinnerLeftColor: { property: 'border-left-color' },
-			color: {},
+			hostDisplay: { property: 'display' },
+			spinnerSize: [
+				{ property: 'width' },
+				{ property: 'height' }
+			],
+			spinnerBorderWidth: { property: 'border-width' },
+			spinnerBorderStyle: { property: 'border-style' },
+			spinnerBorderRadius: { property: 'border-radius' },
+			spinnerQuadrant1Color: { property: 'border-top-color' },
+			spinnerQuadrant2Color: { property: 'border-bottom-color' },
+			spinnerQuadrant3Color: { property: 'border-right-color' },
+			spinnerQuadrant4Color: { property: 'border-left-color' },
 			animationDuration: {},
 			animationTimingFunction: {},
 			animationIterationCount: {}
@@ -3775,60 +3804,45 @@ const LoaderRadialClass = compose(
 	componentNameValidationMixin
 )(RawLoaderRadial);
 
-const globalRefs$2 = getThemeRefs(globals);
-
+const globalRefs$1 = getThemeRefs(globals);
 const vars$5 = LoaderRadialClass.cssVarList;
 
-const loaderRadial = {
-	[vars$5.display]: 'inline-block',
-	[vars$5.color]: globalRefs$2.colors.surface.contrast,
-	[vars$5.animationDuration]: '2s',
-	[vars$5.animationTimingFunction]: 'linear',
-	[vars$5.animationIterationCount]: 'infinite',
-	[vars$5.spinnerStyle]: 'solid',
-	[vars$5.spinnerWidth]: '4px',
-	[vars$5.spinnerRadius]: '50%',
-	[vars$5.spinnerTopColor]: 'currentColor',
-	[vars$5.spinnerBottomColor]: 'transparent',
-	[vars$5.spinnerRightColor]: 'currentColor',
-	[vars$5.spinnerLeftColor]: 'transparent',
-	size: {
-		xs: {
-			[vars$5.width]: '20px',
-			[vars$5.height]: '20px',
-			[vars$5.spinnerWidth]: '2px'
-		},
-		sm: {
-			[vars$5.width]: '30px',
-			[vars$5.height]: '30px',
-			[vars$5.spinnerWidth]: '3px'
-		},
-		md: {
-			[vars$5.width]: '40px',
-			[vars$5.height]: '40px',
-			[vars$5.spinnerWidth]: '4px'
-		},
-		lg: {
-			[vars$5.width]: '60px',
-			[vars$5.height]: '60px',
-			[vars$5.spinnerWidth]: '5px'
-		},
-		xl: {
-			[vars$5.width]: '80px',
-			[vars$5.height]: '80px',
-			[vars$5.spinnerWidth]: '6px'
-		}
-	},
+const [helperTheme, helperRefs] = createHelperVars({
+	spinnerColor: globalRefs$1.colors.surface.contrast,
 	mode: {
 		primary: {
-			[vars$5.color]: globalRefs$2.colors.primary.main
+			spinnerColor: globalRefs$1.colors.primary.main
 		},
 		secondary: {
-			[vars$5.color]: globalRefs$2.colors.secondary.main
+			spinnerColor: globalRefs$1.colors.secondary.main
 		}
+	}
+}, componentName$6);
+
+const loaderRadial = {
+	...helperTheme,
+
+	[vars$5.animationDuration]: '2s',
+	[vars$5.animationTimingFunction]: 'linear',
+	[vars$5.animationIterationCount]: 'infinite',
+	[vars$5.spinnerBorderStyle]: 'solid',
+	[vars$5.spinnerBorderWidth]: '0.2em',
+	[vars$5.spinnerBorderRadius]: '50%',
+	[vars$5.spinnerQuadrant1Color]: helperRefs.spinnerColor,
+	[vars$5.spinnerQuadrant2Color]: 'transparent',
+	[vars$5.spinnerQuadrant3Color]: helperRefs.spinnerColor,
+	[vars$5.spinnerQuadrant4Color]: 'transparent',
+
+	size: {
+		xs: { [vars$5.spinnerSize]: '20px' },
+		sm: { [vars$5.spinnerSize]: '30px' },
+		md: { [vars$5.spinnerSize]: '40px' },
+		lg: { [vars$5.spinnerSize]: '60px' },
+		xl: { [vars$5.spinnerSize]: '80px' }
 	},
+
 	_hidden: {
-		[vars$5.display]: 'none'
+		[vars$5.hostDisplay]: 'none'
 	}
 };
 
@@ -3840,7 +3854,6 @@ var loaderRadial$1 = /*#__PURE__*/Object.freeze({
 
 const componentName$5 = getComponentName('combo-box');
 
-
 const ComboBoxMixin = (superclass) => class ComboBoxMixinClass extends superclass {
 	constructor() {
 		super();
@@ -3893,16 +3906,22 @@ const ComboBoxMixin = (superclass) => class ComboBoxMixinClass extends superclas
 
 const {
 	host: host$2,
-	input,
+	inputField: inputField$1,
 	placeholder,
 	toggle,
-	label: label$1
+	label: label$2,
+	requiredIndicator: requiredIndicator$1,
+	helperText: helperText$2,
+	errorMessage: errorMessage$2
 } = {
 	host: { selector: () => ':host' },
-	input: { selector: '::part(input-field)' },
+	inputField: { selector: '::part(input-field)' },
 	placeholder: { selector: '> input:placeholder-shown' },
 	toggle: { selector: '::part(toggle-button)' },
-	label: { selector: '::part(label)' }
+	label: { selector: '::part(label)' },
+	requiredIndicator: { selector: '[required]::part(required-indicator)::after' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' }
 };
 
 // const { slotted, selected } = {
@@ -3913,27 +3932,38 @@ const {
 const ComboBoxClass = compose(
 	createStyleMixin({
 		mappings: {
-			width: host$2,
-			height: input,
-			padding: input,
-
-			inputBackgroundColor: { ...input, property: 'background-color' },
-			boxShadow: input,
-
-			borderColor: input,
-			borderWidth: input,
-			borderStyle: input,
-			borderRadius: input,
-
-			color: [label$1, input],
-
+			hostWidth: { ...host$2, property: 'width' },
 			// we apply font-size also on the host so we can set its width with em
-			fontSize: [{}, host$2],
-
-			placeholderColor: { ...placeholder, property: 'color' },
-
-			toggleCursor: { ...toggle, property: 'cursor' },
-			toggleColor: { ...toggle, property: 'color' },
+			fontSize: [
+				{ property: 'font-size' },
+				{ ...host$2, property: 'font-size' }
+			],
+			fontFamily: [
+				label$2,
+				placeholder,
+				inputField$1,
+				helperText$2,
+				errorMessage$2
+			],
+			labelTextColor: [
+				{ ...label$2, property: 'color' },
+				{ ...requiredIndicator$1, property: 'color' }
+			],
+			inputHeight: { ...inputField$1, property: 'height' },
+			inputBackgroundColor: { ...inputField$1, property: 'background-color' },
+			inputBorderColor: { ...inputField$1, property: 'border-color' },
+			inputBorderWidth: { ...inputField$1, property: 'border-width' },
+			inputBorderStyle: { ...inputField$1, property: 'border-style' },
+			inputBorderRadius: { ...inputField$1, property: 'border-radius' },
+			labelRequiredIndicator: { ...requiredIndicator$1, property: 'content' },
+			inputValueTextColor: { ...inputField$1, property: 'color' },
+			inputPlaceholderTextColor: { ...placeholder, property: 'color' },
+			inputDropdownButtonCursor: { ...toggle, property: 'cursor' },
+			inputDropdownButtonColor: { ...toggle, property: 'color' },
+			inputOutlineColor: { ...inputField$1, property: 'outline-color' },
+			inputOutlineWidth: { ...inputField$1, property: 'outline-width' },
+			inputOutlineStyle: { ...inputField$1, property: 'outline-style' },
+			inputOutlineOffset: { ...inputField$1, property: 'outline-offset' },
 
 			// we need to use the variables from the portal mixin
 			// so we need to use an arrow function on the selector
@@ -3957,7 +3987,7 @@ const ComboBoxClass = compose(
 			attributes: ['size']
 		},
 	}),
-	proxyInputMixin,
+	composedProxyInputMixin,
 	componentNameValidationMixin,
 	ComboBoxMixin
 )(
@@ -3969,28 +3999,24 @@ const ComboBoxClass = compose(
 			display: inline-flex;
 			box-sizing: border-box;
 			-webkit-mask-image: none;
+			padding: calc(var(${ComboBoxClass.cssVarList.inputOutlineWidth}) + var(${ComboBoxClass.cssVarList.inputOutlineOffset}))
 		}
 		vaadin-combo-box {
 			padding: 0;
+			width: 100%;
 		}
 		vaadin-combo-box [slot="input"] {
 			-webkit-mask-image: none;
 			min-height: 0;
 		}
+
 		vaadin-combo-box::part(input-field) {
-			-webkit-mask-image: none;
-			border-radius: 0;
 			padding: 0;
 		}
-		vaadin-combo-box::part(input-field)::after {
-			opacity: 0;
-		}
-		vaadin-combo-box[readonly]::part(input-field)::after {
-			border: none;
-		}
-		vaadin-combo-box[readonly] > input:placeholder-shown {
-			opacity: 1;
-		}		
+
+		${resetInputReadonlyStyle('vaadin-combo-box')}
+		${resetInputPlaceholder('vaadin-combo-box')}
+		${resetInputCursor('vaadin-combo-box')}
 		`,
 		// Note: we exclude `size` to avoid overriding Vaadin's ComboBox property
 		// with the same name. Including it will cause Vaadin to calculate NaN size,
@@ -4002,51 +4028,38 @@ const ComboBoxClass = compose(
 	})
 );
 
-const globalRefs$1 = getThemeRefs(globals);
-
+const globalRefs = getThemeRefs(globals);
 const vars$4 = ComboBoxClass.cssVarList;
 
 const comboBox = {
-	[vars$4.borderColor]: globalRefs$1.colors.surface.main,
-	[vars$4.borderWidth]: '1px',
-	[vars$4.borderStyle]: 'solid',
-	[vars$4.cursor]: 'pointer',
-	[vars$4.padding]: '0',
-	[vars$4.placeholderColor]: globalRefs$1.colors.surface.main,
-	[vars$4.toggleColor]: globalRefs$1.colors.surface.contrast,
-	[vars$4.toggleCursor]: 'pointer',
-	[vars$4.inputBackgroundColor]: globalRefs$1.colors.surface.light,
-	[vars$4.padding]: `0 ${globalRefs$1.spacing.xs}`,
-
-	[vars$4.height]: '2em',
-
-	size: {
-		xs: {
-			[vars$4.fontSize]: '8px',
-		},
-		sm: {
-			[vars$4.fontSize]: '10px',
-		},
-		md: {
-			[vars$4.fontSize]: '14px',
-		},
-		lg: {
-			[vars$4.fontSize]: '20px',
-		},
-		xl: {
-			[vars$4.fontSize]: '25px',
-		}
-	},
+	[vars$4.hostWidth]: refs.width,
+	[vars$4.fontSize]: refs.fontSize,
+	[vars$4.fontFamily]: refs.fontFamily,
+	[vars$4.labelTextColor]: refs.labelTextColor,
+	[vars$4.inputBorderColor]: refs.borderColor,
+	[vars$4.inputBorderWidth]: refs.borderWidth,
+	[vars$4.inputBorderStyle]: refs.borderStyle,
+	[vars$4.inputBorderRadius]: refs.borderRadius,
+	[vars$4.inputOutlineColor]: refs.outlineColor,
+	[vars$4.inputOutlineOffset]: refs.outlineOffset,
+	[vars$4.inputOutlineWidth]: refs.outlineWidth,
+	[vars$4.inputOutlineStyle]: refs.outlineStyle,
+	[vars$4.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$4.inputValueTextColor]: refs.valueTextColor,
+	[vars$4.inputPlaceholderTextColor]: refs.placeholderTextColor,
+	[vars$4.inputBackgroundColor]: refs.backgroundColor,
+	[vars$4.inputHeight]: refs.inputHeight,
+	[vars$4.inputDropdownButtonColor]: globalRefs.colors.surface.contrast,
+	[vars$4.inputDropdownButtonCursor]: 'pointer',
 
 	_readonly: {
-		[vars$4.toggleCursor]: 'default',
+		[vars$4.inputDropdownButtonCursor]: 'default'
 	},
 
 	_invalid: {
-		[vars$4.borderColor]: globalRefs$1.colors.error.main,
-		[vars$4.placeholderColor]: globalRefs$1.colors.error.light,
-		[vars$4.toggleColor]: globalRefs$1.colors.error.main,
+		[vars$4.inputDropdownButtonColor]: globalRefs.colors.error.main
 	},
+
 	// [vars.overlayCursor]: 'pointer',
 	// [vars.overlayBackground]: globalRefs.colors.surface.light,
 	// [vars.overlayBorder]: `2px solid red`,
@@ -5378,27 +5391,32 @@ const customMixin$1 = (superclass) =>
 
 const {
 	host: host$1,
-	inputWrapper,
+	label: label$1,
+	requiredIndicator,
+	inputField,
 	countryCodeInput,
 	phoneInput,
-	label,
-	requiredIndicator,
-	separator
+	separator,
+	errorMessage: errorMessage$1,
+	helperText: helperText$1
 } = {
 	host: { selector: () => ':host' },
-	inputWrapper: { selector: '::part(input-field)' },
-	phoneInput: { selector: () => 'descope-text-field' },
-	countryCodeInput: { selector: () => 'descope-combo-box' },
 	label: { selector: '::part(label)' },
 	requiredIndicator: { selector: '[required]::part(required-indicator)::after' },
-	separator: { selector: 'descope-phone-field-internal .separator' }
+	inputField: { selector: '::part(input-field)' },
+	phoneInput: { selector: () => 'descope-text-field' },
+	countryCodeInput: { selector: () => 'descope-combo-box' },
+	separator: { selector: 'descope-phone-field-internal .separator' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' }
 };
 
 const PhoneFieldClass = compose(
 	createStyleMixin({
 		mappings: {
 			fontSize: [
-				host$1, inputWrapper,
+				{ ...host$1, property: 'font-size' },
+				{ ...inputField, property: 'font-size' },
 				{
 					selector: TextFieldClass.componentName,
 					property: TextFieldClass.cssVarList.fontSize
@@ -5408,57 +5426,66 @@ const PhoneFieldClass = compose(
 					property: ComboBoxClass.cssVarList.fontSize
 				}
 			],
+			fontFamily: [
+				label$1,
+				errorMessage$1,
+				helperText$1
+			],
+			hostWidth: [
+				{ ...host$1, property: 'width' },
+				{ ...phoneInput, property: 'width' },
+				{ ...countryCodeInput, property: '--vaadin-combo-box-overlay-width' }
+			],
 
-			componentWidth: { ...host$1, property: 'width' },
-
-			wrapperBorderStyle: [
-				{ ...inputWrapper, property: 'border-style' },
+			inputBorderStyle: [
+				{ ...inputField, property: 'border-style' },
 				{ ...separator, property: 'border-left-style' }
 			],
-			wrapperBorderWidth: [
-				{ ...inputWrapper, property: 'border-width' },
+			inputBorderWidth: [
+				{ ...inputField, property: 'border-width' },
 				{ ...separator, property: 'border-left-width' }
 			],
-			wrapperBorderColor: [
-				{ ...inputWrapper, property: 'border-color' },
+			inputBorderColor: [
+				{ ...inputField, property: 'border-color' },
 				{ ...separator, property: 'border-left-color' }
 			],
-			wrapperBorderRadius: { ...inputWrapper, property: 'border-radius' },
+			inputBorderRadius: { ...inputField, property: 'border-radius' },
 
-			inputHeight: { ...inputWrapper, property: 'height' },
+			inputHeight: { ...inputField, property: 'height' },
 
-			countryCodeInputWidth: { ...countryCodeInput, property: comboVars.width },
+			countryCodeInputWidth: { ...countryCodeInput, property: comboVars.hostWidth },
 			countryCodeDropdownWidth: {
 				...countryCodeInput,
 				property: '--vaadin-combo-box-overlay-width'
 			},
-
 			phoneInputWidth: { ...phoneInput, property: 'width' },
 
-			color: [
-				label,
-				requiredIndicator,
-				{ ...phoneInput, property: textVars.color },
-				{ ...countryCodeInput, property: comboVars.color }
+			labelTextColor: [
+				{ ...label$1, property: 'color' },
+				{ ...requiredIndicator, property: 'color' },
 			],
+			labelRequiredIndicator: { ...requiredIndicator, property: 'content' },
 
-			placeholderColor: {
-				...phoneInput,
-				property: textVars.placeholderColor
-			},
+			inputValueTextColor: [
+				{ ...phoneInput, property: textVars.inputValueTextColor },
+				{ ...countryCodeInput, property: comboVars.inputValueTextColor }
+			],
+
+			inputPlaceholderTextColor: { ...phoneInput, property: textVars.inputPlaceholderColor },
 
 			overlayItemBackgroundColor: {
 				selector: 'descope-combo-box',
 				property: comboVars.overlayItemBackgroundColor
 			},
 
-			outlineStyle: inputWrapper,
-			outlineWidth: [inputWrapper, { property: 'padding' }],
-			outlineColor: inputWrapper,
+			inputOutlineStyle: { ...inputField, property: 'outline-style' },
+			inputOutlineColor: { ...inputField, property: 'outline-color' },
+			inputOutlineWidth: { ...inputField, property: 'outline-width' },
+			inputOutlineOffset: { ...inputField, property: 'outline-offset' },
 		},
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	customMixin$1,
 )(
 	createProxy({
@@ -5466,10 +5493,11 @@ const PhoneFieldClass = compose(
 		wrappedEleName: 'vaadin-text-field',
 		style: () => `
 			:host {
-				--vaadin-field-default-width: auto;
 				display: inline-block;
 				max-width: 100%;
 				min-width: 15em;
+				box-sizing: border-box;
+				padding: calc(var(${PhoneFieldClass.cssVarList.inputOutlineWidth}) + var(${PhoneFieldClass.cssVarList.inputOutlineOffset}))
 			}
 			div {
 				display: inline-flex;
@@ -5478,6 +5506,7 @@ const PhoneFieldClass = compose(
 				width: 100%;
 				height: 100%;
 				box-sizing: border-box;
+				padding: 0;
 			}
 			vaadin-text-field[focus-ring]::part(input-field) {
 				box-shadow: none;
@@ -5509,18 +5538,18 @@ const PhoneFieldClass = compose(
 			descope-combo-box {
 				flex-shrink: 0;
 				height: 100%;
-				${comboVars.borderWidth}: 0;
+				${comboVars.inputOutlineWidth}: 0;
+				${comboVars.inputOutlineOffset}: 0;
+				${comboVars.inputBorderWidth}: 0;
+				${comboVars.inputBorderRadius}: 0;
 			}
 			descope-text-field {
 				flex-grow: 1;
 				min-height: 0;
 				height: 100%;
-				${textVars.outlineWidth}: 0;
-				${textVars.borderWidth}: 0;
-				${textVars.borderRadius}: 0;
-			}
-			vaadin-text-field[required]::part(required-indicator)::after {
-				content: "*";
+				${textVars.inputOutlineWidth}: 0;
+				${textVars.inputBorderWidth}: 0;
+				${textVars.inputBorderRadius}: 0;
 			}
 			vaadin-text-field[readonly] > input:placeholder-shown {
 				opacity: 1;
@@ -5528,71 +5557,37 @@ const PhoneFieldClass = compose(
 			vaadin-text-field::part(input-field)::after {
 				border: none;
 			}
+
+			${resetInputFieldDefaultWidth()}
+			${resetInputCursor('vaadin-text-field')}
 		`,
 		excludeAttrsSync: ['tabindex'],
 		componentName: componentName$2
 	})
 );
 
-const globalRefs = getThemeRefs(globals);
 const vars$2 = PhoneFieldClass.cssVarList;
 
 const phoneField = {
-	[vars$2.wrapperBorderStyle]: 'solid',
-	[vars$2.wrapperBorderWidth]: '1px',
-	[vars$2.wrapperBorderColor]: 'transparent',
-	[vars$2.wrapperBorderRadius]: globalRefs.radius.xs,
-	[vars$2.placeholderColor]: globalRefs.colors.surface.main,
-	[vars$2.color]: globalRefs.colors.surface.contrast,
-
+	[vars$2.hostWidth]: refs.width,
+	[vars$2.fontSize]: refs.fontSize,
+	[vars$2.fontFamily]: refs.fontFamily,
+	[vars$2.labelTextColor]: refs.labelTextColor,
+	[vars$2.labelRequiredIndicator]: refs.requiredIndicator,
+	[vars$2.inputValueTextColor]: refs.valueTextColor,
+	[vars$2.inputPlaceholderTextColor]: refs.placeholderTextColor,
+	[vars$2.inputBorderStyle]: refs.borderStyle,
+	[vars$2.inputBorderWidth]: refs.borderWidth,
+	[vars$2.inputBorderColor]: refs.borderColor,
+	[vars$2.inputBorderRadius]: refs.borderRadius,
+	[vars$2.inputOutlineStyle]: refs.outlineStyle,
+	[vars$2.inputOutlineWidth]: refs.outlineWidth,
+	[vars$2.inputOutlineColor]: refs.outlineColor,
+	[vars$2.inputOutlineOffset]: refs.outlineOffset,
+	[vars$2.inputHeight]: refs.inputHeight,
 	[vars$2.phoneInputWidth]: '10em',
 	[vars$2.countryCodeInputWidth]: '5em',
-
-	[vars$2.inputHeight]: '2em',
-	[vars$2.countryCodeDropdownWidth]: '12em',
-
-	size: {
-		xs: {
-			[vars$2.fontSize]: '8px',
-		},
-		sm: {
-			[vars$2.fontSize]: '20px',
-		},
-		md: {
-			[vars$2.fontSize]: '14px',
-		},
-		lg: {
-			[vars$2.fontSize]: '20px',
-		},
-		xl: {
-			[vars$2.fontSize]: '25px',
-		}
-	},
-
-	_fullWidth: {
-		[vars$2.componentWidth]: '100%',
-		[vars$2.phoneInputWidth]: '100%',
-		[vars$2.countryCodeDropdownWidth]: '100%',
-	},
-
-	_bordered: {
-		[vars$2.wrapperBorderColor]: globalRefs.colors.surface.main
-	},
-
-	[vars$2.outlineStyle]: 'solid',
-	[vars$2.outlineWidth]: '0.1em',
-	[vars$2.outlineColor]: 'transparent',
-
-	_focused: {
-		[vars$2.outlineColor]: globalRefs.colors.surface.main
-	},
-
-	_invalid: {
-		[vars$2.outlineColor]: globalRefs.colors.error.light,
-		[vars$2.color]: globalRefs.colors.error.main,
-		[vars$2.placeholderColor]: globalRefs.colors.error.light,
-		[vars$2.wrapperBorderColor]: globalRefs.colors.error.main
-	},
+	[vars$2.countryCodeDropdownWidth]: '20em',
 
 	// '@overlay': {
 	// 	overlayItemBackgroundColor: 'red'
@@ -5651,9 +5646,18 @@ const customMixin = (superclass) =>
 		}
 	};
 
-const { host, internalInputsWrapper } = {
+const {
+	host,
+	label,
+	internalInputsWrapper,
+	errorMessage,
+	helperText
+} = {
 	host: { selector: () => ':host' },
-	internalInputsWrapper: { selector: 'descope-new-password-internal .wrapper' }
+	label: { selector: '::part(label)' },
+	internalInputsWrapper: { selector: 'descope-new-password-internal .wrapper' },
+	helperText: { selector: '::part(helper-text)' },
+	errorMessage: { selector: '::part(error-message)' }
 };
 
 const NewPasswordClass = compose(
@@ -5666,99 +5670,87 @@ const NewPasswordClass = compose(
 					property: PasswordFieldClass.cssVarList.fontSize
 				}
 			],
-			componentWidth: { ...host, property: 'width' },
-			requiredContent: { ...host, property: 'content' },
-			inputsGap: { ...internalInputsWrapper, property: 'gap' },
+			fontFamily: [
+				label,
+				errorMessage,
+				helperText
+			],
+			hostWidth: { ...host, property: 'width' },
+			inputsRequiredIndicator: { ...host, property: 'content' },
+			spaceBetweenInputs: { ...internalInputsWrapper, property: 'gap' },
 		}
 	}),
 	draggableMixin,
-	proxyInputMixin,
+	composedProxyInputMixin,
 	customMixin,
 )(
 	createProxy({
 		slots: [],
 		wrappedEleName: 'vaadin-text-field',
-		style: () => overrides,
+		style: () => `
+		:host {
+			display: inline-block;
+			max-width: 100%;
+			min-width: 10em;
+			box-sizing: border-box;
+		}
+		${resetInputFieldDefaultWidth()}
+		vaadin-text-field {
+			padding: 0;
+			width: 100%;
+			height: 100%;
+		}
+		vaadin-text-field::part(input-field) {
+			min-height: 0;
+			background: transparent;
+			overflow: hidden;
+			box-shadow: none;
+			padding: 0;
+		}
+		vaadin-text-field::part(input-field)::after {
+			background: transparent;
+			opacity: 0;
+		}
+		descope-new-password-internal {
+			-webkit-mask-image: none;
+			min-height: 0;
+			width: 100%;
+			height: 100%;
+			padding: 0;
+		}
+		descope-new-password-internal > .wrapper {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			   flex-direction: column;
+		}
+		descope-password-field {
+			display: block;
+			width: 100%;
+		}
+		descope-new-password-internal vaadin-password-field::before {
+			height: initial;
+		},
+		`,
 		excludeAttrsSync: ['tabindex'],
 		componentName
 	})
 );
 
-const overrides = `
-	:host {
-		--vaadin-field-default-width: auto;
-		display: inline-block;
-		min-width: 10em;
-		max-width: 100%;
-	}
-	vaadin-text-field {
-		padding: 0;
-		width: 100%;
-		height: 100%;
-	}
-	vaadin-text-field::part(input-field) {
-		min-height: 0;
-		background: transparent;
-		overflow: hidden;
-		box-shadow: none;
-		padding: 0;
-	}
-	vaadin-text-field::part(input-field)::after {
-		background: transparent;
-		opacity: 0;
-	}
-	descope-new-password-internal {
-		-webkit-mask-image: none;
-		min-height: 0;
-		width: 100%;
-		height: 100%;
-		padding: 0;
-	}
-	descope-new-password-internal > .wrapper {
-		width: 100%;
-		height: 100%;
-		display: flex;
-   		flex-direction: column;
-	}
-	descope-password-field {
-		display: block;
-		width: 100%;
-	}
-	descope-new-password-internal vaadin-password-field::before {
-		height: initial;
-	}
-`;
-
 const vars$1 = NewPasswordClass.cssVarList;
 
 const newPassword = {
-	[vars$1.inputsGap]: '1em',
+	[vars$1.hostWidth]: refs.width,
+	[vars$1.fontSize]: refs.fontSize,
+	[vars$1.fontFamily]: refs.fontFamily,
+	[vars$1.spaceBetweenInputs]: '1em',
 
 	_required: {
-		[vars$1.requiredContent]: "'*'",
-	},
-
-	_fullWidth: {
-		[vars$1.componentWidth]: '100%'
-	},
-
-	size: {
-		xs: {
-			[vars$1.fontSize]: '8px',
-		},
-		sm: {
-			[vars$1.fontSize]: '10px',
-		},
-		md: {
-			[vars$1.fontSize]: '14px',
-		},
-		lg: {
-			[vars$1.fontSize]: '20px',
-		},
-		xl: {
-			[vars$1.fontSize]: '25px',
-		}
-	},
+		// NewPassword doesn't pass `required` attribute to its PasswordFields.
+		// That's why we fake the required indicator on each input.
+		// We do that by injecting `::after` element, and populating it with requiredIndicator content.
+		[vars$1.inputsRequiredIndicator]: refs.requiredIndicator, // used to populate required content for NewPassword input fields outside the theme
+	}
 };
 
 var newPassword$1 = /*#__PURE__*/Object.freeze({
@@ -5769,7 +5761,7 @@ var newPassword$1 = /*#__PURE__*/Object.freeze({
 
 const components = {
 	button: button$1,
-	textField: textField$2,
+	textField: textField$1,
 	passwordField: passwordField$1,
 	numberField: numberField$1,
 	emailField: emailField$1,
@@ -5788,14 +5780,14 @@ const components = {
 	image: image$1,
 	phoneField: phoneField$1,
 	newPassword: newPassword$1,
+	inputWrapper,
 };
 
-
 const theme = Object.keys(components).reduce((acc, comp) => ({ ...acc, [comp]: components[comp].default }), {});
 const vars = Object.keys(components).reduce((acc, comp) => ({ ...acc, [comp]: components[comp].vars }), {});
 
 const defaultTheme = { globals, components: theme };
-const themeVars = { globals: vars$l, components: vars };
+const themeVars = { globals: vars$m, components: vars };
 
 exports.ButtonClass = ButtonClass;
 exports.CheckboxClass = CheckboxClass;