@oslokommune/punkt-elements 18.9.1 → 18.9.5

package/dist/{fileupload-C5lxuood.js → fileupload-BpkvNlxN.js}

@@ -1077,7 +1077,7 @@ var M = "comments", N = (e) => {
 	}
 	render() {
 		let t = this.renderContent();
-		return this.label ? e`
+		return e`
       <pkt-input-wrapper
         .strings=${this.strings}
         .forId=${`${this.id}-input`}
@@ -1099,10 +1099,10 @@ var M = "comments", N = (e) => {
       >
         ${t}
       </pkt-input-wrapper>
-    ` : t;
+    `;
 	}
 	renderContent() {
-		let t = this.getSortedFilesAndTransfers(), n = this.getPreviewableImages(t), r = this.pktStrings.get("fileupload"), i = this.getSupportedFormatsText(), a = [!this.label && this.helptext ? `${this.id}-helptext` : void 0, this.hasEffectiveError ? `${this.id}-error` : void 0].filter(Boolean).join(" ") || void 0, o = this.itemRenderer === "thumbnail" ? this.multiple ? {
+		let t = this.getSortedFilesAndTransfers(), n = this.getPreviewableImages(t), r = this.pktStrings.get("fileupload"), i = this.getSupportedFormatsText(), a = [this.helptext ? `${this.id}-input-helptext` : void 0, this.hasEffectiveError ? `${this.id}-error` : void 0].filter(Boolean).join(" ") || void 0, o = this.itemRenderer === "thumbnail" ? this.multiple ? {
 			dragInactive: r.dropZoneDragMultipleThumbnail,
 			dragActive: r.dropZoneDragActiveMultipleThumbnail,
 			openFileDialog: r.dropZoneOpenFileDialogMultipleThumbnail

package/dist/pkt-combobox.cjs

@@ -1 +1 @@
-Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:`Module`}});const e=require("./combobox-B9Qo7hbt.cjs");exports.PktCombobox=e.n,exports.default=e.t;
+Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:`Module`}});const e=require("./combobox-CFgPKb3j.cjs");exports.PktCombobox=e.n,exports.default=e.t;

package/dist/pkt-combobox.js

@@ -1,2 +1,2 @@
-import { n as e, t } from "./combobox-fzSaCPok.js";
+import { n as e, t } from "./combobox-Cei828v1.js";
 export { e as PktCombobox, t as default };

package/dist/pkt-fileupload.cjs

@@ -1 +1 @@
-Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:`Module`}});const e=require("./fileupload-Y4bDkaD9.cjs");Object.defineProperty(exports,"PktFileUpload",{enumerable:!0,get:function(){return e.n}}),exports.default=e.t;
+Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:`Module`}});const e=require("./fileupload-2nliUg_z.cjs");Object.defineProperty(exports,"PktFileUpload",{enumerable:!0,get:function(){return e.n}}),exports.default=e.t;

package/dist/pkt-fileupload.js

@@ -1,2 +1,2 @@
-import { n as e, t } from "./fileupload-C5lxuood.js";
+import { n as e, t } from "./fileupload-BpkvNlxN.js";
 export { e as PktFileUpload, t as default };

package/dist/pkt-index.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("./element-D_mCyFeX.cjs"),t=require("./consent-DnE6IPEj.cjs"),n=require("./alert-DH3VqNqh.cjs"),r=require("./icon-BzxBkRyE.cjs"),i=require("./button-Cx6Xdp6t.cjs"),a=require("./accordion-CsrLQXEA.cjs"),o=require("./backlink-CDH824db.cjs"),s=require("./breadcrumbs-B37tsIoh.cjs"),c=require("./calendar-CAwIY7x_.cjs"),l=require("./tag-CGlxtBOH.cjs"),u=require("./header-CP332MCg.cjs"),d=require("./card-CB72gwBC.cjs"),f=require("./combobox-B9Qo7hbt.cjs"),p=require("./input-wrapper-D64Qn-QH.cjs"),m=require("./helptext-6HsH-I6a.cjs"),h=require("./checkbox-DJfH-vTj.cjs"),g=require("./fileupload-Y4bDkaD9.cjs"),_=require("./modal-DZm_fn3K.cjs"),v=require("./progressbar-DsE4-qaW.cjs"),y=require("./datepicker-D6os8IVu.cjs"),b=require("./footer-Ca3DM544.cjs"),x=require("./link-Bk7aDZCC.cjs"),S=require("./textinput-uDRbleIa.cjs"),C=require("./searchinput-vi7twt5b.cjs"),w=require("./header-menu-B9ABa0WW.cjs"),T=require("./heading-4ZHACOeL.cjs"),E=require("./linkcard-rZpQuO1Z.cjs"),D=require("./loader-BAn68gBb.cjs"),O=require("./messagebox-WH2HjT5I.cjs"),k=require("./radiobutton-CnGhAnjp.cjs"),A=require("./tabs-hiTrWsXq.cjs"),j=require("./textarea-4s_SiG0_.cjs"),M=require("./select-D761TXmv.cjs"),N=require("./timepicker-auQ5Y6Et.cjs");exports.PktAccordion=a.r,exports.PktAccordionItem=a.n,exports.PktAlert=n.n,exports.PktBackLink=o.n,exports.PktBreadcrumbs=s.t,exports.PktButton=i.n,exports.PktCalendar=c.n,exports.PktCard=d.n,exports.PktCheckbox=h.n,exports.PktCombobox=f.n,exports.PktConsent=t.n,exports.PktDateTags=y.a,exports.PktDatepicker=y.t,Object.defineProperty(exports,"PktFileUpload",{enumerable:!0,get:function(){return g.n}}),exports.PktFooter=b.n,exports.PktFooterSimple=b.t,exports.PktHeader=u.t,exports.PktHeaderGlobal=u.n,exports.PktHeaderMenu=w.n,exports.PktHeaderService=u.r,exports.PktHeaderUserMenu=u.i,exports.PktHeading=T.n,exports.PktHelptext=m.n,exports.PktIcon=r.n,exports.PktInputWrapper=p.n,exports.PktLink=x.n,exports.PktLinkCard=E.n,exports.PktLoader=D.n,exports.PktMessagebox=O.n,exports.PktModal=_.n,exports.PktProgressbar=v.n,exports.PktRadioButton=k.n,exports.PktRadiobutton=k.n,exports.PktSearchInput=C.n,exports.PktSelect=M.n,exports.PktTabItem=A.n,exports.PktTabs=A.r,exports.PktTag=l.n,exports.PktTextarea=j.n,exports.PktTextinput=S.n,exports.PktTimepicker=N.t,exports.getPktStrings=e.r,exports.pktStringsNb=e.s,exports.resetPktStrings=e.i,exports.setPktStrings=e.a,exports.subscribePktStrings=e.o;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("./element-D_mCyFeX.cjs"),t=require("./consent-DnE6IPEj.cjs"),n=require("./alert-DH3VqNqh.cjs"),r=require("./icon-BzxBkRyE.cjs"),i=require("./button-Cx6Xdp6t.cjs"),a=require("./accordion-CsrLQXEA.cjs"),o=require("./backlink-CDH824db.cjs"),s=require("./breadcrumbs-B37tsIoh.cjs"),c=require("./calendar-CAwIY7x_.cjs"),l=require("./tag-CGlxtBOH.cjs"),u=require("./header-CP332MCg.cjs"),d=require("./card-CB72gwBC.cjs"),f=require("./combobox-CFgPKb3j.cjs"),p=require("./input-wrapper-D64Qn-QH.cjs"),m=require("./helptext-6HsH-I6a.cjs"),h=require("./checkbox-DJfH-vTj.cjs"),g=require("./fileupload-2nliUg_z.cjs"),_=require("./modal-DZm_fn3K.cjs"),v=require("./progressbar-DsE4-qaW.cjs"),y=require("./datepicker-D6os8IVu.cjs"),b=require("./footer-Ca3DM544.cjs"),x=require("./link-Bk7aDZCC.cjs"),S=require("./textinput-uDRbleIa.cjs"),C=require("./searchinput-vi7twt5b.cjs"),w=require("./header-menu-B9ABa0WW.cjs"),T=require("./heading-4ZHACOeL.cjs"),E=require("./linkcard-rZpQuO1Z.cjs"),D=require("./loader-BAn68gBb.cjs"),O=require("./messagebox-WH2HjT5I.cjs"),k=require("./radiobutton-CnGhAnjp.cjs"),A=require("./tabs-hiTrWsXq.cjs"),j=require("./textarea-4s_SiG0_.cjs"),M=require("./select-D761TXmv.cjs"),N=require("./timepicker-CAD2AYFr.cjs");exports.PktAccordion=a.r,exports.PktAccordionItem=a.n,exports.PktAlert=n.n,exports.PktBackLink=o.n,exports.PktBreadcrumbs=s.t,exports.PktButton=i.n,exports.PktCalendar=c.n,exports.PktCard=d.n,exports.PktCheckbox=h.n,exports.PktCombobox=f.n,exports.PktConsent=t.n,exports.PktDateTags=y.a,exports.PktDatepicker=y.t,Object.defineProperty(exports,"PktFileUpload",{enumerable:!0,get:function(){return g.n}}),exports.PktFooter=b.n,exports.PktFooterSimple=b.t,exports.PktHeader=u.t,exports.PktHeaderGlobal=u.n,exports.PktHeaderMenu=w.n,exports.PktHeaderService=u.r,exports.PktHeaderUserMenu=u.i,exports.PktHeading=T.n,exports.PktHelptext=m.n,exports.PktIcon=r.n,exports.PktInputWrapper=p.n,exports.PktLink=x.n,exports.PktLinkCard=E.n,exports.PktLoader=D.n,exports.PktMessagebox=O.n,exports.PktModal=_.n,exports.PktProgressbar=v.n,exports.PktRadioButton=k.n,exports.PktRadiobutton=k.n,exports.PktSearchInput=C.n,exports.PktSelect=M.n,exports.PktTabItem=A.n,exports.PktTabs=A.r,exports.PktTag=l.n,exports.PktTextarea=j.n,exports.PktTextinput=S.n,exports.PktTimepicker=N.t,exports.getPktStrings=e.r,exports.pktStringsNb=e.s,exports.resetPktStrings=e.i,exports.setPktStrings=e.a,exports.subscribePktStrings=e.o;

package/dist/pkt-index.js

@@ -10,11 +10,11 @@ import { n as p } from "./calendar-42o_q-jI.js";
 import { n as m } from "./tag-bztxjcF0.js";
 import { i as h, n as g, r as _, t as v } from "./header-CCJeadiL.js";
 import { n as y } from "./card-cyZE94EO.js";
-import { n as b } from "./combobox-fzSaCPok.js";
+import { n as b } from "./combobox-Cei828v1.js";
 import { n as x } from "./input-wrapper-Bg06k-cj.js";
 import { n as S } from "./helptext-BESB9Vlq.js";
 import { n as C } from "./checkbox-BhyUp6l6.js";
-import { n as w } from "./fileupload-C5lxuood.js";
+import { n as w } from "./fileupload-BpkvNlxN.js";
 import { n as T } from "./modal-DdC1_qT3.js";
 import { n as E } from "./progressbar-D1x6MwdY.js";
 import { a as D, t as O } from "./datepicker-DMiZ3BBw.js";
@@ -31,5 +31,5 @@ import { n as z } from "./radiobutton-DWdn1O48.js";
 import { n as B, r as V } from "./tabs-kxsX1ZEf.js";
 import { n as H } from "./textarea-D3SeDZ1r.js";
 import { n as U } from "./select-CM-CcWab.js";
-import { t as W } from "./timepicker--CrfIU_7.js";
+import { t as W } from "./timepicker-D9liFW1z.js";
 export { u as PktAccordion, l as PktAccordionItem, o as PktAlert, d as PktBackLink, f as PktBreadcrumbs, c as PktButton, p as PktCalendar, y as PktCard, C as PktCheckbox, b as PktCombobox, a as PktConsent, D as PktDateTags, O as PktDatepicker, w as PktFileUpload, k as PktFooter, A as PktFooterSimple, v as PktHeader, g as PktHeaderGlobal, P as PktHeaderMenu, _ as PktHeaderService, h as PktHeaderUserMenu, F as PktHeading, S as PktHelptext, s as PktIcon, x as PktInputWrapper, j as PktLink, I as PktLinkCard, L as PktLoader, R as PktMessagebox, T as PktModal, E as PktProgressbar, z as PktRadioButton, z as PktRadiobutton, N as PktSearchInput, U as PktSelect, B as PktTabItem, V as PktTabs, m as PktTag, H as PktTextarea, M as PktTextinput, W as PktTimepicker, r as getPktStrings, i as pktStringsNb, t as resetPktStrings, e as setPktStrings, n as subscribePktStrings };

package/dist/pkt-timepicker.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("./timepicker-auQ5Y6Et.cjs");exports.PktTimepicker=e.t;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("./timepicker-CAD2AYFr.cjs");exports.PktTimepicker=e.t;

package/dist/pkt-timepicker.js

@@ -1,2 +1,2 @@
-import { t as e } from "./timepicker--CrfIU_7.js";
+import { t as e } from "./timepicker-D9liFW1z.js";
 export { e as PktTimepicker };

package/dist/timepicker-CAD2AYFr.cjs

@@ -0,0 +1,198 @@
+const e=require("./element-D_mCyFeX.cjs"),t=require("./class-map-DupQbnhE.cjs"),n=require("./if-defined-BbUZeoaQ.cjs"),r=require("./format-B8meU8Tm.cjs"),i=require("./element-with-slot-C66Jck5e.cjs");require("./icon-BzxBkRyE.cjs");const a=require("./ref-AuNEkS5a.cjs"),o=require("./input-element-PN5nWd1A.cjs"),s=require("./input-wrapper-D64Qn-QH.cjs");var c=e=>/^\d{2}:\d{2}$/.test(e)&&parseInt(e.slice(0,2),10)<=23&&parseInt(e.slice(3),10)<=59,l=e=>{let[t,n]=e.split(`:`).map(Number);return t*60+n},u=e=>e?Math.max(1,Math.round(e/60)):1,d=(e,t)=>{let n=e?parseInt(String(e).split(`:`)[0],10):0,r=t?parseInt(String(t).split(`:`)[0],10):23;return Array.from({length:r-n+1},(e,t)=>t+n)},f=e=>{let t=u(e);return Array.from({length:Math.floor(60/t)},(e,n)=>n*t)},p=(e,t,n,r)=>{let i=e===``?n===1?0:23:parseInt(e,10),a=t===``?n===1?0:Math.floor(59/r)*r:parseInt(t,10);return a+=n*r,a>59?(a=0,i=(i+1)%24):a<0&&(a=Math.floor(59/r)*r,i=(i-1+24)%24),{hours:String(i).padStart(2,`0`),minutes:String(a).padStart(2,`0`)}},m=class extends o.t{constructor(...e){super(...e),this.hiddenInputRef=a.t(),this.hoursInputRef=a.t(),this.minutesInputRef=a.t(),this.buttonRef=a.t(),this.value=``,this.hidePicker=!1,this.stepArrows=!1,this._hours=``,this._minutes=``,this._isOpen=!1,this._hoursDigitCount=0,this._hoursFirstDigit=-1,this._minutesDigitCount=0,this._minutesFirstDigit=-1,this._hasFocus=!1,this._outsideClickHandler=e=>{this.contains(e.target)||this._closePopup()},this._handleComponentFocusIn=()=>{this._hasFocus||(this._hasFocus=!0,this.onFocus())},this._handleComponentFocusOut=e=>{this.contains(e.relatedTarget)||(this._hasFocus=!1,this.onBlur())},this._handleHoursKeydown=e=>{let t=e.target;switch(e.key){case`ArrowUp`:{e.preventDefault();let t=this._hours===``?0:parseInt(this._hours,10);this._hours=String((t+1)%24).padStart(2,`0`),this._syncValueFromDisplay(),this.onInput();break}case`ArrowDown`:{e.preventDefault();let t=this._hours===``?0:parseInt(this._hours,10);this._hours=String((t-1+24)%24).padStart(2,`0`),this._syncValueFromDisplay(),this.onInput();break}case`ArrowRight`:e.preventDefault(),this.minutesInputRef.value?.focus();break;case`Backspace`:case`Delete`:this._hoursDigitCount=0,this._hoursFirstDigit=-1;break;case`Tab`:break;case`Enter`:{e.preventDefault();let n=this.internals.form;n?n.requestSubmit():t.blur();break}default:if(/^\d$/.test(e.key)){e.preventDefault();let t=parseInt(e.key,10);if(this._hoursDigitCount===0)this._hoursFirstDigit=t,this._hours=String(t).padStart(2,`0`),this._hoursDigitCount=1,this.onInput(),t>=3&&(this._hoursFirstDigit=-1,this._hoursDigitCount=0,this._syncValueFromDisplay(),this.minutesInputRef.value?.focus());else{let e=this._hoursFirstDigit*10+t;this._hours=e<=23?String(e).padStart(2,`0`):String(t).padStart(2,`0`),this._hoursFirstDigit=-1,this._hoursDigitCount=0,this._syncValueFromDisplay(),this.onInput(),this.minutesInputRef.value?.focus()}}else e.preventDefault()}},this._handleHoursBlur=()=>{this._hours!==``&&(this._hours=String(parseInt(this._hours,10)).padStart(2,`0`)),this._hoursDigitCount=0,this._hoursFirstDigit=-1,this._syncValueFromDisplay()},this._handleMinutesKeydown=e=>{let t=e.target;switch(e.key){case`ArrowUp`:{e.preventDefault();let t=this._minutes===``?0:parseInt(this._minutes,10);this._minutes=String((t+this._minuteStep)%60).padStart(2,`0`),this._syncValueFromDisplay(),this.onInput();break}case`ArrowDown`:{e.preventDefault();let t=this._minutes===``?0:parseInt(this._minutes,10);this._minutes=String((t-this._minuteStep+60)%60).padStart(2,`0`),this._syncValueFromDisplay(),this.onInput();break}case`ArrowLeft`:e.preventDefault(),this.hoursInputRef.value?.focus();break;case`Backspace`:case`Delete`:this._minutesDigitCount=0,this._minutesFirstDigit=-1;break;case`Tab`:break;case`Enter`:{e.preventDefault();let n=this.internals.form;n?n.requestSubmit():t.blur();break}default:if(/^\d$/.test(e.key)){e.preventDefault();let t=parseInt(e.key,10);if(this._minutesDigitCount===0)this._minutesFirstDigit=t,this._minutes=String(t).padStart(2,`0`),this._minutesDigitCount=1,this.onInput(),t>=6&&(this._minutesFirstDigit=-1,this._minutesDigitCount=0,this._syncValueFromDisplay());else{let e=this._minutesFirstDigit*10+t;this._minutes=e<=59?String(e).padStart(2,`0`):String(t).padStart(2,`0`),this._minutesFirstDigit=-1,this._minutesDigitCount=0,this._syncValueFromDisplay(),this.onInput()}}else e.preventDefault()}},this._handleMinutesBlur=()=>{this._minutes!==``&&(this._minutes=String(parseInt(this._minutes,10)).padStart(2,`0`)),this._minutesDigitCount=0,this._minutesFirstDigit=-1,this._syncValueFromDisplay()},this._handlePopupKeydown=e=>{let t=document.activeElement,n=t.closest(`.pkt-timepicker-popup__col`);if(!n)return;let r=Array.from(n.querySelectorAll(`.pkt-timepicker-popup__option`)),i=r.indexOf(t),a=t.dataset.type??``;switch(e.key){case`ArrowDown`:e.preventDefault(),this._focusOptionAndSync(r[Math.min(i+1,r.length-1)],a);break;case`ArrowUp`:e.preventDefault(),this._focusOptionAndSync(r[Math.max(i-1,0)],a);break;case`Home`:e.preventDefault(),this._focusOptionAndSync(r[0],a);break;case`End`:e.preventDefault(),this._focusOptionAndSync(r[r.length-1],a);break;case`ArrowRight`:e.preventDefault(),a===`hour`&&(this._focusOptionAndSync(t,a),this.updateComplete.then(()=>{this._scrollToSelected(),this._focusSelectedOrFirst(`minute`)}));break;case`ArrowLeft`:e.preventDefault(),a===`minute`&&(this._focusOptionAndSync(t,a),this.updateComplete.then(()=>{this._scrollToSelected(),this._focusSelectedOrFirst(`hour`)}));break;case`Enter`:case` `:e.preventDefault(),t.click();break;case`Escape`:e.preventDefault(),this._closePopup(),this.buttonRef.value?.focus()}}}get inputRef(){return this.hiddenInputRef}manageValidity(e){let t=this.hoursInputRef.value;if(!t)return;let n=this.pktStrings.get(`validation`);if(this.required&&!this.value){this.internals.setValidity({valueMissing:!0},n.valueMissing,t),this._setAriaInvalid(!0);return}if(!this.value){this.internals.setValidity({}),this._setAriaInvalid(!1);return}let i=l(this.value),a=u(this.step);if(this.min&&i<l(String(this.min))){this.internals.setValidity({rangeUnderflow:!0},r.t(n.rangeUnderflowMin,{min:String(this.min)}),t),this._setAriaInvalid(!0);return}if(this.max&&i>l(String(this.max))){this.internals.setValidity({rangeOverflow:!0},r.t(n.rangeOverflowMax,{max:String(this.max)}),t),this._setAriaInvalid(!0);return}if(this.step&&i%a!==0){let e=a===60?n.timeStepMismatchHour:a===30?n.timeStepMismatchHalfHour:r.t(n.timeStepMismatch,{step:`${a}, ${a*2}, ${a*3}`});this.internals.setValidity({stepMismatch:!0},e,t),this._setAriaInvalid(!0);return}this.internals.setValidity({}),this._setAriaInvalid(!1)}_describedBy(){return s.r({id:`${this.id}-hours`,hasHelptext:!!this.helptext,ariaDescribedby:this.ariaDescribedby})}_setAriaInvalid(e){if(!this.touched&&e)return;let t=this.hoursInputRef.value,n=this.minutesInputRef.value;if(e)t?.setAttribute(`aria-invalid`,`true`),n?.setAttribute(`aria-invalid`,`true`);else{if(this.hasError)return;t?.removeAttribute(`aria-invalid`),n?.removeAttribute(`aria-invalid`)}}connectedCallback(){super.connectedCallback(),this.addEventListener(`focusin`,this._handleComponentFocusIn),this.addEventListener(`focusout`,this._handleComponentFocusOut),document.addEventListener(`click`,this._outsideClickHandler)}disconnectedCallback(){super.disconnectedCallback(),this.removeEventListener(`focusin`,this._handleComponentFocusIn),this.removeEventListener(`focusout`,this._handleComponentFocusOut),document.removeEventListener(`click`,this._outsideClickHandler)}willUpdate(e){super.willUpdate(e),e.has(`value`)&&this._syncDisplayFromValue()}updated(e){super.updated(e),this.classList.add(`pkt-timepicker`),this.classList.toggle(`pkt-timepicker--stepper`,this.stepArrows),this.classList.toggle(`pkt-timepicker--fullwidth`,this.fullwidth),this.classList.toggle(`pkt-timepicker--medium`,this.inputSize===`medium`),this.classList.toggle(`pkt-timepicker--small`,this.inputSize===`small`),this.classList.toggle(`pkt-timepicker--xsmall`,this.inputSize===`xsmall`),e.has(`step`)&&this.step!==null&&!this._isValidStep(this.step)&&console.warn(`pkt-timepicker: step="${this.step}" er ikke en gyldig verdi. Step må være et multiplum av 60 (hele minutter) eller nøyaktig 3600 (hel time).`)}formResetCallback(){super.formResetCallback(),this._hours=``,this._minutes=``,this._isOpen=!1}_isValidStep(e){return e===3600||e<3600&&3600%e==0&&e%60==0}_syncDisplayFromValue(){let e=c(this.value)?this.value.split(`:`):null;e?(this._hours=e[0],this._minutes=e[1]):(this._hours=``,this._minutes=``)}_syncValueFromDisplay(){if(this._hours!==``&&this._minutes!==``){let e=`${this._hours}:${this._minutes}`;e!==this.value&&(this.value=e,this.onChange(e))}else this.value!==``&&(this.value=``,this.onChange(``))}get _minuteStep(){return u(this.step)}get _hourOptions(){return d(this.min,this.max)}get _minuteOptions(){return f(this.step)}_openPopup(){this._isOpen=!0,this.updateComplete.then(()=>{this._scrollToSelected(),this._focusSelectedOrFirst(`hour`)})}_closePopup(){this._isOpen=!1,this._syncValueFromDisplay()}_togglePopup(){this._isOpen?this._closePopup():this._openPopup()}_scrollToSelected(){let e=this.querySelector(`.pkt-timepicker-popup`);e&&e.querySelectorAll(`.pkt-timepicker-popup__col`).forEach(e=>{let t=e.querySelector(`.pkt-timepicker-popup__option--selected`);t&&t.scrollIntoView({block:`center`})})}_focusSelectedOrFirst(e){let t=this.querySelector(`.pkt-timepicker-popup`);if(!t)return;let n=t.querySelectorAll(`.pkt-timepicker-popup__col`),r=e===`hour`?n[0]:n[1];if(!r)return;let i=r.querySelector(`.pkt-timepicker-popup__option--selected`),a=r.querySelector(`.pkt-timepicker-popup__option`);(i||a)?.focus()}_handleOptionClick(e,t){let n=String(e).padStart(2,`0`);t===`hour`?(this._hours=n,this.updateComplete.then(()=>this._focusSelectedOrFirst(`minute`))):(this._minutes=n,this._closePopup(),this.buttonRef.value?.focus())}_focusOptionAndSync(e,t){if(!e)return;let n=parseInt(e.dataset.value??`0`,10);t===`hour`?this._hours=String(n).padStart(2,`0`):this._minutes=String(n).padStart(2,`0`),e.focus()}_stepTime(e){let t=p(this._hours,this._minutes,e,this._minuteStep);this._hours=t.hours,this._minutes=t.minutes,this._syncValueFromDisplay()}_renderOption(n,r){let i=String(n).padStart(2,`0`),a=n===(r===`hour`?this._hours===``?NaN:parseInt(this._hours,10):this._minutes===``?NaN:parseInt(this._minutes,10));return e._`
+      <button
+        class=${t.t({"pkt-btn":!0,"pkt-btn--tertiary":!0,"pkt-btn--small":!0,"pkt-btn--label-only":!0,"pkt-timepicker-popup__option":!0,"pkt-timepicker-popup__option--selected":a})}
+        type="button"
+        role="option"
+        aria-selected=${a?`true`:`false`}
+        tabindex=${a?`0`:`-1`}
+        data-type=${r}
+        data-value=${n}
+        @click=${e=>{e.stopImmediatePropagation(),this._handleOptionClick(n,r)}}
+      >
+        <span class="pkt-btn__text pkt-txt-14-light">${i}</span>
+      </button>
+    `}_renderPopup(){return e._`
+      <div
+        class="pkt-timepicker-popup"
+        id=${this.id+`-popup`}
+        ?hidden=${!this._isOpen}
+        role="group"
+        aria-label=${this.pktStrings.get(`timepicker`).selectTime}
+        @keydown=${this._handlePopupKeydown}
+        @focusout=${e=>{this.querySelector(`.pkt-timepicker-popup`)?.contains(e.relatedTarget)||this._closePopup()}}
+      >
+        <div
+          class="pkt-timepicker-popup__col"
+          role="listbox"
+          aria-label=${this.pktStrings.get(`timepicker`).hours}
+          aria-orientation="vertical"
+        >
+          ${this._hourOptions.map(e=>this._renderOption(e,`hour`))}
+        </div>
+        <div
+          class="pkt-timepicker-popup__col"
+          role="listbox"
+          aria-label=${this.pktStrings.get(`timepicker`).minutes}
+          aria-orientation="vertical"
+        >
+          ${this._minuteOptions.map(e=>this._renderOption(e,`minute`))}
+        </div>
+      </div>
+    `}_renderContainer(){let t=this.pktStrings.get(`timepicker`).hours,r=this.pktStrings.get(`timepicker`).minutes,i=this.label?`${t}, ${this.label}`:t,o=this.label?`${r}, ${this.label}`:r;return e._`
+      <div
+        class="pkt-input__container pkt-input__container--${this.inputSize}"
+        @click=${e=>{e.target.closest(`button, input`)||this.hoursInputRef.value?.focus()}}
+      >
+        ${this.stepArrows?e._`
+              <button
+                class="pkt-input-icon pkt-btn pkt-btn--icon-only pkt-btn--tertiary pkt-btn--${this.inputSize} pkt-timepicker__button pkt-timepicker__button--prev"
+                type="button"
+                aria-label=${this.pktStrings.get(`timepicker`).prevTime}
+                ?disabled=${this.disabled}
+                @click=${()=>this._stepTime(-1)}
+              >
+                <pkt-icon name="chevron-thin-left"></pkt-icon>
+                <span class="pkt-btn__text"
+                  >${this.pktStrings.get(`timepicker`).prevTime}</span
+                >
+              </button>
+            `:e.h}
+        <input
+          ${a.n(this.hoursInputRef)}
+          type="text"
+          inputmode="numeric"
+          maxlength="2"
+          size="2"
+          class="pkt-input pkt-input--${this.inputSize} pkt-timepicker__input"
+          id=${this.id+`-hours`}
+          data-min="0"
+          data-max="23"
+          .value=${this._hours}
+          placeholder="––"
+          aria-label=${i}
+          role="spinbutton"
+          aria-invalid=${this.hasError?`true`:e.h}
+          aria-errormessage=${this.hasError?`${this.id}-hours-error`:e.h}
+          aria-describedby=${n.t(this._describedBy())}
+          aria-valuemin="0"
+          aria-valuemax="23"
+          aria-valuenow=${this._hours===``?e.h:this._hours}
+          aria-valuetext=${this._hours===``?e.h:`${this._hours} ${t.toLowerCase()}`}
+          autocomplete="off"
+          ?disabled=${this.disabled}
+          @keydown=${this._handleHoursKeydown}
+          @blur=${this._handleHoursBlur}
+          @focus=${e=>{e.target.select(),e.stopImmediatePropagation()}}
+        />
+        <span class="pkt-timepicker__separator">:</span>
+        <input
+          ${a.n(this.minutesInputRef)}
+          type="text"
+          inputmode="numeric"
+          maxlength="2"
+          size="2"
+          class="pkt-input pkt-input--${this.inputSize} pkt-timepicker__input"
+          id=${this.id+`-minutes`}
+          data-min="0"
+          data-max="59"
+          .value=${this._minutes}
+          placeholder="––"
+          aria-label=${o}
+          role="spinbutton"
+          aria-invalid=${this.hasError?`true`:e.h}
+          aria-errormessage=${this.hasError?`${this.id}-hours-error`:e.h}
+          aria-describedby=${n.t(this._describedBy())}
+          aria-valuemin="0"
+          aria-valuemax="59"
+          aria-valuenow=${this._minutes===``?e.h:this._minutes}
+          aria-valuetext=${this._minutes===``?e.h:`${this._minutes} ${r.toLowerCase()}`}
+          autocomplete="off"
+          ?disabled=${this.disabled}
+          @keydown=${this._handleMinutesKeydown}
+          @blur=${this._handleMinutesBlur}
+          @focus=${e=>{e.target.select(),e.stopImmediatePropagation()}}
+        />
+        ${this.hidePicker&&!this.stepArrows?e._`<pkt-icon
+              class="pkt-input-icon pkt-timepicker__icon"
+              name="clock"
+              aria-hidden="true"
+            ></pkt-icon>`:e.h}
+        ${!this.hidePicker&&!this.stepArrows?e._`
+              <button
+                ${a.n(this.buttonRef)}
+                class="pkt-input-icon pkt-btn pkt-btn--icon-only pkt-btn--tertiary pkt-btn--${this.inputSize} pkt-timepicker__button"
+                type="button"
+                aria-label=${this.pktStrings.get(`timepicker`).openPicker}
+                aria-haspopup="listbox"
+                aria-expanded=${this._isOpen?`true`:`false`}
+                aria-controls=${this.id+`-popup`}
+                ?disabled=${this.disabled}
+                @click=${this._togglePopup}
+              >
+                <pkt-icon name="clock"></pkt-icon>
+                <span class="pkt-btn__text"
+                  >${this.pktStrings.get(`timepicker`).openPicker}</span
+                >
+              </button>
+            `:e.h}
+        ${this.stepArrows?e._`
+              <button
+                class="pkt-input-icon pkt-btn pkt-btn--icon-only pkt-btn--tertiary pkt-btn--${this.inputSize} pkt-timepicker__button pkt-timepicker__button--next"
+                type="button"
+                aria-label=${this.pktStrings.get(`timepicker`).nextTime}
+                ?disabled=${this.disabled}
+                @click=${()=>this._stepTime(1)}
+              >
+                <pkt-icon name="chevron-thin-right"></pkt-icon>
+                <span class="pkt-btn__text"
+                  >${this.pktStrings.get(`timepicker`).nextTime}</span
+                >
+              </button>
+            `:e.h}
+        <input
+          ${a.n(this.hiddenInputRef)}
+          type="time"
+          hidden
+          name=${this.name||this.id}
+          id=${this.id+`-input`}
+          .value=${this.value}
+          min=${n.t(this.min??void 0)}
+          max=${n.t(this.max??void 0)}
+          step=${n.t(this.step??void 0)}
+          ?required=${this.required}
+          ?disabled=${this.disabled}
+          tabindex="-1"
+        />
+      </div>
+    `}render(){return e._`
+      <pkt-input-wrapper
+        .strings=${this.strings}
+        label="${this.label}"
+        ?disabled=${this.disabled}
+        ?fullwidth=${this.fullwidth}
+        ?hasError=${this.hasError}
+        ?hasFieldset=${this.effectiveHasFieldset(!1)}
+        ?inline=${this.inline}
+        ?optionalTag=${this.optionalTag}
+        ?required=${this.required}
+        ?requiredTag=${this.requiredTag}
+        useWrapper=${this.useWrapper}
+        .ariaDescribedby=${this.ariaDescribedby}
+        .errorMessage=${this.errorMessage}
+        .forId="${this.id+`-hours`}"
+        .helptext=${this.helptext}
+        .helptextDropdown=${this.helptextDropdown}
+        .helptextDropdownButton=${this.helptextDropdownButton}
+        .optionalText=${this.optionalText}
+        .requiredText=${this.requiredText}
+        .tagText=${this.tagText}
+        .size=${this.inputSize}
+      >
+        <div class="pkt-contents" slot="helptext">${i.r(this,`helptext`)}</div>
+        ${!this.hidePicker&&!this.stepArrows?e._`
+              <div class="pkt-timepicker__anchor">
+                ${this._renderContainer()} ${this._renderPopup()}
+              </div>
+            `:this._renderContainer()}
+      </pkt-input-wrapper>
+    `}};e.n([e.u({type:String,reflect:!0})],m.prototype,`value`,void 0),e.n([e.u({type:Boolean,reflect:!0,attribute:`hide-picker`})],m.prototype,`hidePicker`,void 0),e.n([e.u({type:Boolean,reflect:!0,attribute:`step-arrows`})],m.prototype,`stepArrows`,void 0),e.n([e.l()],m.prototype,`_hours`,void 0),e.n([e.l()],m.prototype,`_minutes`,void 0),e.n([e.l()],m.prototype,`_isOpen`,void 0);try{e.d(`pkt-timepicker`)(m)}catch{console.warn(`Forsøker å definere <pkt-timepicker>, men den er allerede definert`)}Object.defineProperty(exports,"t",{enumerable:!0,get:function(){return m}});

package/dist/{timepicker--CrfIU_7.js → timepicker-D9liFW1z.js}

@@ -6,24 +6,24 @@ import { r as l } from "./element-with-slot-BOuXlWSY.js";
 import "./icon-DkVqRWbC.js";
 import { n as u, t as d } from "./ref-DNowxdYH.js";
 import { t as f } from "./input-element-BWxgs8L-.js";
-import "./input-wrapper-Bg06k-cj.js";
+import { r as p } from "./input-wrapper-Bg06k-cj.js";
 //#region ../../shared-utils/timepicker/time-utils.ts
-var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && parseInt(e.slice(3), 10) <= 59, m = (e) => {
+var m = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && parseInt(e.slice(3), 10) <= 59, h = (e) => {
 	let [t, n] = e.split(":").map(Number);
 	return t * 60 + n;
-}, h = (e) => e ? Math.max(1, Math.round(e / 60)) : 1, g = (e, t) => {
+}, g = (e) => e ? Math.max(1, Math.round(e / 60)) : 1, _ = (e, t) => {
 	let n = e ? parseInt(String(e).split(":")[0], 10) : 0, r = t ? parseInt(String(t).split(":")[0], 10) : 23;
 	return Array.from({ length: r - n + 1 }, (e, t) => t + n);
-}, _ = (e) => {
-	let t = h(e);
+}, v = (e) => {
+	let t = g(e);
 	return Array.from({ length: Math.floor(60 / t) }, (e, n) => n * t);
-}, v = (e, t, n, r) => {
+}, y = (e, t, n, r) => {
 	let i = e === "" ? n === 1 ? 0 : 23 : parseInt(e, 10), a = t === "" ? n === 1 ? 0 : Math.floor(59 / r) * r : parseInt(t, 10);
 	return a += n * r, a > 59 ? (a = 0, i = (i + 1) % 24) : a < 0 && (a = Math.floor(59 / r) * r, i = (i - 1 + 24) % 24), {
 		hours: String(i).padStart(2, "0"),
 		minutes: String(a).padStart(2, "0")
 	};
-}, y = class extends f {
+}, b = class extends f {
 	constructor(...e) {
 		super(...e), this.hiddenInputRef = d(), this.hoursInputRef = d(), this.minutesInputRef = d(), this.buttonRef = d(), this.value = "", this.hidePicker = !1, this.stepArrows = !1, this._hours = "", this._minutes = "", this._isOpen = !1, this._hoursDigitCount = 0, this._hoursFirstDigit = -1, this._minutesDigitCount = 0, this._minutesFirstDigit = -1, this._hasFocus = !1, this._outsideClickHandler = (e) => {
 			this.contains(e.target) || this._closePopup();
@@ -163,12 +163,12 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
 			this.internals.setValidity({}), this._setAriaInvalid(!1);
 			return;
 		}
-		let r = m(this.value), i = h(this.step);
-		if (this.min && r < m(String(this.min))) {
+		let r = h(this.value), i = g(this.step);
+		if (this.min && r < h(String(this.min))) {
 			this.internals.setValidity({ rangeUnderflow: !0 }, c(n.rangeUnderflowMin, { min: String(this.min) }), t), this._setAriaInvalid(!0);
 			return;
 		}
-		if (this.max && r > m(String(this.max))) {
+		if (this.max && r > h(String(this.max))) {
 			this.internals.setValidity({ rangeOverflow: !0 }, c(n.rangeOverflowMax, { max: String(this.max) }), t), this._setAriaInvalid(!0);
 			return;
 		}
@@ -179,6 +179,13 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
 		}
 		this.internals.setValidity({}), this._setAriaInvalid(!1);
 	}
+	_describedBy() {
+		return p({
+			id: `${this.id}-hours`,
+			hasHelptext: !!this.helptext,
+			ariaDescribedby: this.ariaDescribedby
+		});
+	}
 	_setAriaInvalid(e) {
 		if (!this.touched && e) return;
 		let t = this.hoursInputRef.value, n = this.minutesInputRef.value;
@@ -207,7 +214,7 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
 		return e === 3600 || e < 3600 && 3600 % e == 0 && e % 60 == 0;
 	}
 	_syncDisplayFromValue() {
-		let e = p(this.value) ? this.value.split(":") : null;
+		let e = m(this.value) ? this.value.split(":") : null;
 		e ? (this._hours = e[0], this._minutes = e[1]) : (this._hours = "", this._minutes = "");
 	}
 	_syncValueFromDisplay() {
@@ -217,13 +224,13 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
 		} else this.value !== "" && (this.value = "", this.onChange(""));
 	}
 	get _minuteStep() {
-		return h(this.step);
+		return g(this.step);
 	}
 	get _hourOptions() {
-		return g(this.min, this.max);
+		return _(this.min, this.max);
 	}
 	get _minuteOptions() {
-		return _(this.step);
+		return v(this.step);
 	}
 	_openPopup() {
 		this._isOpen = !0, this.updateComplete.then(() => {
@@ -261,7 +268,7 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
 		t === "hour" ? this._hours = String(n).padStart(2, "0") : this._minutes = String(n).padStart(2, "0"), e.focus();
 	}
 	_stepTime(e) {
-		let t = v(this._hours, this._minutes, e, this._minuteStep);
+		let t = y(this._hours, this._minutes, e, this._minuteStep);
 		this._hours = t.hours, this._minutes = t.minutes, this._syncValueFromDisplay();
 	}
 	_renderOption(t, n) {
@@ -361,6 +368,7 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
           role="spinbutton"
           aria-invalid=${this.hasError ? "true" : n}
           aria-errormessage=${this.hasError ? `${this.id}-hours-error` : n}
+          aria-describedby=${s(this._describedBy())}
           aria-valuemin="0"
           aria-valuemax="23"
           aria-valuenow=${this._hours === "" ? n : this._hours}
@@ -390,6 +398,7 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
           role="spinbutton"
           aria-invalid=${this.hasError ? "true" : n}
           aria-errormessage=${this.hasError ? `${this.id}-hours-error` : n}
+          aria-describedby=${s(this._describedBy())}
           aria-valuemin="0"
           aria-valuemax="59"
           aria-valuenow=${this._minutes === "" ? n : this._minutes}
@@ -494,19 +503,19 @@ var p = (e) => /^\d{2}:\d{2}$/.test(e) && parseInt(e.slice(0, 2), 10) <= 23 && p
 i([a({
 	type: String,
 	reflect: !0
-})], y.prototype, "value", void 0), i([a({
+})], b.prototype, "value", void 0), i([a({
 	type: Boolean,
 	reflect: !0,
 	attribute: "hide-picker"
-})], y.prototype, "hidePicker", void 0), i([a({
+})], b.prototype, "hidePicker", void 0), i([a({
 	type: Boolean,
 	reflect: !0,
 	attribute: "step-arrows"
-})], y.prototype, "stepArrows", void 0), i([r()], y.prototype, "_hours", void 0), i([r()], y.prototype, "_minutes", void 0), i([r()], y.prototype, "_isOpen", void 0);
+})], b.prototype, "stepArrows", void 0), i([r()], b.prototype, "_hours", void 0), i([r()], b.prototype, "_minutes", void 0), i([r()], b.prototype, "_isOpen", void 0);
 try {
-	t("pkt-timepicker")(y);
+	t("pkt-timepicker")(b);
 } catch {
 	console.warn("Forsøker å definere <pkt-timepicker>, men den er allerede definert");
 }
 //#endregion
-export { y as t };
+export { b as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslokommune/punkt-elements",
-  "version": "18.9.1",
+  "version": "18.9.5",
   "description": "Komponentbiblioteket til Punkt, designsystem for Oslo kommune",
   "homepage": "https://punkt.oslo.kommune.no",
   "author": "Team Designsystem, Oslo kommune",
@@ -83,5 +83,5 @@
   "engines": {
     "node": "^22.19.0 || ^24.0.0 || ^26.0.0"
   },
-  "gitHead": "66da3e7fd37f5a1058dac1dbf681c5ce5e2bc08b"
+  "gitHead": "a8572816da5d735db6c6759d812458853f8717bc"
 }

package/src/components/combobox/combobox.ts

@@ -19,6 +19,8 @@ import { formatString } from 'shared-strings'
 import type { IPktStringsProps } from 'shared-strings'
 import type { Booleanish } from 'shared-types'
 
+import { describedByIds } from 'shared-utils/forms/described-by'
+
 import '../input-wrapper'
 import '../icon'
 import '../tag'
@@ -379,6 +381,7 @@ export class PktCombobox extends ComboboxHandlers implements IPktCombobox {
             )}
             aria-controls=${ifDefined(!this._hasTextInput ? `${this.id}-listbox` : undefined)}
             aria-haspopup=${ifDefined(!this._hasTextInput ? 'listbox' : undefined)}
+            aria-describedby=${ifDefined(!this._hasTextInput ? this._describedBy() : undefined)}
             aria-labelledby=${ifDefined(
               !this._hasTextInput ? `${this.id}-combobox-label` : undefined,
             )}
@@ -461,6 +464,14 @@ export class PktCombobox extends ComboboxHandlers implements IPktCombobox {
     `
   }
 
+  private _describedBy(): string | undefined {
+    return describedByIds({
+      id: this._hasTextInput ? `${this.id}-input` : `${this.id}-combobox`,
+      hasHelptext: !!this.helptext,
+      ariaDescribedby: this.ariaDescribedby,
+    })
+  }
+
   private renderInputField() {
     return this.typeahead || this.allowUserInput
       ? html`
@@ -487,6 +498,7 @@ export class PktCombobox extends ComboboxHandlers implements IPktCombobox {
               role="combobox"
               aria-expanded=${this._isOptionsOpen ? 'true' : 'false'}
               aria-label=${ifDefined(this.label)}
+              aria-describedby=${ifDefined(this._describedBy())}
               aria-autocomplete=${this.typeahead ? 'both' : this.allowUserInput ? 'list' : 'none'}
               aria-controls="${this.id}-listbox"
               aria-activedescendant=${ifDefined(

package/src/components/fileupload/fileupload.ts

@@ -65,8 +65,6 @@ export class PktFileUpload extends PktFileUploadBase implements IPktFileUpload {
   render() {
     const content = this.renderContent()
 
-    if (!this.label) return content
-
     return html`
       <pkt-input-wrapper
         .strings=${this.strings}
@@ -97,7 +95,7 @@ export class PktFileUpload extends PktFileUploadBase implements IPktFileUpload {
     const previewableImages = this.getPreviewableImages(filesAndTransfers)
     const fileuploadStrings = this.pktStrings.get('fileupload')
     const supportedFormatsText = this.getSupportedFormatsText()
-    const helptextId = !this.label && this.helptext ? `${this.id}-helptext` : undefined
+    const helptextId = this.helptext ? `${this.id}-input-helptext` : undefined
     const errorId = this.hasEffectiveError ? `${this.id}-error` : undefined
     const describedBy = [helptextId, errorId].filter(Boolean).join(' ') || undefined
     const isThumbnailView = this.itemRenderer === 'thumbnail'

package/src/components/helptext/helptext-association.test.ts

@@ -0,0 +1,108 @@
+import '@testing-library/jest-dom'
+import '@/components/textinput'
+import '@/components/textarea'
+import '@/components/select'
+import '@/components/combobox'
+import '@/components/datepicker'
+import '@/components/timepicker'
+import '@/components/fileupload'
+
+/**
+ * The helptext must describe the control itself. `aria-describedby` on a label or
+ * on a wrapping element does not reach the field. See issue #3343.
+ */
+
+const CONTROL = 'input:not([type="hidden"]):not([hidden]), textarea, select, [role="combobox"]'
+
+const mount = async (tag: string, attrs = '') => {
+  document.body.innerHTML = `<${tag} id="felt" name="felt" label="Etikett" helptext="Hjelpetekst" ${attrs}></${tag}>`
+  await customElements.whenDefined(tag)
+  const host = document.querySelector(tag) as HTMLElement & { updateComplete: Promise<unknown> }
+  await host.updateComplete
+  await new Promise((resolve) => setTimeout(resolve, 0))
+  await host.updateComplete
+  return host
+}
+
+const cases: Array<[string, string]> = [
+  ['pkt-textinput', ''],
+  ['pkt-textarea', ''],
+  ['pkt-select', ''],
+  ['pkt-datepicker', ''],
+  ['pkt-fileupload', ''],
+  ['pkt-combobox', ''],
+  ['pkt-combobox', 'allow-user-input'],
+  ['pkt-combobox', 'typeahead'],
+]
+
+describe('helptext association', () => {
+  afterEach(() => {
+    document.body.innerHTML = ''
+  })
+
+  test.each(cases)('%s %s describes its control with the helptext', async (tag, attrs) => {
+    const host = await mount(tag, attrs)
+
+    const helptext = host.querySelector('.pkt-inputwrapper__helptext')
+    expect(helptext?.id).toBeTruthy()
+
+    const control = host.querySelector(CONTROL)
+    expect(control).not.toBeNull()
+    expect(control?.getAttribute('aria-describedby')?.split(' ')).toContain(helptext?.id)
+  })
+
+  test('pkt-timepicker describes both spinbuttons with the helptext', async () => {
+    const host = await mount('pkt-timepicker')
+
+    const helptext = host.querySelector('.pkt-inputwrapper__helptext')
+    expect(helptext?.id).toBeTruthy()
+
+    const spinbuttons = host.querySelectorAll('[role="spinbutton"]')
+    expect(spinbuttons).toHaveLength(2)
+    spinbuttons.forEach((spinbutton) => {
+      expect(spinbutton.getAttribute('aria-describedby')?.split(' ')).toContain(helptext?.id)
+    })
+  })
+
+  test('pkt-fileupload renders and links the helptext without a label', async () => {
+    document.body.innerHTML = `<pkt-fileupload id="felt" name="felt" helptext="Hjelpetekst"></pkt-fileupload>`
+    await customElements.whenDefined('pkt-fileupload')
+    const host = document.querySelector('pkt-fileupload') as HTMLElement & {
+      updateComplete: Promise<unknown>
+    }
+    await host.updateComplete
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    await host.updateComplete
+
+    const helptext = host.querySelector('.pkt-inputwrapper__helptext')
+    expect(helptext?.textContent).toContain('Hjelpetekst')
+
+    const input = host.querySelector('input[type="file"]')
+    expect(input?.getAttribute('aria-describedby')?.split(' ')).toContain(helptext?.id)
+    expect(input?.getAttribute('aria-label')).toBe('Velg fil')
+  })
+
+  test('no label carries the description', async () => {
+    for (const [tag, attrs] of cases) {
+      const host = await mount(tag, attrs)
+      const labels = host.querySelectorAll('label[aria-describedby], legend[aria-describedby]')
+      expect(labels).toHaveLength(0)
+    }
+  })
+
+  test('nothing points at an element that is not rendered', async () => {
+    for (const [tag, attrs] of [...cases, ['pkt-timepicker', ''] as [string, string]]) {
+      const host = await mount(tag, attrs)
+      host.querySelectorAll('[aria-describedby]').forEach((el) => {
+        el.getAttribute('aria-describedby')
+          ?.split(' ')
+          .filter(Boolean)
+          .forEach((id) => {
+            expect(`${tag} ${attrs} -> ${document.getElementById(id) ? 'finnes' : 'mangler'}`).toBe(
+              `${tag} ${attrs} -> finnes`,
+            )
+          })
+      })
+    }
+  })
+})