Merge pull request #59 from Gavant/update-power-select-types

Update power select types
Gavant · Nov 8, 2022 · e73817d · e73817d
2 parents 0655195 + ad4a563
commit e73817d
Show file tree

Hide file tree

Showing 24 changed files with 386 additions and 722 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
         "@types/ember__template": "^4.0.0",
         "auto-changelog": "^2.4.0",
         "ember-animated": "^1.0.0",
-        "ember-basic-dropdown": "^6.0.0",
+        "ember-basic-dropdown": "^6.0.1",
         "ember-concurrency": "^2.0.3",
         "ember-concurrency-async": "^1.0.0",
         "ember-concurrency-ts": "^0.3.0",

diff --git a/types/@gavant/ember-power-select-infinity/options.d.ts b/types/@gavant/ember-power-select-infinity/options.d.ts
diff --git a/types/@gavant/ember-power-select-infinity/power-select-infinity.d.ts b/types/@gavant/ember-power-select-infinity/power-select-infinity.d.ts
diff --git a/types/@gavant/ember-power-select-infinity/power-select-infinity/for-model.d.ts b/types/@gavant/ember-power-select-infinity/power-select-infinity/for-model.d.ts
diff --git a/types/ember-basic-dropdown/content.d.ts → ...wn/components/basic-dropdown-content.d.ts b/types/ember-basic-dropdown/content.d.ts → ...wn/components/basic-dropdown-content.d.ts
@@ -1,16 +1,14 @@
 import Component from '@glimmer/component';
 
-import { Dropdown } from 'ember-basic-dropdown/addon/components/basic-dropdown';
+import { Dropdown, RepositionChanges } from './basic-dropdown';
 
-export interface DropdownContentArgs {
+interface Args {
     transitioningInClass?: string;
     transitionedInClass?: string;
     transitioningOutClass?: string;
     isTouchDevice?: boolean;
     destination: string;
     dropdown: Dropdown;
-    hPosition: string;
-    vPosition: string;
     renderInPlace: boolean;
     preventScroll?: boolean;
     rootEventType: 'click' | 'mousedown';
@@ -24,16 +22,18 @@ export interface DropdownContentArgs {
     onFocusOut?: (dropdown?: Dropdown, event?: FocusEvent) => void;
     onMouseEnter?: (dropdown?: Dropdown, event?: MouseEvent) => void;
     onMouseLeave?: (dropdown?: Dropdown, event?: MouseEvent) => void;
-    shouldReposition?: (mutations: MutationRecord[], dropdown: Dropdown) => boolean;
+    shouldReposition: (mutations: MutationRecord[], dropdown: Dropdown) => boolean;
+    hPosition: RepositionChanges['hPosition'];
+    vPosition: RepositionChanges['vPosition'];
 }
+type RootMouseDownHandler = (ev: MouseEvent | TouchEvent) => void;
 
 export interface DropdownContentSignature {
     Element: HTMLElement;
-    Args: DropdownContentArgs;
+    Args: Args;
     Blocks: {
         default?: [];
     };
 }
 
-export class DropdownContent extends Component<DropdownContentSignature> {}
-export default DropdownContent;
+export default class BasicDropdownContent extends Component<DropdownContentSignature> {}
diff --git a/types/ember-basic-dropdown/trigger.d.ts → ...wn/components/basic-dropdown-trigger.d.ts b/types/ember-basic-dropdown/trigger.d.ts → ...wn/components/basic-dropdown-trigger.d.ts
@@ -1,15 +1,11 @@
 import Component from '@glimmer/component';
 
-import { Dropdown } from 'ember-basic-dropdown/addon/components/basic-dropdown';
+import { Dropdown, RepositionChanges } from './basic-dropdown';
 
-export interface DropdownTriggerArgs {
+interface Args {
     dropdown: Dropdown;
     eventType: 'click' | 'mousedown';
     stopPropagation: boolean;
-    hPosition: string;
-    renderInPlace: boolean;
-    vPosition: string;
-    htmlTag?: string;
     onBlur?: (dropdown?: Dropdown, event?: FocusEvent) => void;
     onClick?: (dropdown?: Dropdown, event?: MouseEvent) => void;
     onFocus?: (dropdown?: Dropdown, event?: FocusEvent) => void;
@@ -20,15 +16,17 @@ export interface DropdownTriggerArgs {
     onMouseEnter?: (dropdown?: Dropdown, event?: MouseEvent) => void;
     onMouseLeave?: (dropdown?: Dropdown, event?: MouseEvent) => void;
     onTouchEnd?: (dropdown?: Dropdown, event?: TouchEvent) => void;
+    hPosition: RepositionChanges['hPosition'];
+    vPosition: RepositionChanges['vPosition'];
+    renderInPlace: boolean;
 }
 
 export interface DropdownTriggerSignature {
     Element: HTMLElement;
-    Args: DropdownTriggerArgs;
+    Args: Args;
     Blocks: {
         default: [];
     };
 }
 
-export class DropdownTrigger extends Component<DropdownTriggerSignature> {}
-export default DropdownTrigger;
+export default class BasicDropdownTrigger extends Component<DropdownTriggerSignature> {}
diff --git a/types/ember-basic-dropdown/dropdown.d.ts → ...c-dropdown/components/basic-dropdown.d.ts b/types/ember-basic-dropdown/dropdown.d.ts → ...c-dropdown/components/basic-dropdown.d.ts
@@ -1,14 +1,26 @@
+import { action } from '@ember/object';
 import Component from '@glimmer/component';
 
-import { DropdownActions } from 'ember-basic-dropdown/addon/components/basic-dropdown';
-import { CalculatePosition } from 'ember-basic-dropdown/addon/utils/calculate-position';
+import { WithBoundArgs } from '@glint/template';
 
-import { DropdownContent } from '@gavant/glint-template-types/types/ember-basic-dropdown/content';
-import { DropdownTrigger } from '@gavant/glint-template-types/types/ember-basic-dropdown/trigger';
+import { CalculatePosition } from '../utils/calculate-position';
+import DropdownContent from './basic-dropdown-content';
+import DropdownTrigger from './basic-dropdown-trigger';
 
-import { WithBoundArgs } from '@glint/template';
+export interface DropdownActions {
+    toggle: (e?: Event) => void;
+    close: (e?: Event, skipFocus?: boolean) => void;
+    open: (e?: Event) => void;
+    reposition: (...args: any[]) => undefined | RepositionChanges;
+}
+export interface Dropdown {
+    uniqueId: string;
+    disabled: boolean;
+    isOpen: boolean;
+    actions: DropdownActions;
+}
 
-export interface DropdownArgs {
+interface Args {
     initiallyOpened?: boolean;
     renderInPlace?: boolean;
     verticalPosition?: string;
@@ -24,9 +36,20 @@ export interface DropdownArgs {
     calculatePosition?: CalculatePosition;
 }
 
-export interface DropdownSignature {
+type RepositionChanges = {
+    hPosition: string;
+    vPosition: string;
+    otherStyles: Record<string, string | number | undefined>;
+    top?: string;
+    left?: string;
+    right?: string;
+    width?: string;
+    height?: string;
+};
+
+export interface BasicDropdownSignature {
     Element: HTMLDivElement;
-    Args: DropdownArgs;
+    Args: Args;
     Blocks: {
         default: [
             {
@@ -59,5 +82,4 @@ export interface DropdownSignature {
     };
 }
 
-export class Dropdown extends Component<DropdownSignature> {}
-export default Dropdown;
+export default class BasicDropdown extends Component<BasicDropdownSignature> {}
diff --git a/types/ember-basic-dropdown/utils/calculate-position.d.ts b/types/ember-basic-dropdown/utils/calculate-position.d.ts
@@ -0,0 +1,28 @@
+interface CalculatePositionOptions {
+    horizontalPosition: string;
+    verticalPosition: string;
+    matchTriggerWidth: boolean;
+    previousHorizontalPosition?: string;
+    previousVerticalPosition?: string;
+    renderInPlace: boolean;
+    dropdown: any;
+}
+export type CalculatePositionResultStyle = {
+    top?: number;
+    left?: number;
+    right?: number;
+    width?: number;
+    height?: number;
+    [key: string]: string | number | undefined;
+};
+export type CalculatePositionResult = {
+    horizontalPosition: string;
+    verticalPosition: string;
+    style: CalculatePositionResultStyle;
+};
+export type CalculatePosition = (
+    trigger: Element,
+    content: HTMLElement,
+    destination: HTMLElement,
+    options: CalculatePositionOptions
+) => CalculatePositionResult;