Skip to content

fix: default props to new way to not throw warning #264

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.

Sign up for GitHub

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

Open
yr-samuel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: default props to new way to not throw warning #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 9 additions & 19 deletions autoHeightWebView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,16 @@ import {
shouldUpdate,
} from './utils';

const defaultProps = {
showsVerticalScrollIndicator: false,
showsHorizontalScrollIndicator: false,
originWhitelist: ['*'],
...(Platform.OS === 'android' ? { scalesPageToFit: false } : {}),
...(Platform.OS === 'ios' ? { viewportContent: 'width=device-width' } : {}),
};

const AutoHeightWebView = React.memo(
forwardRef((props, ref) => {
forwardRef((props = defaultProps, ref) => {
Copy link

@thomascwo thomascwo Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems having any one of the prop passed in will override all the defaultProps.

const {
style,
onMessage,
Expand Down Expand Up @@ -114,24 +122,6 @@ AutoHeightWebView.propTypes = {
source: PropTypes.object,
};

let defaultProps = {
showsVerticalScrollIndicator: false,
showsHorizontalScrollIndicator: false,
originWhitelist: ['*'],
};

Platform.OS === 'android' &&
Object.assign(defaultProps, {
scalesPageToFit: false,
});

Platform.OS === 'ios' &&
Object.assign(defaultProps, {
viewportContent: 'width=device-width',
});

AutoHeightWebView.defaultProps = defaultProps;

const styles = StyleSheet.create({
webView: {
backgroundColor: 'transparent',
Expand Down