javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-09 08:09:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): sync with main

Browse Source
This commit is contained in:
Liam DeBeasi
2023-01-23 13:38:16 -05:00
parent a7c2c555f3 c6620c7c74
commit e8fb9e7328
377 changed files with 22590 additions and 6878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/components/picker-column/picker-column.tsx
View File

@ -5,6 +5,7 @@ import { getIonMode } from '../../global/ionic-global';
import type { Gesture, GestureDetail, PickerColumn } from '../../interface';
import { clamp } from '../../utils/helpers';
import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '../../utils/native/haptic';
import { getClassMap } from '../../utils/theme';
/**
* @internal
@ -28,8 +29,8 @@ export class PickerColumnCmp implements ComponentInterface {
private y = 0;
private optsEl?: HTMLElement;
private gesture?: Gesture;
private rafId: any;
private tmrId: any;
private rafId?: ReturnType<typeof requestAnimationFrame>;
private tmrId?: ReturnType<typeof setTimeout>;
private noAnimate = true;
@Element() el!: HTMLElement;
@ -90,8 +91,8 @@ export class PickerColumnCmp implements ComponentInterface {
}
disconnectedCallback() {
cancelAnimationFrame(this.rafId);
clearTimeout(this.tmrId);
if (this.rafId !== undefined) cancelAnimationFrame(this.rafId);
if (this.tmrId) clearTimeout(this.tmrId);
if (this.gesture) {
this.gesture.destroy();
this.gesture = undefined;
@ -110,7 +111,7 @@ export class PickerColumnCmp implements ComponentInterface {
this.velocity = 0;
// set what y position we're at
cancelAnimationFrame(this.rafId);
if (this.rafId !== undefined) cancelAnimationFrame(this.rafId);
this.update(y, duration, true);
this.emitColChange();
@ -253,7 +254,7 @@ export class PickerColumnCmp implements ComponentInterface {
hapticSelectionStart();
// reset everything
cancelAnimationFrame(this.rafId);
if (this.rafId !== undefined) cancelAnimationFrame(this.rafId);
const options = this.col.options;
let minY = options.length - 1;
let maxY = 0;
@ -370,6 +371,7 @@ export class PickerColumnCmp implements ComponentInterface {
'picker-col': true,
'picker-opts-left': this.col.align === 'left',
'picker-opts-right': this.col.align === 'right',
...getClassMap(col.cssClass),
}}
style={{
'max-width': this.col.columnWidth,

17
core/src/components/picker-column/test/picker-column.spec.tsx Normal file
View File

@ -0,0 +1,17 @@
import { h } from '@stencil/core';
import { newSpecPage } from '@stencil/core/testing';
import { PickerColumnCmp } from '../picker-column';
describe('picker-column', () => {
it('should add class to host of component', async () => {
const col = { cssClass: 'test-class', options: [] };
const page = await newSpecPage({
components: [PickerColumnCmp],
template: () => <ion-picker-column col={col}></ion-picker-column>,
});
const pickerCol = page.body.querySelector('ion-picker-column');
expect(pickerCol.classList.contains('test-class')).toBe(true);
});
});