From 4b3cb41107ae616eb11a61a2d4ea14ba5863a87f Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Thu, 7 Jul 2016 21:21:45 -0700 Subject: [PATCH] rename createNativeComponent to createReactDOMComponent --- src/components/Image/index.js | 10 ++++---- src/components/Text/index.js | 12 +++++----- src/components/TextInput/index.js | 4 ++-- .../__tests__/index-test.js | 24 +++++++++---------- .../index.js | 6 ++--- 5 files changed, 28 insertions(+), 28 deletions(-) rename src/modules/{createNativeComponent => createReactDOMComponent}/__tests__/index-test.js (63%) rename src/modules/{createNativeComponent => createReactDOMComponent}/index.js (92%) diff --git a/src/components/Image/index.js b/src/components/Image/index.js index 5d4367e7..3d1aa171 100644 --- a/src/components/Image/index.js +++ b/src/components/Image/index.js @@ -1,6 +1,6 @@ /* global window */ import applyNativeMethods from '../../modules/applyNativeMethods' -import createNativeComponent from '../../modules/createNativeComponent' +import createReactDOMComponent from '../../modules/createReactDOMComponent' import ImageResizeMode from './ImageResizeMode' import ImageStylePropTypes from './ImageStylePropTypes' import resolveAssetSource from './resolveAssetSource' @@ -24,8 +24,8 @@ const ImageSourcePropType = PropTypes.oneOfType([ class Image extends Component { static propTypes = { - accessibilityLabel: createNativeComponent.propTypes.accessibilityLabel, - accessible: createNativeComponent.propTypes.accessible, + accessibilityLabel: createReactDOMComponent.propTypes.accessibilityLabel, + accessible: createReactDOMComponent.propTypes.accessible, children: PropTypes.any, defaultSource: ImageSourcePropType, onError: PropTypes.func, @@ -35,7 +35,7 @@ class Image extends Component { resizeMode: PropTypes.oneOf(['contain', 'cover', 'none', 'stretch']), source: ImageSourcePropType, style: StyleSheetPropType(ImageStylePropTypes), - testID: createNativeComponent.propTypes.testID + testID: createReactDOMComponent.propTypes.testID }; static defaultProps = { @@ -116,7 +116,7 @@ class Image extends Component { ]} testID={testID} > - {createNativeComponent({ component: 'img', src: displayImage, style: styles.img })} + {createReactDOMComponent({ component: 'img', src: displayImage, style: styles.img })} {children ? ( ) : null} diff --git a/src/components/Text/index.js b/src/components/Text/index.js index 428db65e..937441a6 100644 --- a/src/components/Text/index.js +++ b/src/components/Text/index.js @@ -1,5 +1,5 @@ import applyNativeMethods from '../../modules/applyNativeMethods' -import createNativeComponent from '../../modules/createNativeComponent' +import createReactDOMComponent from '../../modules/createReactDOMComponent' import { Component, PropTypes } from 'react' import StyleSheet from '../../apis/StyleSheet' import StyleSheetPropType from '../../apis/StyleSheet/StyleSheetPropType' @@ -7,14 +7,14 @@ import TextStylePropTypes from './TextStylePropTypes' class Text extends Component { static propTypes = { - accessibilityLabel: createNativeComponent.propTypes.accessibilityLabel, - accessibilityRole: createNativeComponent.propTypes.accessibilityRole, - accessible: createNativeComponent.propTypes.accessible, + accessibilityLabel: createReactDOMComponent.propTypes.accessibilityLabel, + accessibilityRole: createReactDOMComponent.propTypes.accessibilityRole, + accessible: createReactDOMComponent.propTypes.accessible, children: PropTypes.any, numberOfLines: PropTypes.number, onPress: PropTypes.func, style: StyleSheetPropType(TextStylePropTypes), - testID: createNativeComponent.propTypes.testID + testID: createReactDOMComponent.propTypes.testID }; static defaultProps = { @@ -35,7 +35,7 @@ class Text extends Component { ...other } = this.props - return createNativeComponent({ + return createReactDOMComponent({ ...other, component: 'span', onClick: this._onPress, diff --git a/src/components/TextInput/index.js b/src/components/TextInput/index.js index aaf88b28..e0968420 100644 --- a/src/components/TextInput/index.js +++ b/src/components/TextInput/index.js @@ -1,5 +1,5 @@ import applyNativeMethods from '../../modules/applyNativeMethods' -import createNativeComponent from '../../modules/createNativeComponent' +import createReactDOMComponent from '../../modules/createReactDOMComponent' import omit from 'lodash/omit' import pick from 'lodash/pick' import React, { Component, PropTypes } from 'react' @@ -175,7 +175,7 @@ class TextInput extends Component { testID={testID} > - {createNativeComponent({ ...props, ref: 'input' })} + {createReactDOMComponent({ ...props, ref: 'input' })} {optionalPlaceholder} diff --git a/src/modules/createNativeComponent/__tests__/index-test.js b/src/modules/createReactDOMComponent/__tests__/index-test.js similarity index 63% rename from src/modules/createNativeComponent/__tests__/index-test.js rename to src/modules/createReactDOMComponent/__tests__/index-test.js index 8c28d300..180d8344 100644 --- a/src/modules/createNativeComponent/__tests__/index-test.js +++ b/src/modules/createReactDOMComponent/__tests__/index-test.js @@ -1,59 +1,59 @@ /* eslint-env mocha */ import assert from 'assert' -import createNativeComponent from '..' +import createReactDOMComponent from '..' import { shallow } from 'enzyme' -suite('modules/createNativeComponent', () => { +suite('modules/createReactDOMComponent', () => { test('prop "accessibilityLabel"', () => { const accessibilityLabel = 'accessibilityLabel' - const element = shallow(createNativeComponent({ accessibilityLabel })) + const element = shallow(createReactDOMComponent({ accessibilityLabel })) assert.equal(element.prop('aria-label'), accessibilityLabel) }) test('prop "accessibilityLiveRegion"', () => { const accessibilityLiveRegion = 'polite' - const element = shallow(createNativeComponent({ accessibilityLiveRegion })) + const element = shallow(createReactDOMComponent({ accessibilityLiveRegion })) assert.equal(element.prop('aria-live'), accessibilityLiveRegion) }) test('prop "accessibilityRole"', () => { const accessibilityRole = 'banner' - let element = shallow(createNativeComponent({ accessibilityRole })) + let element = shallow(createReactDOMComponent({ accessibilityRole })) assert.equal(element.prop('role'), accessibilityRole) assert.equal(element.is('header'), true) const button = 'button' - element = shallow(createNativeComponent({ accessibilityRole: 'button' })) + element = shallow(createReactDOMComponent({ accessibilityRole: 'button' })) assert.equal(element.prop('type'), button) assert.equal(element.is('button'), true) }) test('prop "accessible"', () => { // accessible (implicit) - let element = shallow(createNativeComponent({})) + let element = shallow(createReactDOMComponent({})) assert.equal(element.prop('aria-hidden'), null) // accessible (explicit) - element = shallow(createNativeComponent({ accessible: true })) + element = shallow(createReactDOMComponent({ accessible: true })) assert.equal(element.prop('aria-hidden'), null) // not accessible - element = shallow(createNativeComponent({ accessible: false })) + element = shallow(createReactDOMComponent({ accessible: false })) assert.equal(element.prop('aria-hidden'), true) }) test('prop "component"', () => { const component = 'main' - const element = shallow(createNativeComponent({ component })) + const element = shallow(createReactDOMComponent({ component })) assert.equal(element.is('main'), true) }) test('prop "testID"', () => { // no testID - let element = shallow(createNativeComponent({})) + let element = shallow(createReactDOMComponent({})) assert.equal(element.prop('data-testid'), null) // with testID const testID = 'Example.testID' - element = shallow(createNativeComponent({ testID })) + element = shallow(createReactDOMComponent({ testID })) assert.equal(element.prop('data-testid'), testID) }) }) diff --git a/src/modules/createNativeComponent/index.js b/src/modules/createReactDOMComponent/index.js similarity index 92% rename from src/modules/createNativeComponent/index.js rename to src/modules/createReactDOMComponent/index.js index a37756f1..1cdc98de 100644 --- a/src/modules/createNativeComponent/index.js +++ b/src/modules/createReactDOMComponent/index.js @@ -17,7 +17,7 @@ const roleComponents = { region: 'section' } -const createNativeComponent = ({ +const createReactDOMComponent = ({ accessibilityLabel, accessibilityLiveRegion, accessibilityRole, @@ -43,7 +43,7 @@ const createNativeComponent = ({ ) } -createNativeComponent.propTypes = { +createReactDOMComponent.propTypes = { accessibilityLabel: PropTypes.string, accessibilityLiveRegion: PropTypes.oneOf([ 'assertive', 'off', 'polite' ]), accessibilityRole: PropTypes.string, @@ -54,4 +54,4 @@ createNativeComponent.propTypes = { type: PropTypes.string } -module.exports = createNativeComponent +module.exports = createReactDOMComponent