Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
5 changes: 3 additions & 2 deletions packages/devextreme/js/__internal/events/m_swipe.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import type { Cancelable } from '@js/common/core/events';
import registerEmitter from '@js/common/core/events/core/emitter_registrator';
import GestureEmitter from '@js/common/core/events/gesture/emitter.gesture';
import { eventData } from '@js/common/core/events/utils/index';
import { eventData } from '@js/common/core/events/utils';
import { getHeight, getWidth } from '@js/core/utils/size';

const SWIPE_START_EVENT = 'dxswipestart';
const SWIPE_EVENT = 'dxswipe';
const SWIPE_END_EVENT = 'dxswipeend';

export type SwipeStartEvent = Event & {
export type SwipeStartEvent = Event & Cancelable & {
maxLeftOffset: number;
maxRightOffset: number;
};
Expand Down
3 changes: 1 addition & 2 deletions packages/devextreme/js/__internal/ui/accordion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,7 @@ class Accordion extends CollectionWidgetLiveUpdate<AccordionProperties, Item, Co
skipAnimation: boolean,
): DeferredObj<unknown> {
const $title = $item.children(`.${ACCORDION_ITEM_TITLE_CLASS}`);
// @ts-expect-error ts-error
if (fx.isAnimating($item)) {
if (fx.isAnimating($item.get(0))) {
fx.stop($item.get(0), false);
}

Expand Down
6 changes: 2 additions & 4 deletions packages/devextreme/js/__internal/ui/calendar/m_calendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,8 @@ class Calendar<
}

_updateCurrentDate(date: Date): void {
// @ts-expect-error ts-error
if (fx.isAnimating(this._$viewsWrapper)) {
// @ts-expect-error ts-error
fx.stop(this._$viewsWrapper, true);
if (fx.isAnimating(this._$viewsWrapper.get(0))) {
fx.stop(this._$viewsWrapper.get(0), true);
}

const min = this._getMinDate();
Expand Down
9 changes: 5 additions & 4 deletions packages/devextreme/js/__internal/ui/list/list.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -943,13 +943,14 @@ export class ListBase extends CollectionWidget<ListBaseProperties, Item> {

$group.toggleClass(LIST_GROUP_COLLAPSED_CLASS, toggle);

// @ts-expect-error ts-error
if (fx.isAnimating($groupBody)) {
fx.stop($groupBody.get(0), false);
const groupBodyElement = $groupBody.get(0);

if (fx.isAnimating(groupBodyElement)) {
fx.stop(groupBodyElement, false);
}

// eslint-disable-next-line @typescript-eslint/no-floating-promises
fx.animate($groupBody.get(0), {
fx.animate(groupBodyElement, {
// @ts-expect-error fx.animate does not have proper typing
type: 'custom',
// @ts-expect-error fx.animate does not have proper typing
Expand Down
Loading
Loading