Merge branch 'master' into move-to-glint-v2

mkszepp · mkszepp · commit efeca3e8914a · 2025-12-12T20:27:34.000+01:00
diff --git a/ember-basic-dropdown/src/components/basic-dropdown-trigger.gts b/ember-basic-dropdown/src/components/basic-dropdown-trigger.gts
@@ -21,7 +21,7 @@ export interface BasicDropdownTriggerSignature<
     hPosition?: HorizontalPosition | null;
     defaultClass?: string;
     renderInPlace?: boolean;
-    htmlTag?: T;
+    htmlTag?: T | undefined;
     onBlur?: (dropdown?: Dropdown, event?: FocusEvent) => void;
     onClick?: (dropdown?: Dropdown, event?: MouseEvent) => void;
     onFocus?: (dropdown?: Dropdown, event?: FocusEvent) => void;
diff --git a/ember-basic-dropdown/src/components/basic-dropdown.gts b/ember-basic-dropdown/src/components/basic-dropdown.gts
@@ -539,6 +539,7 @@ export default class BasicDropdown<
           hPosition=this.hPosition
           renderInPlace=this.renderInPlace
           vPosition=this.vPosition
+          htmlTag=@triggerHtmlTag
         )
         Content=(component
           this.contentComponent

Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,7 @@ export default class BasicDropdown<`
`539`	`539`	`hPosition=this.hPosition`
`540`	`540`	`renderInPlace=this.renderInPlace`
`541`	`541`	`vPosition=this.vPosition`
	`542`	`+ htmlTag=@triggerHtmlTag`
`542`	`543`	`)`
`543`	`544`	`Content=(component`
`544`	`545`	`this.contentComponent`