diff --git a/Libraries/Animated/src/nodes/AnimatedInterpolation.js b/Libraries/Animated/src/nodes/AnimatedInterpolation.js index de029222c4..1bf6af4b27 100644 --- a/Libraries/Animated/src/nodes/AnimatedInterpolation.js +++ b/Libraries/Animated/src/nodes/AnimatedInterpolation.js @@ -17,7 +17,7 @@ const AnimatedWithChildren = require('./AnimatedWithChildren'); const NativeAnimatedHelper = require('../NativeAnimatedHelper'); const invariant = require('invariant'); -const normalizeColor = require('../../../Color/normalizeColor'); +const normalizeColor = require('../../../StyleSheet/normalizeColor'); type ExtrapolateType = 'extend' | 'identity' | 'clamp'; diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js index 3ec606883e..a55164413f 100644 --- a/Libraries/Components/Touchable/Touchable.js +++ b/Libraries/Components/Touchable/Touchable.js @@ -22,7 +22,7 @@ const View = require('../View/View'); const SoundManager = require('../Sound/SoundManager'); const keyMirror = require('fbjs/lib/keyMirror'); -const normalizeColor = require('../../Color/normalizeColor'); +const normalizeColor = require('../../StyleSheet/normalizeColor'); import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType'; import type {PressEvent} from '../../Types/CoreEventTypes'; diff --git a/Libraries/DeprecatedPropTypes/DeprecatedColorPropType.js b/Libraries/DeprecatedPropTypes/DeprecatedColorPropType.js index 68e9acba8f..caa6858a20 100644 --- a/Libraries/DeprecatedPropTypes/DeprecatedColorPropType.js +++ b/Libraries/DeprecatedPropTypes/DeprecatedColorPropType.js @@ -9,7 +9,7 @@ 'use strict'; -const normalizeColor = require('../Color/normalizeColor'); +const normalizeColor = require('../StyleSheet/normalizeColor'); const colorPropType = function( isRequired, diff --git a/Libraries/Pressability/PressabilityDebug.js b/Libraries/Pressability/PressabilityDebug.js index f4580ddb91..3117125b59 100644 --- a/Libraries/Pressability/PressabilityDebug.js +++ b/Libraries/Pressability/PressabilityDebug.js @@ -10,7 +10,7 @@ 'use strict'; -import normalizeColor from '../Color/normalizeColor.js'; +import normalizeColor from '../StyleSheet/normalizeColor.js'; import {Touchable, View} from 'react-native'; import * as React from 'react'; diff --git a/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js index 094bd0a812..35e8cfd03e 100644 --- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js +++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js @@ -10,7 +10,7 @@ 'use strict'; -const normalizeColor = require('../../Color/normalizeColor'); +const normalizeColor = require('../normalizeColor'); describe('normalizeColor', function() { it('should accept only spec compliant colors', function() { diff --git a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js index 9a33bf1535..bc400b56c9 100644 --- a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js +++ b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js @@ -11,7 +11,7 @@ 'use strict'; const setNormalizedColorAlpha = require('../setNormalizedColorAlpha'); -const normalizeColor = require('../../Color/normalizeColor'); +const normalizeColor = require('../normalizeColor'); describe('setNormalizedColorAlpha', function() { it('should adjust the alpha of the color passed in', function() { diff --git a/Libraries/Color/normalizeColor.js b/Libraries/StyleSheet/normalizeColor.js similarity index 100% rename from Libraries/Color/normalizeColor.js rename to Libraries/StyleSheet/normalizeColor.js diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js index cfad1676f4..28293e0df1 100644 --- a/Libraries/StyleSheet/processColor.js +++ b/Libraries/StyleSheet/processColor.js @@ -12,7 +12,7 @@ const Platform = require('../Utilities/Platform'); -const normalizeColor = require('../Color/normalizeColor'); +const normalizeColor = require('./normalizeColor'); /* eslint no-bitwise: 0 */ function processColor(color?: ?(string | number)): ?number {