From cb341167c3ef62bdf1e52b5b2ff6e5047bb9aac5 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@icloud.com>
Date: Mon, 4 Apr 2022 19:30:54 +0000
Subject: [PATCH] chore(): clean up merge conflicts

---
 core/src/components/header/header.tsx               | 2 +-
 core/src/components/item/item.tsx                   | 2 +-
 core/src/components/refresher/test/test.utils.ts    | 2 +-
 core/src/components/reorder-group/reorder-group.tsx | 1 -
 core/src/utils/test/utils.ts                        | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/components/header/header.tsx b/core/src/components/header/header.tsx
index bfbb2c0459..874db7d13c 100644
--- a/core/src/components/header/header.tsx
+++ b/core/src/components/header/header.tsx
@@ -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 {
diff --git a/core/src/components/item/item.tsx b/core/src/components/item/item.tsx
index 8766893107..411f1daebd 100644
--- a/core/src/components/item/item.tsx
+++ b/core/src/components/item/item.tsx
@@ -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';
diff --git a/core/src/components/refresher/test/test.utils.ts b/core/src/components/refresher/test/test.utils.ts
index fee4581805..7d0732aeb5 100644
--- a/core/src/components/refresher/test/test.utils.ts
+++ b/core/src/components/refresher/test/test.utils.ts
@@ -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');
diff --git a/core/src/components/reorder-group/reorder-group.tsx b/core/src/components/reorder-group/reorder-group.tsx
index be29982d7a..aecc89f310 100644
--- a/core/src/components/reorder-group/reorder-group.tsx
+++ b/core/src/components/reorder-group/reorder-group.tsx
@@ -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 {
diff --git a/core/src/utils/test/utils.ts b/core/src/utils/test/utils.ts
index 6ab344dfef..aca6b65655 100644
--- a/core/src/utils/test/utils.ts
+++ b/core/src/utils/test/utils.ts
@@ -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;