diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js index f7b47992e30..a4bf241c811 100644 --- a/Libraries/Components/Slider/Slider.js +++ b/Libraries/Components/Slider/Slider.js @@ -11,7 +11,7 @@ 'use strict'; const Platform = require('../../Utilities/Platform'); -const SliderNativeComponent = require('./SliderNativeComponent'); +import SliderNativeComponent from './SliderNativeComponent'; const React = require('react'); const ReactNative = require('../../Renderer/shims/ReactNative'); const StyleSheet = require('../../StyleSheet/StyleSheet'); diff --git a/Libraries/Components/Slider/SliderNativeComponent.js b/Libraries/Components/Slider/SliderNativeComponent.js index 004fed84ed8..4bfb5355abc 100644 --- a/Libraries/Components/Slider/SliderNativeComponent.js +++ b/Libraries/Components/Slider/SliderNativeComponent.js @@ -53,7 +53,7 @@ type NativeProps = $ReadOnly<{| onSlidingComplete?: ?(event: DirectEvent) => void, |}>; -module.exports = codegenNativeComponent('Slider', { +export default codegenNativeComponent('Slider', { interfaceOnly: true, isDeprecatedPaperComponentNameRCT: true, }); diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js index dfd4067e330..2a069baa1fb 100644 --- a/Libraries/Components/Switch/Switch.js +++ b/Libraries/Components/Switch/Switch.js @@ -10,7 +10,7 @@ 'use strict'; -const SwitchNativeComponent = require('./SwitchNativeComponent'); +import SwitchNativeComponent from './SwitchNativeComponent'; const AndroidSwitchNativeComponent = require('./AndroidSwitchNativeComponent'); const Platform = require('../../Utilities/Platform'); const React = require('react'); diff --git a/Libraries/Components/Switch/SwitchNativeComponent.js b/Libraries/Components/Switch/SwitchNativeComponent.js index b9c113b3b27..fe95c8237cb 100644 --- a/Libraries/Components/Switch/SwitchNativeComponent.js +++ b/Libraries/Components/Switch/SwitchNativeComponent.js @@ -39,6 +39,6 @@ type NativeProps = $ReadOnly<{| onChange?: ?(event: BubblingEvent) => mixed, |}>; -module.exports = codegenNativeComponent('Switch', { +export default codegenNativeComponent('Switch', { isDeprecatedPaperComponentNameRCT: true, }); diff --git a/Libraries/Utilities/verifyComponentAttributeEquivalence.js b/Libraries/Utilities/verifyComponentAttributeEquivalence.js index 97c7bf81399..560cf9f0ee1 100644 --- a/Libraries/Utilities/verifyComponentAttributeEquivalence.js +++ b/Libraries/Utilities/verifyComponentAttributeEquivalence.js @@ -106,6 +106,10 @@ export function getConfigWithoutViewProps( viewConfig: ReactNativeBaseComponentViewConfig<>, propName: string, ) { + if (!viewConfig[propName]) { + return {}; + } + return Object.keys(viewConfig[propName]) .filter(prop => !ReactNativeViewViewConfig[propName][prop]) .reduce((obj, prop) => {