javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): clean up merge conflicts

Browse Source
This commit is contained in:
Liam DeBeasi
2022-04-04 19:30:54 +00:00
parent 083a31acdc
commit cb341167c3
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/header/header.tsx
View File

@@ -6,7 +6,7 @@ import { Component, Element, Host, Prop, h, writeTask } from '@stencil/core';
import { getIonMode } from '../../global/ionic-global';
import type { Attributes } from '../../utils/helpers';
import { componentOnReady, inheritAttributes } from '../../utils/helpers';
import { inheritAttributes } from '../../utils/helpers';
import { hostContext } from '../../utils/theme';
import {

2
core/src/components/item/item.tsx
View File

@@ -1,6 +1,6 @@
import type { ComponentInterface } from '@stencil/core';
import { Component, Element, Host, Listen, Prop, State, forceUpdate, h } from '@stencil/core';
import { Component, Element, Host, Listen, Prop, State, Watch, forceUpdate, h } from '@stencil/core';
import { printIonError } from '@utils/logging';
import { chevronForward } from 'ionicons/icons';

2
core/src/components/refresher/test/test.utils.ts
View File

@@ -12,7 +12,7 @@ import { dragElementBy } from '@utils/test';
* @param selector The element selector to center the drag gesture on. Defaults to `body`.
*/
const pullToRefresh = async (page: E2EPage, selector = 'body') => {
const target = await page.$(selector);
const target = (await page.$(selector))!;
await dragElementBy(target, page, 0, 200);
const ev = await page.spyOnEvent('ionRefreshComplete', 'document');

1
core/src/components/reorder-group/reorder-group.tsx
View File

@@ -6,7 +6,6 @@ import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '
import { getIonMode } from '../../global/ionic-global';
import type { Gesture, GestureDetail, ItemReorderEventDetail } from '../../interface';
import { componentOnReady } from '../../utils/helpers';
import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '../../utils/native/haptic';
const enum ReorderGroupState {

2
core/src/utils/test/utils.ts
View File

@@ -101,7 +101,7 @@ export const dragElementBy = async (
startCoordinates?: { x: number; y: number }
): Promise<void> => {
try {
const boundingBox = await element.boundingBox();
const boundingBox = (await element.boundingBox())!;
const startX = startCoordinates?.x === undefined ? boundingBox.x + boundingBox.width / 2 : startCoordinates.x;
const startY = startCoordinates?.y === undefined ? boundingBox.y + boundingBox.height / 2 : startCoordinates.y;