TestKit.index - remove old and add new drivers

src/components/carousel/Carousel.driver.ts

@@ -1,5 +1,5 @@
 import {CarouselProps} from './types';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class CarouselDriver extends ComponentDriver<CarouselProps> {
   getContentOffset = async () => (await this.getElementProps()).contentOffset;

src/components/hint/Hint.driver.ts

@@ -1,5 +1,5 @@
 import {HintProps} from './index';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class HintDriver extends ComponentDriver<HintProps> {
 

src/components/image/Image.driver.ts

@@ -1,4 +1,4 @@
 import {ImageProps} from './index';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class ImageDriver extends ComponentDriver<ImageProps> {}

src/components/picker/Picker.driver.ts

@@ -1,5 +1,5 @@
 import {PickerProps} from './types';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class PickerDriver extends ComponentDriver<PickerProps> {
   getPickerOverlay = async () => await this.getByTestId(`${this.testID}.overlay`);

src/components/radioButton/RadioButton.driver.ts

@@ -1,6 +1,7 @@
 import {RadioButtonProps} from './index';
-import {ComponentDriver, ImageDriver, TextDriver} from '../../testkit';
-import {ComponentDriverArgs} from '../../testkit/Component.driver';
+import {ComponentDriver, ComponentDriverArgs} from '../../testkit/Component.driver';
+import {ImageDriver} from '../image/Image.driver';
+import {TextDriver} from '../text/Text.driver';
 
 export class RadioButtonDriver extends ComponentDriver<RadioButtonProps> {
   private readonly labelDriver: TextDriver;

src/components/radioGroup/RadioGroup.driver.ts

@@ -1,7 +1,6 @@
 import {RadioGroupProps} from './index';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver, ComponentDriverArgs} from '../../testkit/Component.driver';
 import {RadioButtonDriver} from '../radioButton/RadioButton.driver';
-import {ComponentDriverArgs} from '../../testkit/Component.driver';
 
 type RadioGroupDriverArgs = ComponentDriverArgs & {testIDs: {[key: string]: string}}
 

src/components/slider/slider.driver.ts

@@ -1,5 +1,5 @@
 import {SliderProps} from './index';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class SliderDriver extends ComponentDriver<SliderProps> {
   isDisabled = async () => (await this.getElementProps()).accessibilityState?.disabled === true;

src/components/switch/switch.driver.ts

@@ -1,5 +1,5 @@
 import {SwitchProps} from './index';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class SwitchDriver extends ComponentDriver<SwitchProps> {
   getAccessibilityValue = async () => (await this.getElementProps()).accessibilityValue?.text === '1';

src/components/text/Text.driver.ts

@@ -1,5 +1,5 @@
 import {TextProps} from './index';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class TextDriver extends ComponentDriver<TextProps> {
   getTextContent = async () => {

src/incubator/Dialog/__tests__/index.spec.tsx

@@ -2,7 +2,8 @@ import React, {useCallback, useEffect, useState} from 'react';
 import Button from '../../../components/button';
 import View from '../../../components/view';
 import Dialog from '../index';
-import {ButtonDriver, ComponentDriver} from '../../../testkit';
+import {ComponentDriver} from '../../../testkit/Component.driver';
+import {ButtonDriver} from '../../../components/button/Button.driver';
 
 const onDismiss = () => {};
 

src/incubator/Slider/Slider.driver.ts

@@ -1,5 +1,5 @@
 import {SliderProps} from './index';
-import {ComponentDriver} from '../../testkit';
+import {ComponentDriver} from '../../testkit/Component.driver';
 
 export class SliderDriver extends ComponentDriver<SliderProps> {
   isDisabled = async () => (await this.getElementProps()).accessibilityState?.disabled === true;

src/testkit/index.ts

@@ -1,16 +1,11 @@
-export {ComponentDriver} from './Component.driver';
-export {ImageDriver} from '../components/image/Image.driver';
-export {TextDriver} from '../components/text/Text.driver';
-export {SwitchDriver} from '../components/switch/switch.driver';
-export {ButtonDriver} from '../components/button/Button.driver';
-export {TextFieldDriver} from '../components/textField/TextField.driver';
-export {PickerDriver} from '../components/picker/Picker.driver';
-export {CarouselDriver} from '../components/carousel/Carousel.driver';
-export {CheckboxDriver} from '../components/checkbox/Checkbox.driver';
-export {HintDriver} from '../components/hint/Hint.driver';
-export {RadioButtonDriver} from '../components/radioButton/RadioButton.driver';
-export {RadioGroupDriver} from '../components/radioGroup/RadioGroup.driver';
-export {SortableListItemDriver} from '../components/sortableList/SortableListItem.driver';
-export {SliderDriver} from '../components/slider/slider.driver';
-export {SliderDriver as IncubatorSliderDriver} from '../incubator/Slider/Slider.driver';
+export {useComponentDriver, ComponentProps} from './new/Component.driver';
+export {usePressableDriver} from './new/usePressable.driver';
+export {useScrollableDriver} from './new/useScrollable.driver';
+export {useDraggableDriver} from './new/useDraggable.driver';
+
 export {ViewDriver} from '../components/view/View.driver.new';
+export {TextDriver} from '../components/text/Text.driver.new';
+export {CarouselDriver} from '../components/carousel/Carousel.driver.new';
+export {SortableListDriver} from '../components/sortableList/SortableList.driver.new';
+export {SortableListItemDriver} from '../components/sortableList/SortableListItem.driver.new';
+export {CheckboxDriver} from '../components/checkbox/Checkbox.driver';