Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ If set to false, the specific item will be disabled, i.e. the user will not be a
- [`itemStyle`](#itemstyle)
- [`onValueChange`](#onvaluechange)
- [`selectedValue`](#selectedvalue)
- [`themeVariant`](#themeVariant)

---

Expand Down Expand Up @@ -416,4 +417,10 @@ If set to false, the specific item will be disabled, i.e. the user will not be a
| ---- | -------- |
| any | No |


---

### `themeVariant`

| Type | Required |
| ---- | -------- |
| enum('light', 'dark') | No |
33 changes: 33 additions & 0 deletions example/src/PickerExample.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,35 @@ function NoListenerPickerExample() {
);
}

function ThemeVariantOverridePickerExample() {
const [themeVariantValue, setThemeVariantValue] = React.useState('dark');
const isDarkMode = themeVariantValue === 'dark';

const handleSelect = ({nativeEvent: {newValue}}) =>
setThemeVariantValue(newValue);

return (
<View style={{backgroundColor: isDarkMode ? 'black' : 'transparent'}}>
<Picker
selectedValue={themeVariantValue}
selectedColor={'white'}
themeVariant={themeVariantValue}
onChange={handleSelect}>
<Item
color={isDarkMode ? 'white' : 'black'}
label="Dark mode"
value="dark"
/>
<Item
color={isDarkMode ? 'white' : 'black'}
label="Light mode"
value="light"
/>
</Picker>
</View>
);
}

function ColorPickerExample() {
const [value, setValue] = React.useState('red');
const [isFocused, setIsFocused] = React.useState(false);
Expand Down Expand Up @@ -245,6 +274,10 @@ export const examples = [
title: 'Styled Picker',
render: StyledPickerExample,
},
{
title: 'Picker with overrided theme variant',
render: ThemeVariantOverridePickerExample,
},
{
title: 'Disabled Picker',
render: DisabledPickerExample,
Expand Down
13 changes: 13 additions & 0 deletions ios/RNCPickerManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,18 @@ - (UIView *)view
{
view.font = [RCTFont updateFont:view.font withFamily:json ?: defaultView.font.familyName];
}
RCT_CUSTOM_VIEW_PROPERTY(themeVariant, NSString, RNCPicker)
{
if (@available(iOS 13.4, *)) {
if (json) {
if ([json isEqual:@"dark"])
view.overrideUserInterfaceStyle = UIUserInterfaceStyleDark;
else if ([json isEqual:@"light"])
view.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
else
view.overrideUserInterfaceStyle = UIUserInterfaceStyleUnspecified;
}
}
}

@end
14 changes: 3 additions & 11 deletions js/PickerIOS.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import * as React from 'react';
import {processColor, StyleSheet, View} from 'react-native';
import RNCPickerNativeComponent from './RNCPickerNativeComponent';
import type {RNCPickerIOSType} from './RNCPickerNativeComponent';

import type {SyntheticEvent} from 'react-native/Libraries/Types/CoreEventTypes';
import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheet';
Expand All @@ -38,17 +39,6 @@ type RNCPickerIOSItemType = $ReadOnly<{|
testID: ?string,
|}>;

type RNCPickerIOSType = HostComponent<
$ReadOnly<{|
items: $ReadOnlyArray<RNCPickerIOSItemType>,
onChange: (event: PickerIOSChangeEvent) => void,
selectedIndex: number,
style?: ?TextStyleProp,
testID?: ?string,
numberOfLines?: ?number,
|}>,
>;

type Label = Stringish | number;

type Props = $ReadOnly<{|
Expand All @@ -59,6 +49,7 @@ type Props = $ReadOnly<{|
onValueChange?: ?(itemValue: string | number, itemIndex: number) => mixed,
selectedValue: ?(number | string),
numberOfLines: ?number,
themeVariant: ?string,
|}>;

type State = {|
Expand Down Expand Up @@ -115,6 +106,7 @@ class PickerIOS extends React.Component<Props, State> {
ref={(picker) => {
this._picker = picker;
}}
themeVariant={this.props.themeVariant}
testID={this.props.testID}
style={[styles.pickerIOS, this.props.itemStyle]}
items={this.state.items}
Expand Down
3 changes: 2 additions & 1 deletion js/RNCPickerNativeComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ type RNCPickerIOSTypeItemType = $ReadOnly<{|

type Label = Stringish | number;

type RNCPickerIOSType = HostComponent<
export type RNCPickerIOSType = HostComponent<
$ReadOnly<{|
items: $ReadOnlyArray<RNCPickerIOSTypeItemType>,
onChange: (event: PickerIOSChangeEvent) => void,
selectedIndex: number,
style?: ?TextStyleProp,
testID?: ?string,
numberOfLines?: ?number,
themeVariant?: ?string,
|}>,
>;

Expand Down
1 change: 1 addition & 0 deletions typings/PickerIOS.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export interface PickerIOSProps extends ViewProps {
selectedValue?: ItemValue;
testID?: string;
numberOfLines?: number;
themeVariant ?: string;
}

declare class PickerIOS extends React.Component<PickerIOSProps, {}> {
Expand Down