Skip to content

Commit 5eea800

Browse files
authored
Fix regression caused by PR #146. (#152)
1 parent f6ace25 commit 5eea800

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Libraries/Color/normalizeColor.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/* eslint no-bitwise: 0 */
1212
'use strict';
1313

14-
const normalizeColorObject = require('normalizeColorObject'); // TODO(macOS ISS#2323203)
1514
import type {NativeOrDynamicColorType} from 'normalizeColorObject'; // TODO(macOS ISS#2323203)
1615

1716
function normalizeColor(
@@ -33,6 +32,8 @@ function normalizeColor(
3332

3433
// [TODO(macOS ISS#2323203)
3534
if (typeof color === 'object' && color !== null) {
35+
const normalizeColorObject = require('normalizeColorObject'); // TODO(macOS ISS#2323203)
36+
3637
const normalizedColorObj = normalizeColorObject(color);
3738

3839
if (normalizedColorObj !== null) {

Libraries/Color/normalizeColorObject.macos.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
// [TODO(macOS ISS#2323203)
1111
'use strict';
1212

13-
const normalizeColor = require('normalizeColor');
14-
1513
export type NativeOrDynamicColorType = {
1614
semantic?: string,
1715
dynamic?: {
@@ -27,6 +25,8 @@ function normalizeColorObject(
2725
// a macos semantic color
2826
return color;
2927
} else if ('dynamic' in color && color.dynamic !== undefined) {
28+
const normalizeColor = require('normalizeColor');
29+
3030
// a dynamic, appearance aware color
3131
const dynamic = color.dynamic;
3232
const dynamicColor: NativeOrDynamicColorType = {

Libraries/StyleSheet/processColor.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
'use strict';
1212

1313
const Platform = require('Platform');
14-
const processColorObject = require('processColorObject'); // TODO(macOS ISS#2323203)
1514
const normalizeColor = require('normalizeColor');
1615
import type {NativeOrDynamicColorType} from 'normalizeColorObject'; // TODO(macOS ISS#2323203)
1716

@@ -29,6 +28,8 @@ function processColor(
2928
}
3029

3130
if (typeof int32Color === 'object') {
31+
const processColorObject = require('processColorObject'); // TODO(macOS ISS#2323203)
32+
3233
const processedColorObj = processColorObject(int32Color);
3334

3435
if (processedColorObj !== null) {

0 commit comments

Comments
 (0)