diff --git a/Libraries/Color/normalizeColor.js b/Libraries/Color/normalizeColor.js index f92b41a3e0767e..eaa8226fd1c6b9 100755 --- a/Libraries/Color/normalizeColor.js +++ b/Libraries/Color/normalizeColor.js @@ -11,7 +11,6 @@ /* eslint no-bitwise: 0 */ 'use strict'; -const normalizeColorObject = require('normalizeColorObject'); // TODO(macOS ISS#2323203) import type {NativeOrDynamicColorType} from 'normalizeColorObject'; // TODO(macOS ISS#2323203) function normalizeColor( @@ -33,6 +32,8 @@ function normalizeColor( // [TODO(macOS ISS#2323203) if (typeof color === 'object' && color !== null) { + const normalizeColorObject = require('normalizeColorObject'); // TODO(macOS ISS#2323203) + const normalizedColorObj = normalizeColorObject(color); if (normalizedColorObj !== null) { diff --git a/Libraries/Color/normalizeColorObject.macos.js b/Libraries/Color/normalizeColorObject.macos.js index 2092ceff12f348..018bf589d428d2 100644 --- a/Libraries/Color/normalizeColorObject.macos.js +++ b/Libraries/Color/normalizeColorObject.macos.js @@ -10,8 +10,6 @@ // [TODO(macOS ISS#2323203) 'use strict'; -const normalizeColor = require('normalizeColor'); - export type NativeOrDynamicColorType = { semantic?: string, dynamic?: { @@ -27,6 +25,8 @@ function normalizeColorObject( // a macos semantic color return color; } else if ('dynamic' in color && color.dynamic !== undefined) { + const normalizeColor = require('normalizeColor'); + // a dynamic, appearance aware color const dynamic = color.dynamic; const dynamicColor: NativeOrDynamicColorType = { diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js index fb5daf53d6659b..423f1bcdedf618 100644 --- a/Libraries/StyleSheet/processColor.js +++ b/Libraries/StyleSheet/processColor.js @@ -11,7 +11,6 @@ 'use strict'; const Platform = require('Platform'); -const processColorObject = require('processColorObject'); // TODO(macOS ISS#2323203) const normalizeColor = require('normalizeColor'); import type {NativeOrDynamicColorType} from 'normalizeColorObject'; // TODO(macOS ISS#2323203) @@ -29,6 +28,8 @@ function processColor( } if (typeof int32Color === 'object') { + const processColorObject = require('processColorObject'); // TODO(macOS ISS#2323203) + const processedColorObj = processColorObject(int32Color); if (processedColorObj !== null) {