Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ember-basic-dropdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"dependencies": {
"@embroider/addon-shim": "^1.10.2",
"@embroider/macros": "^1.19.5",
"@embroider/util": "^1.13.5",
"decorator-transforms": "^2.3.0",
"ember-element-helper": "^0.8.8",
"ember-modifier": "^4.2.2",
Expand Down
35 changes: 10 additions & 25 deletions ember-basic-dropdown/src/components/basic-dropdown.gts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { schedule } from '@ember/runloop';
import type { ComponentLike } from '@glint/template';
import type { BasicDropdownTriggerSignature } from './basic-dropdown-trigger.ts';
import type { BasicDropdownContentSignature } from './basic-dropdown-content.ts';
import { ensureSafeComponent } from '@embroider/util';
import { hash } from '@ember/helper';
import BasicDropdownTrigger from './basic-dropdown-trigger.gts';
import BasicDropdownContent from './basic-dropdown-content.gts';
Expand Down Expand Up @@ -69,14 +68,8 @@ export interface BasicDropdownArgs {
registerAPI?: (dropdown: Dropdown | null) => void;
onOpen?: (dropdown: Dropdown, e?: Event) => boolean | void;
onClose?: (dropdown: Dropdown, e?: Event) => boolean | void;
triggerComponent?:
| string
| ComponentLike<BasicDropdownTriggerSignature>
| undefined;
contentComponent?:
| string
| ComponentLike<BasicDropdownContentSignature>
| undefined;
triggerComponent?: ComponentLike<BasicDropdownTriggerSignature> | undefined;
contentComponent?: ComponentLike<BasicDropdownContentSignature> | undefined;
calculatePosition?: CalculatePosition;
}

Expand Down Expand Up @@ -499,25 +492,17 @@ export default class BasicDropdown extends Component<BasicDropdownSignature> {
}

get triggerComponent(): ComponentLike<BasicDropdownTriggerSignature> {
if (this.args.triggerComponent) {
return ensureSafeComponent(
this.args.triggerComponent,
this,
) as ComponentLike<BasicDropdownTriggerSignature>;
}

return BasicDropdownTrigger as ComponentLike<BasicDropdownTriggerSignature>;
return (
this.args.triggerComponent ||
(BasicDropdownTrigger as ComponentLike<BasicDropdownTriggerSignature>)
);
}

get contentComponent(): ComponentLike<BasicDropdownContentSignature> {
if (this.args.contentComponent) {
return ensureSafeComponent(
this.args.contentComponent,
this,
) as ComponentLike<BasicDropdownContentSignature>;
}

return BasicDropdownContent as ComponentLike<BasicDropdownContentSignature>;
return (
this.args.contentComponent ||
(BasicDropdownContent as ComponentLike<BasicDropdownContentSignature>)
);
}

<template>
Expand Down
2 changes: 0 additions & 2 deletions ember-basic-dropdown/src/types/global.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import '@glint/environment-ember-loose';

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

// export interface StyleHelperRegistry {
Expand All @@ -18,7 +17,6 @@ declare module '@glint/environment-ember-loose/registry' {
export default interface Registry
extends
EmberTruthRegistry,
EmbroiderUtilRegistry,
EmberElementHelperRegistry /* other registries here */ {
// ...
}
Expand Down
68 changes: 1 addition & 67 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.