@@ -15,7 +15,6 @@ import { schedule } from '@ember/runloop';
1515import type { ComponentLike } from ' @glint/template' ;
1616import type { BasicDropdownTriggerSignature } from ' ./basic-dropdown-trigger.ts' ;
1717import type { BasicDropdownContentSignature } from ' ./basic-dropdown-content.ts' ;
18- import { ensureSafeComponent } from ' @embroider/util' ;
1918import { hash } from ' @ember/helper' ;
2019import BasicDropdownTrigger from ' ./basic-dropdown-trigger.gts' ;
2120import BasicDropdownContent from ' ./basic-dropdown-content.gts' ;
@@ -69,14 +68,8 @@ export interface BasicDropdownArgs {
6968 registerAPI? : (dropdown : Dropdown | null ) => void ;
7069 onOpen? : (dropdown : Dropdown , e ? : Event ) => boolean | void ;
7170 onClose? : (dropdown : Dropdown , e ? : Event ) => boolean | void ;
72- triggerComponent? :
73- | string
74- | ComponentLike <BasicDropdownTriggerSignature >
75- | undefined ;
76- contentComponent? :
77- | string
78- | ComponentLike <BasicDropdownContentSignature >
79- | undefined ;
71+ triggerComponent? : ComponentLike <BasicDropdownTriggerSignature > | undefined ;
72+ contentComponent? : ComponentLike <BasicDropdownContentSignature > | undefined ;
8073 calculatePosition? : CalculatePosition ;
8174}
8275
@@ -499,25 +492,17 @@ export default class BasicDropdown extends Component<BasicDropdownSignature> {
499492 }
500493
501494 get triggerComponent(): ComponentLike <BasicDropdownTriggerSignature > {
502- if (this .args .triggerComponent ) {
503- return ensureSafeComponent (
504- this .args .triggerComponent ,
505- this ,
506- ) as ComponentLike <BasicDropdownTriggerSignature >;
507- }
508-
509- return BasicDropdownTrigger as ComponentLike <BasicDropdownTriggerSignature >;
495+ return (
496+ this .args .triggerComponent ||
497+ (BasicDropdownTrigger as ComponentLike <BasicDropdownTriggerSignature >)
498+ );
510499 }
511500
512501 get contentComponent(): ComponentLike <BasicDropdownContentSignature > {
513- if (this .args .contentComponent ) {
514- return ensureSafeComponent (
515- this .args .contentComponent ,
516- this ,
517- ) as ComponentLike <BasicDropdownContentSignature >;
518- }
519-
520- return BasicDropdownContent as ComponentLike <BasicDropdownContentSignature >;
502+ return (
503+ this .args .contentComponent ||
504+ (BasicDropdownContent as ComponentLike <BasicDropdownContentSignature >)
505+ );
521506 }
522507
523508 <template >
0 commit comments