Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove defaultProps from SegmentedControlIOS #31804

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ type SegmentedControlIOSProps = $ReadOnly<{|
...ViewProps,
/**
* The labels for the control's segment buttons, in order.
*
* The default value is an empty array.
*/
values?: $ReadOnlyArray<string>,
/**
Expand All @@ -27,6 +29,8 @@ type SegmentedControlIOSProps = $ReadOnly<{|
selectedIndex?: ?number,
/**
* If false the user won't be able to interact with the control.
*
* The default value is true.
*/
enabled?: boolean,
/**
Expand Down Expand Up @@ -54,6 +58,21 @@ type Props = $ReadOnly<{|
forwardedRef: ?React.Ref<typeof RCTSegmentedControlNativeComponent>,
|}>;

/**
* Default Props Helper Functions
* Use the following helper functions for default values
*/

// enabledOrDefault(this.props.enabled)
function enabledOrDefault(enabled: ?boolean) {
return enabled ?? true;
}

// valuesOrDefault(this.props.values)
function valuesOrDefault(values: ?$ReadOnlyArray<string>) {
return values ?? [];
}

/**
* Use `SegmentedControlIOS` to render a UISegmentedControl iOS.
*
Expand All @@ -76,24 +95,28 @@ type Props = $ReadOnly<{|
*/

class SegmentedControlIOS extends React.Component<Props> {
static defaultProps = {
values: [],
enabled: true,
};

_onChange = (event: SyntheticEvent<OnChangeEvent>) => {
this.props.onChange && this.props.onChange(event);
this.props.onValueChange &&
this.props.onValueChange(event.nativeEvent.value);
};

render() {
const {forwardedRef, onValueChange, style, ...props} = this.props;
const {
forwardedRef,
enabled: _enabled,
values: _values,
onValueChange,
style,
...props
} = this.props;
return (
<RCTSegmentedControlNativeComponent
{...props}
ref={forwardedRef}
style={[styles.segmentedControl, style]}
enabled={enabledOrDefault(_enabled)}
values={valuesOrDefault(_values)}
onChange={this._onChange}
/>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/**
daschaa marked this conversation as resolved.
Show resolved Hide resolved
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @format
* @emails oncall+react_native
*/

'use strict';

const React = require('react');
const ReactTestRenderer = require('react-test-renderer');

const SegmentedControlIOS = require('../SegmentedControlIOS.ios');

describe('SegmentedControlIOS', () => {
it('renders the segmented control', () => {
const component = ReactTestRenderer.create(<SegmentedControlIOS />);
expect(component).not.toBeNull();
});
it('renders the segmented control with enabled default value', () => {
const component = ReactTestRenderer.create(<SegmentedControlIOS />);
expect(component.toTree().rendered.props.enabled).toBe(true);
expect(component).toMatchSnapshot();
});
it('renders the segmented control with enabled', () => {
const component = ReactTestRenderer.create(
<SegmentedControlIOS enabled={true} />,
);
expect(component.toTree().rendered.props.enabled).toBe(true);
expect(component).toMatchSnapshot();
});
it('renders the segmented control with enabled set to false', () => {
const component = ReactTestRenderer.create(
<SegmentedControlIOS enabled={false} />,
);
expect(component.toTree().rendered.props.enabled).toBe(false);
expect(component).toMatchSnapshot();
});
it('renders the segmented control with values default value', () => {
const component = ReactTestRenderer.create(<SegmentedControlIOS />);
expect(component.toTree().rendered.props.values).toEqual([]);
expect(component).toMatchSnapshot();
});
it('renders the segmented control with values', () => {
const values = ['One', 'Two'];
const component = ReactTestRenderer.create(
<SegmentedControlIOS values={values} />,
);
expect(component.toTree().rendered.props.values).toBe(values);
expect(component).toMatchSnapshot();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`SegmentedControlIOS renders the segmented control with enabled 1`] = `
<RCTSegmentedControl
enabled={true}
onChange={[Function]}
style={
Array [
Object {
"height": 28,
},
undefined,
]
}
values={Array []}
/>
`;

exports[`SegmentedControlIOS renders the segmented control with enabled default value 1`] = `
<RCTSegmentedControl
enabled={true}
onChange={[Function]}
style={
Array [
Object {
"height": 28,
},
undefined,
]
}
values={Array []}
/>
`;

exports[`SegmentedControlIOS renders the segmented control with enabled set to false 1`] = `
<RCTSegmentedControl
enabled={false}
onChange={[Function]}
style={
Array [
Object {
"height": 28,
},
undefined,
]
}
values={Array []}
/>
`;

exports[`SegmentedControlIOS renders the segmented control with values 1`] = `
<RCTSegmentedControl
enabled={true}
onChange={[Function]}
style={
Array [
Object {
"height": 28,
},
undefined,
]
}
values={
Array [
"One",
"Two",
]
}
/>
`;

exports[`SegmentedControlIOS renders the segmented control with values default value 1`] = `
<RCTSegmentedControl
enabled={true}
onChange={[Function]}
style={
Array [
Object {
"height": 28,
},
undefined,
]
}
values={Array []}
/>
`;