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.

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

Jump to bottom

Add feature flag around React.createFactory #17873

Merged
merged 1 commit into from Jan 20, 2020
Merged

Add feature flag around React.createFactory #17873

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/react-is/src/__tests__/ReactIs-test.js
View file
Open in desktop
Expand Up @@ -13,6 +13,8 @@ let React;
let ReactDOM;
let ReactIs;

const ReactFeatureFlags = require('shared/ReactFeatureFlags');

describe('ReactIs', () => {
beforeEach(() => {
jest.resetModules();
Expand Down Expand Up @@ -54,9 +56,11 @@ describe('ReactIs', () => {
expect(ReactIs.isValidElementType(MemoComponent)).toEqual(true);
expect(ReactIs.isValidElementType(Context.Provider)).toEqual(true);
expect(ReactIs.isValidElementType(Context.Consumer)).toEqual(true);
expect(ReactIs.isValidElementType(React.createFactory('div'))).toEqual(
true,
);
if (!ReactFeatureFlags.disableCreateFactory) {
expect(ReactIs.isValidElementType(React.createFactory('div'))).toEqual(
true,
);
}
expect(ReactIs.isValidElementType(React.Fragment)).toEqual(true);
expect(ReactIs.isValidElementType(React.StrictMode)).toEqual(true);
expect(ReactIs.isValidElementType(React.Suspense)).toEqual(true);
Expand Down
6 changes: 5 additions & 1 deletion packages/react/src/React.js
View file
Open in desktop
Expand Up @@ -64,6 +64,7 @@ import {
enableScopeAPI,
exposeConcurrentModeAPIs,
enableChunksAPI,
disableCreateFactory,
} from 'shared/ReactFeatureFlags';
const React = {
Children: {
Expand Down Expand Up @@ -101,14 +102,17 @@ const React = {

createElement: __DEV__ ? createElementWithValidation : createElement,
cloneElement: __DEV__ ? cloneElementWithValidation : cloneElement,
createFactory: __DEV__ ? createFactoryWithValidation : createFactory,
isValidElement: isValidElement,

version: ReactVersion,

__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: ReactSharedInternals,
};

if (!disableCreateFactory) {
React.createFactory = __DEV__ ? createFactoryWithValidation : createFactory;
}

if (exposeConcurrentModeAPIs) {
React.useTransition = useTransition;
React.useDeferredValue = useDeferredValue;
Expand Down
82 changes: 47 additions & 35 deletions packages/react/src/__tests__/ReactCoffeeScriptClass-test.coffee
View file
Open in desktop
Expand Up @@ -10,10 +10,8 @@ ReactDOM = null
PropTypes = null

describe 'ReactCoffeeScriptClass', ->
div = null
span = null
container = null
Inner = null
InnerComponent = null
attachedListener = null;
renderedName = null;

Expand All @@ -24,15 +22,12 @@ describe 'ReactCoffeeScriptClass', ->
container = document.createElement 'div'
attachedListener = null
renderedName = null
div = React.createFactory 'div'
span = React.createFactory 'span'
class InnerComponent extends React.Component
InnerComponent = class extends React.Component
getName: -> this.props.name
render: ->
attachedListener = this.props.onClick
renderedName = this.props.name
return div className: this.props.name
Inner = React.createFactory InnerComponent
return React.createElement('div', className: this.props.name)

test = (element, expectedTag, expectedClassName) ->
instance = ReactDOM.render(element, container)
Expand Down Expand Up @@ -61,8 +56,9 @@ describe 'ReactCoffeeScriptClass', ->
it 'renders a simple stateless component with prop', ->
class Foo extends React.Component
render: ->
Inner
React.createElement(InnerComponent,
name: @props.bar
)

test React.createElement(Foo, bar: 'foo'), 'DIV', 'foo'
test React.createElement(Foo, bar: 'bar'), 'DIV', 'bar'
Expand All @@ -75,8 +71,9 @@ describe 'ReactCoffeeScriptClass', ->
@state = bar: @props.initialValue

render: ->
span
React.createElement('span',
className: @state.bar
)

test React.createElement(Foo, initialValue: 'foo'), 'SPAN', 'foo'
undefined
Expand All @@ -91,11 +88,12 @@ describe 'ReactCoffeeScriptClass', ->

render: ->
if @state.bar is 'foo'
return div(
return React.createElement('div',
className: 'foo'
)
span
React.createElement('span',
className: @state.bar
)

instance = test React.createElement(Foo, initialValue: 'foo'), 'DIV', 'foo'
instance.changeState()
Expand All @@ -108,8 +106,9 @@ describe 'ReactCoffeeScriptClass', ->
super props
@state = foo: null
render: ->
div
React.createElement('div',
className: "#{@state.foo} #{@state.bar}"
)
Foo.getDerivedStateFromProps = (nextProps, prevState) ->
{
foo: nextProps.foo
Expand All @@ -121,7 +120,7 @@ describe 'ReactCoffeeScriptClass', ->
it 'warns if getDerivedStateFromProps is not static', ->
class Foo extends React.Component
render: ->
div()
React.createElement('div')
getDerivedStateFromProps: ->
{}
expect(->
Expand All @@ -132,7 +131,7 @@ describe 'ReactCoffeeScriptClass', ->
it 'warns if getDerivedStateFromError is not static', ->
class Foo extends React.Component
render: ->
div()
React.createElement('div')
getDerivedStateFromError: ->
{}
expect(->
Expand All @@ -143,7 +142,7 @@ describe 'ReactCoffeeScriptClass', ->
it 'warns if getSnapshotBeforeUpdate is static', ->
class Foo extends React.Component
render: ->
div()
React.createElement('div')
Foo.getSnapshotBeforeUpdate = () ->
{}
expect(->
Expand All @@ -154,8 +153,9 @@ describe 'ReactCoffeeScriptClass', ->
it 'warns if state not initialized before static getDerivedStateFromProps', ->
class Foo extends React.Component
render: ->
div
React.createElement('div',
className: "#{@state.foo} #{@state.bar}"
)
Foo.getDerivedStateFromProps = (nextProps, prevState) ->
{
foo: nextProps.foo
Expand All @@ -179,8 +179,9 @@ describe 'ReactCoffeeScriptClass', ->
foo: 'foo'
bar: 'bar'
render: ->
div
React.createElement('div',
className: "#{@state.foo} #{@state.bar}"
)
Foo.getDerivedStateFromProps = (nextProps, prevState) ->
{
foo: "not-#{prevState.foo}"
Expand All @@ -195,8 +196,9 @@ describe 'ReactCoffeeScriptClass', ->
@state =
value: 'initial'
render: ->
div
React.createElement('div',
className: @state.value
)
Foo.getDerivedStateFromProps = (nextProps, prevState) ->
if nextProps.update
return {
Expand Down Expand Up @@ -250,7 +252,7 @@ describe 'ReactCoffeeScriptClass', ->

render: ->
renderCount++
span className: @state.bar
React.createElement('span', className: @state.bar)

test React.createElement(Foo, initialValue: 'foo'), 'SPAN', 'bar'
expect(renderCount).toBe 1
Expand All @@ -263,7 +265,7 @@ describe 'ReactCoffeeScriptClass', ->
@state = state

render: ->
span()
React.createElement('span')

expect(->
test React.createElement(Foo), 'SPAN', ''
Expand All @@ -276,7 +278,7 @@ describe 'ReactCoffeeScriptClass', ->
@state = null

render: ->
span()
React.createElement('span')

test React.createElement(Foo), 'SPAN', ''
undefined
Expand All @@ -290,9 +292,10 @@ describe 'ReactCoffeeScriptClass', ->
@setState bar: 'bar'

render: ->
Inner
React.createElement(InnerComponent,
name: @state.bar
onClick: @handleClick
)

test React.createElement(Foo, initialValue: 'foo'), 'DIV', 'foo'
attachedListener()
Expand All @@ -308,9 +311,10 @@ describe 'ReactCoffeeScriptClass', ->
@setState bar: 'bar'

render: ->
Inner
React.createElement(InnerComponent,
name: @state.bar
onClick: @handleClick
)

test React.createElement(Foo, initialValue: 'foo'), 'DIV', 'foo'
expect(attachedListener).toThrow()
Expand All @@ -326,9 +330,10 @@ describe 'ReactCoffeeScriptClass', ->
@forceUpdate()

render: ->
Inner
React.createElement(InnerComponent,
name: @mutativeValue
onClick: @handleClick
)

test React.createElement(Foo, initialValue: 'foo'), 'DIV', 'foo'
attachedListener()
Expand Down Expand Up @@ -364,8 +369,9 @@ describe 'ReactCoffeeScriptClass', ->
lifeCycles.push 'will-unmount'

render: ->
span
React.createElement('span',
className: @props.value
)

test React.createElement(Foo, value: 'foo'), 'SPAN', 'foo'
expect(lifeCycles).toEqual [
Expand Down Expand Up @@ -404,8 +410,9 @@ describe 'ReactCoffeeScriptClass', ->
{}

render: ->
span
React.createElement('span',
className: 'foo'
)

expect(->
test React.createElement(Foo), 'SPAN', 'foo'
Expand All @@ -431,8 +438,9 @@ describe 'ReactCoffeeScriptClass', ->
{}

render: ->
span
React.createElement('span',
className: 'foo'
)

test React.createElement(Foo), 'SPAN', 'foo'
undefined
Expand All @@ -443,8 +451,9 @@ describe 'ReactCoffeeScriptClass', ->
false

render: ->
span
React.createElement('span',
className: 'foo'
)

expect(->
test React.createElement(NamedComponent), 'SPAN', 'foo'
Expand All @@ -461,8 +470,9 @@ describe 'ReactCoffeeScriptClass', ->
false

render: ->
span
React.createElement('span',
className: 'foo'
)

expect(->
test React.createElement(NamedComponent), 'SPAN', 'foo'
Expand All @@ -478,8 +488,9 @@ describe 'ReactCoffeeScriptClass', ->
false

render: ->
span
React.createElement('span',
className: 'foo'
)

expect(->
test React.createElement(NamedComponent), 'SPAN', 'foo'
Expand All @@ -491,7 +502,7 @@ describe 'ReactCoffeeScriptClass', ->

it 'should throw AND warn when trying to access classic APIs', ->
instance =
test Inner(name: 'foo'), 'DIV', 'foo'
test React.createElement(InnerComponent, name: 'foo'), 'DIV', 'foo'
expect(->
expect(-> instance.replaceState {}).toThrow()
).toWarnDev(
Expand All @@ -511,7 +522,7 @@ describe 'ReactCoffeeScriptClass', ->
@contextTypes:
bar: PropTypes.string
render: ->
div className: @context.bar
React.createElement('div', className: @context.bar)

class Foo extends React.Component
@childContextTypes:
Expand All @@ -527,16 +538,17 @@ describe 'ReactCoffeeScriptClass', ->
it 'supports classic refs', ->
class Foo extends React.Component
render: ->
Inner
React.createElement(InnerComponent,
name: 'foo'
ref: 'inner'
)

instance = test(React.createElement(Foo), 'DIV', 'foo')
expect(instance.refs.inner.getName()).toBe 'foo'
undefined

it 'supports drilling through to the DOM using findDOMNode', ->
instance = test Inner(name: 'foo'), 'DIV', 'foo'
instance = test React.createElement(InnerComponent, name: 'foo'), 'DIV', 'foo'
node = ReactDOM.findDOMNode(instance)
expect(node).toBe container.firstChild
undefined
Expand Down