Skip to content

Commit 0b0d1bc

Browse files
committed
Drop support for passing components as string & remove dependency of @embroider/util
1 parent 91345a5 commit 0b0d1bc

4 files changed

Lines changed: 11 additions & 95 deletions

File tree

ember-basic-dropdown/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
"dependencies": {
6464
"@embroider/addon-shim": "^1.10.2",
6565
"@embroider/macros": "^1.19.5",
66-
"@embroider/util": "^1.13.5",
6766
"decorator-transforms": "^2.3.0",
6867
"ember-element-helper": "^0.8.8",
6968
"ember-modifier": "^4.2.2",

ember-basic-dropdown/src/components/basic-dropdown.gts

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { schedule } from '@ember/runloop';
1515
import type { ComponentLike } from '@glint/template';
1616
import type { BasicDropdownTriggerSignature } from './basic-dropdown-trigger.ts';
1717
import type { BasicDropdownContentSignature } from './basic-dropdown-content.ts';
18-
import { ensureSafeComponent } from '@embroider/util';
1918
import { hash } from '@ember/helper';
2019
import BasicDropdownTrigger from './basic-dropdown-trigger.gts';
2120
import 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>

ember-basic-dropdown/src/types/global.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import '@glint/environment-ember-loose';
22

33
import type EmberTruthRegistry from 'ember-truth-helpers/template-registry';
4-
import type { EmbroiderUtilRegistry } from '@embroider/util';
54
import type EmberElementHelperRegistry from 'ember-element-helper/template-registry';
65

76
// export interface StyleHelperRegistry {
@@ -18,7 +17,6 @@ declare module '@glint/environment-ember-loose/registry' {
1817
export default interface Registry
1918
extends
2019
EmberTruthRegistry,
21-
EmbroiderUtilRegistry,
2220
EmberElementHelperRegistry /* other registries here */ {
2321
// ...
2422
}

pnpm-lock.yaml

Lines changed: 1 addition & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)