@@ -110,7 +110,6 @@ const PickerItemsList = (props: PickerItemsListProps) => {
110
110
111
111
const renderCancel = ( ) => {
112
112
const { cancelButtonProps, cancelLabel, onCancel} = topBarProps ?? { } ;
113
-
114
113
return (
115
114
< >
116
115
{ cancelLabel ? (
@@ -124,19 +123,29 @@ const PickerItemsList = (props: PickerItemsListProps) => {
124
123
) ;
125
124
} ;
126
125
127
- const renderWheel = ( ) => {
128
- const { cancelButtonProps, cancelLabel, doneLabel, title, titleStyle, containerStyle, useSafeArea } =
126
+ const renderPickerHeader = ( ) => {
127
+ const { cancelButtonProps, cancelLabel, doneLabel, title, titleStyle, containerStyle, onDone , onCancel } =
129
128
topBarProps ?? { } ;
130
-
131
- return (
132
- < View useSafeArea = { useSafeArea } >
129
+ if ( renderHeader ) {
130
+ return renderHeader ?.( { onDone, onCancel} ) ;
131
+ } else if ( useWheelPicker ) {
132
+ return (
133
133
< View row spread padding-page style = { containerStyle } >
134
134
{ ( cancelButtonProps || cancelLabel ) && renderCancel ( ) }
135
135
< Text style = { titleStyle } > { title } </ Text >
136
136
< Text text70 $textPrimary accessibilityRole = { 'button' } onPress = { ( ) => context . onPress ( wheelPickerValue ) } >
137
137
{ doneLabel ?? 'Select' }
138
138
</ Text >
139
139
</ View >
140
+ ) ;
141
+ } else if ( ! useDialog || mode === PickerModes . MULTI ) {
142
+ return < Modal . TopBar testID = { `${ props . testID } .topBar` } { ...topBarProps } /> ;
143
+ }
144
+ } ;
145
+
146
+ const renderWheel = ( ) => {
147
+ return (
148
+ < View useSafeArea = { useSafeArea } >
140
149
< WheelPicker
141
150
flatListProps = { listProps }
142
151
initialValue = { context . value as PickerSingleValue }
@@ -147,25 +156,21 @@ const PickerItemsList = (props: PickerItemsListProps) => {
147
156
) ;
148
157
} ;
149
158
150
- const renderPickerHeader = ( ) => {
151
- if ( renderHeader ) {
152
- return renderHeader ?.( { onDone : topBarProps ?. onDone , onCancel : topBarProps ?. onCancel } ) ;
153
- } else if ( ! useDialog || mode === PickerModes . MULTI ) {
154
- return < Modal . TopBar testID = { `${ props . testID } .topBar` } { ...topBarProps } /> ;
155
- }
159
+ const renderContent = ( ) => {
160
+ return useWheelPicker ? (
161
+ renderWheel ( )
162
+ ) : (
163
+ < >
164
+ { renderSearchInput ( ) }
165
+ { renderList ( ) }
166
+ </ >
167
+ ) ;
156
168
} ;
157
169
158
170
return (
159
171
< View bg-$backgroundDefault style = { wrapperContainerStyle } useSafeArea = { useSafeArea } >
160
- { ! useWheelPicker && (
161
- < >
162
- { renderPickerHeader ( ) }
163
- { renderSearchInput ( ) }
164
- { renderList ( ) }
165
- </ >
166
- ) }
167
-
168
- { useWheelPicker && renderWheel ( ) }
172
+ { renderPickerHeader ( ) }
173
+ { renderContent ( ) }
169
174
</ View >
170
175
) ;
171
176
} ;
0 commit comments