From 330fe672b393a0282d3d9dd228650e99e26a97cd Mon Sep 17 00:00:00 2001
From: M-i-k-e-l <michaelle@wix.com>
Date: Wed, 15 Feb 2023 16:26:23 +0200
Subject: [PATCH] WheelPicker - move from incubator

---
 demo/src/screens/MenuStructure.js                | 12 ++++++------
 .../SectionsWheelPickerScreen.tsx                |  7 +++----
 .../WheelPickerScreen.tsx                        | 16 ++++++++--------
 demo/src/screens/componentScreens/index.js       |  2 ++
 demo/src/screens/incubatorScreens/index.js       |  1 -
 .../WheelPicker/Item.tsx                         |  1 -
 .../WheelPicker/__tests__/index.spec.js          |  2 +-
 .../__tests__/useListMiddleIndex.spec.js         |  0
 .../WheelPicker/__tests__/usePresenter.spec.js   |  0
 .../WheelPicker/helpers/useListMiddleIndex.ts    |  0
 .../WheelPicker/index.tsx                        |  2 +-
 .../WheelPicker/types.ts                         |  0
 .../WheelPicker/usePresenter.ts                  |  0
 .../WheelPicker/wheelPicker.api.json             |  4 ++--
 src/components/picker/PickerItemsList.tsx        |  2 +-
 src/components/sectionsWheelPicker/index.tsx     |  2 +-
 src/incubator/index.ts                           |  2 --
 src/index.ts                                     |  9 ++++++---
 18 files changed, 31 insertions(+), 31 deletions(-)
 rename demo/src/screens/{incubatorScreens => componentScreens}/WheelPickerScreen.tsx (78%)
 rename src/{incubator => components}/WheelPicker/Item.tsx (98%)
 rename src/{incubator => components}/WheelPicker/__tests__/index.spec.js (98%)
 rename src/{incubator => components}/WheelPicker/__tests__/useListMiddleIndex.spec.js (100%)
 rename src/{incubator => components}/WheelPicker/__tests__/usePresenter.spec.js (100%)
 rename src/{incubator => components}/WheelPicker/helpers/useListMiddleIndex.ts (100%)
 rename src/{incubator => components}/WheelPicker/index.tsx (99%)
 rename src/{incubator => components}/WheelPicker/types.ts (100%)
 rename src/{incubator => components}/WheelPicker/usePresenter.ts (100%)
 rename src/{incubator => components}/WheelPicker/wheelPicker.api.json (95%)

diff --git a/demo/src/screens/MenuStructure.js b/demo/src/screens/MenuStructure.js
index 19b3749a5b..c4f306192f 100644
--- a/demo/src/screens/MenuStructure.js
+++ b/demo/src/screens/MenuStructure.js
@@ -71,7 +71,12 @@ export const navigationData = {
       {title: 'Slider', tags: 'slider', screen: 'unicorn.components.SliderScreen'},
       {title: 'Switch', tags: 'switch toggle', screen: 'unicorn.components.SwitchScreen'},
       {title: 'ChipsInput', tags: 'chips tags input form', screen: 'unicorn.components.ChipsInputScreen'},
-      {title: 'Masked Inputs', tags: 'text input form mask', screen: 'unicorn.components.MaskedInputScreen'}
+      {title: 'Masked Inputs', tags: 'text input form mask', screen: 'unicorn.components.MaskedInputScreen'},
+      {
+        title: 'WheelPicker',
+        tags: 'wheel picker spinner',
+        screen: 'unicorn.components.WheelPickerScreen'
+      }
     ]
   },
   Overlays: {
@@ -183,11 +188,6 @@ export const navigationData = {
         tags: 'text field expandable input picker',
         screen: 'unicorn.components.IncubatorExpandableOverlayScreen'
       },
-      {
-        title: 'WheelPicker (Incubator)',
-        tags: 'wheel picker spinner experimental',
-        screen: 'unicorn.incubator.WheelPickerScreen'
-      },
       {title: 'Pan View', tags: 'pan swipe drag', screen: 'unicorn.incubator.PanViewScreen'}
     ]
   },
diff --git a/demo/src/screens/componentScreens/SectionsWheelPickerScreen.tsx b/demo/src/screens/componentScreens/SectionsWheelPickerScreen.tsx
index b97d87cbe9..b0d3be56cc 100644
--- a/demo/src/screens/componentScreens/SectionsWheelPickerScreen.tsx
+++ b/demo/src/screens/componentScreens/SectionsWheelPickerScreen.tsx
@@ -7,14 +7,13 @@ import {
   SectionsWheelPicker,
   SegmentedControl,
   Button,
-  Incubator,
+  WheelPicker,
+  WheelPickerProps,
   Constants,
   Switch,
   Colors
 } from 'react-native-ui-lib';
 
-const {WheelPicker} = Incubator;
-
 const DAYS = _.times(10, i => i);
 const HOURS = _.times(24, i => i);
 const MINUTES = _.times(60, i => i);
@@ -75,7 +74,7 @@ const SectionsWheelPickerScreen = () => {
     setSelectedMinutes(0);
   }, []);
 
-  const sections: Incubator.WheelPickerProps[] = useMemo(() => {
+  const sections: WheelPickerProps[] = useMemo(() => {
     return [
       {
         items: getItems(DAYS),
diff --git a/demo/src/screens/incubatorScreens/WheelPickerScreen.tsx b/demo/src/screens/componentScreens/WheelPickerScreen.tsx
similarity index 78%
rename from demo/src/screens/incubatorScreens/WheelPickerScreen.tsx
rename to demo/src/screens/componentScreens/WheelPickerScreen.tsx
index c9187dbfc1..204041db2e 100644
--- a/demo/src/screens/incubatorScreens/WheelPickerScreen.tsx
+++ b/demo/src/screens/componentScreens/WheelPickerScreen.tsx
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import React, {useCallback, useState} from 'react';
-import {View, Text, Incubator, Colors, Typography, Button} from 'react-native-ui-lib';
+import {View, Text, Incubator, WheelPicker, WheelPickerAlign, Colors, Typography, Button} from 'react-native-ui-lib';
 
 const monthItems = _.map([
   'January',
@@ -16,7 +16,7 @@ const monthItems = _.map([
   'November',
   'December'
 ],
-item => ({label: item, value: item, align: Incubator.WheelPickerAlign.RIGHT}));
+item => ({label: item, value: item, align: WheelPickerAlign.RIGHT}));
 
 const yearItems = _.times(2050, i => i)
   .reverse()
@@ -51,7 +51,7 @@ export default () => {
       <View row center marginT-30>
         <View center>
           <Text h3>Months</Text>
-          <Incubator.WheelPicker
+          <WheelPicker
             initialValue={'February'}
             activeTextColor={Colors.$textPrimary}
             inactiveTextColor={Colors.$textNeutralHeavy}
@@ -63,7 +63,7 @@ export default () => {
 
         <View center>
           <Text h3>Years</Text>
-          <Incubator.WheelPicker
+          <WheelPicker
             numberOfVisibleRows={3} 
             initialValue={yearsValue} 
             items={yearItems}
@@ -80,14 +80,14 @@ export default () => {
           (by updating the initialValue prop)
         </Text>
         <View marginT-10 row>
-          <Button size="medium" label={'Previous'} marginR-20 onPress={() => updateYearsInitialValue(false)}/>
-          <Button size="medium" label={'Next'} onPress={() => updateYearsInitialValue(true)}/>
+          <Button size={Button.sizes.medium} label={'Previous'} marginR-20 onPress={() => updateYearsInitialValue(false)}/>
+          <Button size={Button.sizes.medium} label={'Next'} onPress={() => updateYearsInitialValue(true)}/>
         </View>
       </View>
 
       <View center marginT-40>
         <Text h3 marginB-20>Days</Text>
-        <Button size="small" label={'Pick Days'} onPress={onPickDaysPress}/>
+        <Button size={Button.sizes.small} label={'Pick Days'} onPress={onPickDaysPress}/>
         <Incubator.Dialog
           width={'90%'}
           bottom
@@ -95,7 +95,7 @@ export default () => {
           onDismiss={onDialogDismissed}
           headerProps={{showKnob: false, showDivider: false}}
         >
-          <Incubator.WheelPicker initialValue={5} label={'Days'} items={dayItems}/>
+          <WheelPicker initialValue={5} label={'Days'} items={dayItems}/>
         </Incubator.Dialog>
       </View>
     </View>
diff --git a/demo/src/screens/componentScreens/index.js b/demo/src/screens/componentScreens/index.js
index 1741537dff..bb864e0b53 100644
--- a/demo/src/screens/componentScreens/index.js
+++ b/demo/src/screens/componentScreens/index.js
@@ -1,3 +1,4 @@
+import {gestureHandlerRootHOC} from 'react-native-gesture-handler';
 
 export function registerScreens(registrar) {
 
@@ -60,6 +61,7 @@ export function registerScreens(registrar) {
   registrar('unicorn.components.TourScreen', () => require('./TourScreen').default);
   registrar('unicorn.components.ViewScreen', () => require('./ViewScreen').default);
   registrar('unicorn.components.WizardScreen', () => require('./WizardScreen').default);
+  registrar('unicorn.components.WheelPickerScreen', () => gestureHandlerRootHOC(require('./WheelPickerScreen').default));
   // List Components
   registrar('unicorn.lists.BasicListScreen', () => require('./BasicListScreen').default);
   registrar('unicorn.lists.ContactsListScreen', () => require('./ContactsListScreen').default);
diff --git a/demo/src/screens/incubatorScreens/index.js b/demo/src/screens/incubatorScreens/index.js
index 79d39e0c92..93be5db75a 100644
--- a/demo/src/screens/incubatorScreens/index.js
+++ b/demo/src/screens/incubatorScreens/index.js
@@ -10,5 +10,4 @@ export function registerScreens(registrar) {
   registrar('unicorn.components.IncubatorTextFieldScreen', () => require('./IncubatorTextFieldScreen').default);
   registrar('unicorn.components.IncubatorToastScreen', () => require('./IncubatorToastScreen').default);
   registrar('unicorn.incubator.PanViewScreen', () => require('./PanViewScreen').default);
-  registrar('unicorn.incubator.WheelPickerScreen', () => gestureHandlerRootHOC(require('./WheelPickerScreen').default));
 }
diff --git a/src/incubator/WheelPicker/Item.tsx b/src/components/WheelPicker/Item.tsx
similarity index 98%
rename from src/incubator/WheelPicker/Item.tsx
rename to src/components/WheelPicker/Item.tsx
index e364142c53..577c5d3b2e 100644
--- a/src/incubator/WheelPicker/Item.tsx
+++ b/src/components/WheelPicker/Item.tsx
@@ -110,7 +110,6 @@ const WheelPickerItem = memo(({
   );
 });
 
-WheelPickerItem.displayName = 'Incubator.WheelPickerItem';
 export default asBaseComponent<InternalProps>(WheelPickerItem);
 
 const styles = StyleSheet.create({
diff --git a/src/incubator/WheelPicker/__tests__/index.spec.js b/src/components/WheelPicker/__tests__/index.spec.js
similarity index 98%
rename from src/incubator/WheelPicker/__tests__/index.spec.js
rename to src/components/WheelPicker/__tests__/index.spec.js
index e8a4311ffe..0c2d798538 100644
--- a/src/incubator/WheelPicker/__tests__/index.spec.js
+++ b/src/components/WheelPicker/__tests__/index.spec.js
@@ -3,7 +3,7 @@ import React from 'react';
 import {render} from '@testing-library/react-native';
 import {fireOnMomentumScrollEnd} from '../../../uilib-test-renderer';
 import {Colors} from 'style';
-import {WheelPicker} from '../../../incubator';
+import WheelPicker from '../index';
 
 
 const ITEM_HEIGHT = 50;
diff --git a/src/incubator/WheelPicker/__tests__/useListMiddleIndex.spec.js b/src/components/WheelPicker/__tests__/useListMiddleIndex.spec.js
similarity index 100%
rename from src/incubator/WheelPicker/__tests__/useListMiddleIndex.spec.js
rename to src/components/WheelPicker/__tests__/useListMiddleIndex.spec.js
diff --git a/src/incubator/WheelPicker/__tests__/usePresenter.spec.js b/src/components/WheelPicker/__tests__/usePresenter.spec.js
similarity index 100%
rename from src/incubator/WheelPicker/__tests__/usePresenter.spec.js
rename to src/components/WheelPicker/__tests__/usePresenter.spec.js
diff --git a/src/incubator/WheelPicker/helpers/useListMiddleIndex.ts b/src/components/WheelPicker/helpers/useListMiddleIndex.ts
similarity index 100%
rename from src/incubator/WheelPicker/helpers/useListMiddleIndex.ts
rename to src/components/WheelPicker/helpers/useListMiddleIndex.ts
diff --git a/src/incubator/WheelPicker/index.tsx b/src/components/WheelPicker/index.tsx
similarity index 99%
rename from src/incubator/WheelPicker/index.tsx
rename to src/components/WheelPicker/index.tsx
index fea6dea2c8..7c63fe7819 100644
--- a/src/incubator/WheelPicker/index.tsx
+++ b/src/components/WheelPicker/index.tsx
@@ -20,6 +20,7 @@ import Item, {ItemProps} from './Item';
 import Text, {TextProps} from '../../components/text';
 import usePresenter from './usePresenter';
 import {WheelPickerAlign} from './types';
+export {WheelPickerAlign};
 
 const AnimatedFlatList = Animated.createAnimatedComponent<FlatListProps<ItemProps>>(FlatList);
 
@@ -358,7 +359,6 @@ const WheelPicker = ({
 };
 
 WheelPicker.alignments = WheelPickerAlign;
-WheelPicker.displayName = 'Incubator.WheelPicker';
 export default asBaseComponent<WheelPickerProps, typeof WheelPicker>(WheelPicker);
 export {ItemProps as WheelPickerItemProps};
 
diff --git a/src/incubator/WheelPicker/types.ts b/src/components/WheelPicker/types.ts
similarity index 100%
rename from src/incubator/WheelPicker/types.ts
rename to src/components/WheelPicker/types.ts
diff --git a/src/incubator/WheelPicker/usePresenter.ts b/src/components/WheelPicker/usePresenter.ts
similarity index 100%
rename from src/incubator/WheelPicker/usePresenter.ts
rename to src/components/WheelPicker/usePresenter.ts
diff --git a/src/incubator/WheelPicker/wheelPicker.api.json b/src/components/WheelPicker/wheelPicker.api.json
similarity index 95%
rename from src/incubator/WheelPicker/wheelPicker.api.json
rename to src/components/WheelPicker/wheelPicker.api.json
index bcd8c82d1e..769dfc3460 100644
--- a/src/incubator/WheelPicker/wheelPicker.api.json
+++ b/src/components/WheelPicker/wheelPicker.api.json
@@ -1,8 +1,8 @@
 {
   "name": "WheelPicker",
-  "category": "incubator",
+  "category": "form",
   "description": "A customizable WheelPicker component",
-  "example": "https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/incubatorScreens/WheelPickerScreen.tsx",
+  "example": "https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/componentScreens/WheelPickerScreen.tsx",
   "images": [],
   "props": [
     {"name": "initialValue", "type": "number | string", "description": "Initial value (uncontrolled)"},
diff --git a/src/components/picker/PickerItemsList.tsx b/src/components/picker/PickerItemsList.tsx
index af7398898d..3d12416746 100644
--- a/src/components/picker/PickerItemsList.tsx
+++ b/src/components/picker/PickerItemsList.tsx
@@ -7,7 +7,7 @@ import Modal from '../modal';
 import View from '../view';
 import Text from '../text';
 import Icon from '../icon';
-import WheelPicker from '../../incubator/WheelPicker';
+import WheelPicker from '../WheelPicker';
 import {PickerItemProps, PickerItemsListProps, PickerSingleValue} from './types';
 import PickerContext from './PickerContext';
 
diff --git a/src/components/sectionsWheelPicker/index.tsx b/src/components/sectionsWheelPicker/index.tsx
index d121af7149..67048ddbc4 100644
--- a/src/components/sectionsWheelPicker/index.tsx
+++ b/src/components/sectionsWheelPicker/index.tsx
@@ -3,7 +3,7 @@ import React, {useMemo} from 'react';
 import {TextStyle, StyleSheet} from 'react-native';
 import {Constants, asBaseComponent} from '../../commons/new';
 import View from '../view';
-import {WheelPicker, WheelPickerProps} from '../../incubator';
+import WheelPicker, {WheelPickerProps} from '../WheelPicker';
 
 export type SectionsWheelPickerProps = {
   /**
diff --git a/src/incubator/index.ts b/src/incubator/index.ts
index 5da84aa4ed..29404fcd75 100644
--- a/src/incubator/index.ts
+++ b/src/incubator/index.ts
@@ -5,7 +5,5 @@ export {default as ExpandableOverlay} from './expandableOverlay';
 export {default as TextField, TextFieldProps, FieldContextType} from './TextField';
 export {default as Toast, ToastProps, ToastPresets} from './toast';
 export {default as TouchableOpacity, TouchableOpacityProps} from './TouchableOpacity';
-export {default as WheelPicker, WheelPickerProps, WheelPickerItemProps} from './WheelPicker';
-export {WheelPickerAlign} from './WheelPicker/types';
 export {default as PanView, PanViewProps, PanViewDirections, PanViewDismissThreshold} from './panView';
 export {default as Dialog, DialogProps, DialogHeaderProps, DialogStatics, DialogImperativeMethods} from './Dialog';
diff --git a/src/index.ts b/src/index.ts
index 76bf14667e..192d3961bc 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -31,9 +31,6 @@ export {
   FieldContextType,
   ToastProps,
   ToastPresets,
-  WheelPickerProps,
-  WheelPickerItemProps,
-  WheelPickerAlign,
   PanViewProps,
   PanViewDirections,
   PanViewDismissThreshold
@@ -172,6 +169,12 @@ export {
   WizardStepConfig,
   WizardStepsConfig
 } from './components/wizard';
+export {
+  default as WheelPicker,
+  WheelPickerProps,
+  WheelPickerItemProps,
+  WheelPickerAlign
+} from './components/WheelPicker';
 
 /* ===== TestKit ===== */
 // export {default as TextTestKit} from './components/text/Text.driver';