Skip to content

Commit b4165b2

Browse files
authored
V7 remove native WheelPicker (#2475)
* Remove native WheelPicker * Remove WheelPickerDialog * Remove WheelPickerPackage leftovers * Remove PickerPackage(s) * Missed one
1 parent dae2c31 commit b4165b2

File tree

32 files changed

+4
-917
lines changed

32 files changed

+4
-917
lines changed

demo/src/index.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ module.exports = {
139139
get FeatureHighlightScreen() {
140140
return require('./screens/componentScreens/FeatureHighlightScreen').default;
141141
},
142-
get WheelPickerDialogScreen() {
143-
return require('./screens/componentScreens/WheelPickerDialogScreen').default;
144-
},
145142
get SliderScreen() {
146143
return require('./screens/componentScreens/SliderScreen').default;
147144
},
@@ -173,9 +170,6 @@ module.exports = {
173170
get SafeAreaSpacerViewScreen() {
174171
return require('./screens/nativeComponentScreens/SafeAreaSpacerViewScreen').default;
175172
},
176-
get WheelPickerViewScreen() {
177-
return require('./screens/nativeComponentScreens/WheelPickerViewScreen').default;
178-
},
179173
// Full Screen components
180174
get EmptyStateScreen() {
181175
return require('./screens/componentScreens/EmptyStateScreen').default;

demo/src/screens/MenuStructure.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export const navigationData = {
4343
screen: 'unicorn.components.SharedTransitionScreen'
4444
},
4545
{title: 'Stack Aggregator', tags: 'stack aggregator', screen: 'unicorn.components.StackAggregatorScreen'},
46-
{title: 'Wheel Picker Dialog', tags: 'wheel picker dialog', screen: 'unicorn.components.WheelPickerDialogScreen'},
4746
{title: 'Marquee', tags: 'sliding text', screen: 'unicorn.components.MarqueeScreen'}
4847
]
4948
},
@@ -141,7 +140,6 @@ export const navigationData = {
141140
tags: 'native overlay',
142141
screen: 'unicorn.nativeComponents.HighlightOverlayViewScreen'
143142
},
144-
{title: 'Wheel Picker', tags: 'wheel picker', screen: 'unicorn.nativeComponents.WheelPickerViewScreen'},
145143
{title: 'SafeArea Spacer', tags: 'native safe area', screen: 'unicorn.nativeComponents.SafeAreaSpacerViewScreen'},
146144
{
147145
title: 'KeyboardTracking (iOS)',

demo/src/screens/componentScreens/ChipScreen.tsx

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import _ from 'lodash';
21
import React, {Component} from 'react';
32
import {Alert} from 'react-native';
4-
import {Chip, Colors, Spacings, Text, Typography, View, Incubator, WheelPickerDialog, Image} from 'react-native-ui-lib';
3+
import {Chip, Colors, Spacings, Text, Typography, View, Image} from 'react-native-ui-lib';
54

65
const avatarImage = {
76
uri: 'https://randomuser.me/api/portraits/women/24.jpg'
@@ -20,64 +19,9 @@ export default class ChipScreen extends Component {
2019
];
2120

2221
state = {
23-
showDialog: false,
2422
selectedValue: this.colors[2].label
2523
};
2624

27-
toggleDialog = (showDialog: boolean) => {
28-
this.setState({showDialog});
29-
};
30-
31-
openDialog = () => {
32-
this.toggleDialog(true);
33-
};
34-
35-
closeDialog = () => {
36-
this.toggleDialog(false);
37-
};
38-
39-
onSelect = (itemValue: string) => {
40-
const values = _.filter(this.colors, {value: itemValue});
41-
if (values.length > 0) {
42-
this.setState({selectedValue: values[0].label});
43-
}
44-
this.closeDialog();
45-
};
46-
47-
renderItem = ({item: color}) => {
48-
return (
49-
<Text text50 margin-20 color={color.value}>
50-
{color.label}
51-
</Text>
52-
);
53-
};
54-
55-
renderContent = () => {
56-
const {selectedValue} = this.state;
57-
58-
return (
59-
<WheelPickerDialog
60-
items={this.colors}
61-
selectedValue={selectedValue}
62-
onSelect={this.onSelect}
63-
onCancel={this.closeDialog}
64-
wheelPickerProps={{
65-
style: {width: 200}
66-
}}
67-
/>
68-
);
69-
};
70-
71-
renderPickerDialog = () => {
72-
const {showDialog} = this.state;
73-
74-
return (
75-
<Incubator.Dialog visible={showDialog} useSafeArea bottom onDismiss={this.closeDialog}>
76-
{this.renderContent()}
77-
</Incubator.Dialog>
78-
);
79-
};
80-
8125
renderExample = (text: string, chip: JSX.Element) => {
8226
return (
8327
<View row spread marginB-12>
@@ -90,7 +34,6 @@ export default class ChipScreen extends Component {
9034
render() {
9135
return (
9236
<View style={{padding: 20}}>
93-
{this.renderPickerDialog()}
9437
<Text marginB-20 text40 $textDefault>
9538
Chip
9639
</Text>
@@ -120,12 +63,11 @@ export default class ChipScreen extends Component {
12063
iconStyle={{width: 24, height: 24}}
12164
iconProps={{tintColor: Colors.$iconDefault}}
12265
/>)}
123-
{this.renderExample('Right icon + onPress + dynamic label',
66+
{this.renderExample('Right icon',
12467
<Chip
12568
label={this.state.selectedValue}
12669
rightIconSource={chevron}
12770
iconStyle={{margin: 8}}
128-
onPress={this.openDialog}
12971
/>)}
13072
{this.renderExample('Label + Avatar', <Chip label={'Chip'} avatarProps={{source: avatarImage, size: 20}}/>)}
13173
{this.renderExample('Label + Counter',

demo/src/screens/componentScreens/WheelPickerDialogScreen.js

Lines changed: 0 additions & 54 deletions
This file was deleted.

demo/src/screens/componentScreens/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ export function registerScreens(registrar) {
5959
registrar('unicorn.wrappers.TouchableOpacityScreen', () => require('./TouchableOpacityScreen').default);
6060
registrar('unicorn.components.TourScreen', () => require('./TourScreen').default);
6161
registrar('unicorn.components.ViewScreen', () => require('./ViewScreen').default);
62-
registrar('unicorn.components.WheelPickerDialogScreen', () => require('./WheelPickerDialogScreen').default);
6362
registrar('unicorn.components.WizardScreen', () => require('./WizardScreen').default);
6463
// List Components
6564
registrar('unicorn.lists.BasicListScreen', () => require('./BasicListScreen').default);

demo/src/screens/nativeComponentScreens/WheelPickerViewScreen.js

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
export function registerScreens(registrar) {
22
registrar('unicorn.nativeComponents.HighlightOverlayViewScreen', () => require('./HighlightOverlayViewScreen').default);
33
registrar('unicorn.nativeComponents.SafeAreaSpacerViewScreen', () => require('./SafeAreaSpacerViewScreen').default);
4-
registrar('unicorn.nativeComponents.WheelPickerViewScreen', () => require('./WheelPickerViewScreen').default);
54
registrar('unicorn.nativeComponents.KeyboardTrackingViewScreen', () => require('./KeyboardTrackingViewScreen').default);
65
registrar('unicorn.nativeComponents.KeyboardAccessoryViewScreen', () => require('./keyboardAccessory/KeyboardAccessoryViewScreen').default);
76
}

jest-setup.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jest.mock('react-native-gesture-handler',
4343
return GestureHandler;
4444
},
4545
{virtual: true});
46-
jest.mock('@react-native-picker/picker', () => ({Picker: {Item: {}}}));
4746
jest.mock('react-native', () => {
4847
const reactNative = jest.requireActual('react-native');
4948
reactNative.NativeModules.KeyboardTrackingViewTempManager = {};

lib/android/src/main/java/com/wix/reactnativeuilib/UiLibPackageList.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.wix.reactnativeuilib.highlighterview.HighlighterViewPackage;
77
import com.wix.reactnativeuilib.keyboardinput.KeyboardInputPackage;
88
import com.wix.reactnativeuilib.textinput.TextInputDelKeyHandlerPackage;
9-
import com.wix.reactnativeuilib.wheelpicker.WheelPickerPackage;
109

1110
import java.util.Arrays;
1211
import java.util.List;
@@ -22,7 +21,6 @@ public UiLibPackageList(Application application) {
2221
public List<ReactPackage> getPackageList() {
2322
return Arrays.asList(
2423
new HighlighterViewPackage(),
25-
new WheelPickerPackage(),
2624
new TextInputDelKeyHandlerPackage(),
2725
new KeyboardInputPackage(application)
2826
);

lib/android/src/main/java/com/wix/reactnativeuilib/wheelpicker/WheelPicker.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)