Skip to content

Fix regression caused by PR 146: 'add normalize/processColorObject.js for ios and macos' #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2019
Merged

Fix regression caused by PR 146: 'add normalize/processColorObject.js for ios and macos' #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Libraries/Color/normalizeColor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Color/normalizeColorObject.macos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
// [TODO(macOS ISS#2323203)
'use strict';

const normalizeColor = require('normalizeColor');

export type NativeOrDynamicColorType = {
semantic?: string,
dynamic?: {
Expand All @@ -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 = {
Expand Down
3 changes: 2 additions & 1 deletion Libraries/StyleSheet/processColor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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) {
Expand Down