diff --git a/package.json b/package.json index 9e5b0c9..42c2ca0 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "default": "./dist/utils/*.js" }, "./styles/ember-drag-sort.css": "./dist/styles/ember-drag-sort.css", - "./dist/_app_/*": "./dist/_app_/*.js" + "./_app_/*": "./dist/_app_/*" }, "files": [ "addon-main.cjs", diff --git a/rollup.config.mjs b/rollup.config.mjs index 2c21440..b6e1d87 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -52,7 +52,7 @@ export default { !process.env.SKIP_DECLARATIONS && addon.declarations( 'declarations', - `pnpm tsc --declaration --project ${tsConfig}`, + `pnpm ember-tsc --declaration --project ${tsConfig}`, ), // addons are allowed to contain imports of .css files, which we want rollup diff --git a/src/components/drag-sort-item.gts b/src/components/drag-sort-item.gts index de6fc1f..77d2dc5 100644 --- a/src/components/drag-sort-item.gts +++ b/src/components/drag-sort-item.gts @@ -17,6 +17,7 @@ function getComputedStyleInt(element: HTMLElement, cssProp: string) { } interface DragSortItemSignature { + Element: HTMLElement; Args: { additionalArgs?: object; determineForeignPositionAction?: unknown; @@ -27,14 +28,18 @@ interface DragSortItemSignature { element: HTMLElement; draggedItem: Item; }) => void; - group: string; + group?: string; handle?: string; index: number; - isHorizontal: boolean; + isHorizontal?: boolean; isRtl?: boolean; item: Item; items: Array; sourceOnly: boolean; + tagName?: string; + }; + Blocks: { + default: []; }; } diff --git a/src/components/drag-sort-list.gts b/src/components/drag-sort-list.gts index a71a956..0576445 100644 --- a/src/components/drag-sort-list.gts +++ b/src/components/drag-sort-list.gts @@ -19,13 +19,18 @@ interface DragSortListSignature { }) => number; draggingEnabled?: boolean; dragEndAction?: unknown; - dragStartAction?: unknown; + dragStartAction?: (args: { + event: DragEvent; + element: HTMLElement; + draggedItem: Item; + }) => void; handle?: string; items: Array; isHorizontal?: boolean; isRtl?: boolean; group?: string; sourceOnly?: boolean; + tagName?: string; }; Blocks: { default: [item: Item, index: number]; diff --git a/src/index.js b/src/index.ts similarity index 94% rename from src/index.js rename to src/index.ts index eee44d2..b600f88 100644 --- a/src/index.js +++ b/src/index.ts @@ -1,4 +1,3 @@ -// Public API export { default as DragSortList } from './components/drag-sort-list.gts'; export { default as DragSortItem } from './components/drag-sort-item.gts'; export { default as DragSortService } from './services/drag-sort.ts'; diff --git a/src/services/drag-sort.ts b/src/services/drag-sort.ts index 5c242a2..14a668c 100644 --- a/src/services/drag-sort.ts +++ b/src/services/drag-sort.ts @@ -52,8 +52,8 @@ export default class DragSort extends Service { item: Item; index: number; items: Array; - group: string; - isHorizontal: boolean; + group?: string; + isHorizontal?: boolean; }) { setProperties(this, { isDragging: true,