Skip to content

Commit

Permalink
fix(sortablejs): model updates with disabled elements
Browse files Browse the repository at this point in the history
  • Loading branch information
HitkoDev committed Dec 9, 2024
1 parent 7ed1dc5 commit 578dd7f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 21 deletions.
3 changes: 0 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn commitlint --edit $1
2 changes: 1 addition & 1 deletion commitlint.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ module.exports = {
'@liquid-js/commitlint-plugin-workspace-scopes'
],
rules: {
'scope-enum': [2, 'always', {}]
'scope-enum': [2, 'always', { stripPrefix: ['nxt-'] }]
}
}
18 changes: 1 addition & 17 deletions packages/sortablejs/src/lib/sortablejs.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,6 @@ import { SortablejsService } from './sortablejs.service'
export type SortableData<T> = [T] extends [AbstractControl] ? (FormArray<T> | T[]) : T[]
export type CloneFunction<T> = (item: T) => T

/** @internal */
const getIndexesFromEvent = (event: SortableEvent) => {
if (event.hasOwnProperty('newDraggableIndex') && event.hasOwnProperty('oldDraggableIndex')) {
return {
new: event.newDraggableIndex,
old: event.oldDraggableIndex
}
} else {
return {
new: event.newIndex,
old: event.oldIndex
}
}
}

@Directive({
selector: '[nxtSortablejs]',
standalone: false
Expand Down Expand Up @@ -201,9 +186,8 @@ export class SortablejsDirective<T> implements OnInit, OnChanges, OnDestroy {
},
onUpdate: (event: SortableEvent) => {
const bindings = this.getBindings()
const indexes = getIndexesFromEvent(event)

bindings.injectIntoEvery(indexes.new!, bindings.extractFromEvery(indexes.old!))
bindings.injectIntoEvery(event.newIndex!, bindings.extractFromEvery(event.oldIndex!))
this.proxyEvent('onUpdate', event)
}
}
Expand Down

0 comments on commit 578dd7f

Please sign in to comment.