{"files":[{"status":"M","path":"packages\/react-is\/src\/ReactIs.js"},{"status":"M","path":"packages\/react-is\/src\/__tests__\/ReactIs-test.js"},{"status":"M","path":"packages\/react-test-renderer\/src\/ReactShallowRenderer.js"}],"commit":{"authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com","subject":"Fix react-is memo and lazy type checks (#17278)","revision":"053cf0fedc91a1507080afe43d3be354ec346e9e","shortRevision":"053cf0fedc","authoredAt":"2019-11-05T10:37:12-08:00"},"parents":["0f3838a01b0fda0ac5fd054c6be13166697a113c"],"body":"","patch":"diff --git a\/packages\/react-is\/src\/ReactIs.js b\/packages\/react-is\/src\/ReactIs.js\nindex 085decb4a7..98142d7e01 100644\n--- a\/packages\/react-is\/src\/ReactIs.js\n+++ b\/packages\/react-is\/src\/ReactIs.js\n@@ -48,14 +48,14 @@ export function typeOf(object: any) {\n switch ($$typeofType) {\n case REACT_CONTEXT_TYPE:\n case REACT_FORWARD_REF_TYPE:\n+ case REACT_LAZY_TYPE:\n+ case REACT_MEMO_TYPE:\n case REACT_PROVIDER_TYPE:\n return $$typeofType;\n default:\n return $$typeof;\n }\n }\n- case REACT_LAZY_TYPE:\n- case REACT_MEMO_TYPE:\n case REACT_PORTAL_TYPE:\n return $$typeof;\n }\ndiff --git a\/packages\/react-is\/src\/__tests__\/ReactIs-test.js b\/packages\/react-is\/src\/__tests__\/ReactIs-test.js\nindex 1c47fd551b..ae2de7fe1c 100644\n--- a\/packages\/react-is\/src\/__tests__\/ReactIs-test.js\n+++ b\/packages\/react-is\/src\/__tests__\/ReactIs-test.js\n@@ -71,6 +71,7 @@ describe('ReactIs', () => {\n \n it('should identify context consumers', () => {\n const Context = React.createContext(false);\n+ expect(ReactIs.isValidElementType(Context.Consumer)).toBe(true);\n expect(ReactIs.typeOf()).toBe(ReactIs.ContextConsumer);\n expect(ReactIs.isContextConsumer()).toBe(true);\n expect(ReactIs.isContextConsumer()).toBe(false);\n@@ -79,6 +80,7 @@ describe('ReactIs', () => {\n \n it('should identify context providers', () => {\n const Context = React.createContext(false);\n+ expect(ReactIs.isValidElementType(Context.Provider)).toBe(true);\n expect(ReactIs.typeOf()).toBe(ReactIs.ContextProvider);\n expect(ReactIs.isContextProvider()).toBe(true);\n expect(ReactIs.isContextProvider()).toBe(false);\n@@ -106,6 +108,7 @@ describe('ReactIs', () => {\n \n it('should identify ref forwarding component', () => {\n const RefForwardingComponent = React.forwardRef((props, ref) => null);\n+ expect(ReactIs.isValidElementType(RefForwardingComponent)).toBe(true);\n expect(ReactIs.typeOf()).toBe(ReactIs.ForwardRef);\n expect(ReactIs.isForwardRef()).toBe(true);\n expect(ReactIs.isForwardRef({type: ReactIs.StrictMode})).toBe(false);\n@@ -113,6 +116,7 @@ describe('ReactIs', () => {\n });\n \n it('should identify fragments', () => {\n+ expect(ReactIs.isValidElementType(React.Fragment)).toBe(true);\n expect(ReactIs.typeOf()).toBe(ReactIs.Fragment);\n expect(ReactIs.isFragment()).toBe(true);\n expect(ReactIs.isFragment({type: ReactIs.Fragment})).toBe(false);\n@@ -124,6 +128,7 @@ describe('ReactIs', () => {\n it('should identify portals', () => {\n const div = document.createElement('div');\n const portal = ReactDOM.createPortal(

, div);\n+ expect(ReactIs.isValidElementType(portal)).toBe(false);\n expect(ReactIs.typeOf(portal)).toBe(ReactIs.Portal);\n expect(ReactIs.isPortal(portal)).toBe(true);\n expect(ReactIs.isPortal(div)).toBe(false);\n@@ -131,21 +136,24 @@ describe('ReactIs', () => {\n \n it('should identify memo', () => {\n const Component = () => React.createElement('div');\n- const memoized = React.memo(Component);\n- expect(ReactIs.typeOf(memoized)).toBe(ReactIs.Memo);\n- expect(ReactIs.isMemo(memoized)).toBe(true);\n- expect(ReactIs.isMemo(Component)).toBe(false);\n+ const Memoized = React.memo(Component);\n+ expect(ReactIs.isValidElementType(Memoized)).toBe(true);\n+ expect(ReactIs.typeOf()).toBe(ReactIs.Memo);\n+ expect(ReactIs.isMemo()).toBe(true);\n+ expect(ReactIs.isMemo()).toBe(false);\n });\n \n it('should identify lazy', () => {\n const Component = () => React.createElement('div');\n- const lazyComponent = React.lazy(() => Component);\n- expect(ReactIs.typeOf(lazyComponent)).toBe(ReactIs.Lazy);\n- expect(ReactIs.isLazy(lazyComponent)).toBe(true);\n- expect(ReactIs.isLazy(Component)).toBe(false);\n+ const LazyComponent = React.lazy(() => Component);\n+ expect(ReactIs.isValidElementType(LazyComponent)).toBe(true);\n+ expect(ReactIs.typeOf()).toBe(ReactIs.Lazy);\n+ expect(ReactIs.isLazy()).toBe(true);\n+ expect(ReactIs.isLazy()).toBe(false);\n });\n \n it('should identify strict mode', () => {\n+ expect(ReactIs.isValidElementType(React.StrictMode)).toBe(true);\n expect(ReactIs.typeOf()).toBe(ReactIs.StrictMode);\n expect(ReactIs.isStrictMode()).toBe(true);\n expect(ReactIs.isStrictMode({type: ReactIs.StrictMode})).toBe(false);\n@@ -153,6 +161,7 @@ describe('ReactIs', () => {\n });\n \n it('should identify suspense', () => {\n+ expect(ReactIs.isValidElementType(React.Suspense)).toBe(true);\n expect(ReactIs.typeOf()).toBe(ReactIs.Suspense);\n expect(ReactIs.isSuspense()).toBe(true);\n expect(ReactIs.isSuspense({type: ReactIs.Suspense})).toBe(false);\n@@ -161,6 +170,7 @@ describe('ReactIs', () => {\n });\n \n it('should identify profile root', () => {\n+ expect(ReactIs.isValidElementType(React.Profiler)).toBe(true);\n expect(\n ReactIs.typeOf(),\n ).toBe(ReactIs.Profiler);\ndiff --git a\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js b\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\nindex e4e32bd00e..6da6467698 100644\n--- a\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\n+++ b\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\n@@ -542,7 +542,7 @@ class ReactShallowRenderer {\n );\n invariant(\n isForwardRef(element) ||\n- (typeof element.type === 'function' || isMemo(element.type)),\n+ (typeof element.type === 'function' || isMemo(element)),\n 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +\n 'components, but the provided element type was `%s`.',\n Array.isArray(element.type)\n@@ -559,7 +559,7 @@ class ReactShallowRenderer {\n this._reset();\n }\n \n- const elementType = isMemo(element.type) ? element.type.type : element.type;\n+ const elementType = isMemo(element) ? element.type.type : element.type;\n const previousElement = this._element;\n \n this._rendering = true;\n@@ -567,7 +567,7 @@ class ReactShallowRenderer {\n this._context = getMaskedContext(elementType.contextTypes, context);\n \n \/\/ Inner memo component props aren't currently validated in createElement.\n- if (isMemo(element.type) && elementType.propTypes) {\n+ if (isMemo(element) && elementType.propTypes) {\n currentlyValidatingElement = element;\n checkPropTypes(\n elementType.propTypes,\n@@ -618,7 +618,7 @@ class ReactShallowRenderer {\n this._mountClassComponent(elementType, element, this._context);\n } else {\n let shouldRender = true;\n- if (isMemo(element.type) && previousElement !== null) {\n+ if (isMemo(element) && previousElement !== null) {\n \/\/ This is a Memo component that is being re-rendered.\n const compare = element.type.compare || shallowEqual;\n if (compare(previousElement.props, element.props)) {\n@@ -807,7 +807,7 @@ function getDisplayName(element) {\n } else if (typeof element.type === 'string') {\n return element.type;\n } else {\n- const elementType = isMemo(element.type) ? element.type.type : element.type;\n+ const elementType = isMemo(element) ? element.type.type : element.type;\n return elementType.displayName || elementType.name || 'Unknown';\n }\n }\n"}

dillon1000/react

Files changed