Skip to content

Commit 7f62018

Browse files
authored
Ship diffInCommitPhase (facebook#27409)
Performance tests at Meta showed neutral results.
1 parent d9e00f7 commit 7f62018

21 files changed

+53
-686
lines changed

packages/react-art/src/ReactFiberConfigART.js

-6
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
1515
const pooledTransform = new Transform();
1616

1717
const NO_CONTEXT = {};
18-
const UPDATE_SIGNAL = {};
1918
if (__DEV__) {
2019
Object.freeze(NO_CONTEXT);
21-
Object.freeze(UPDATE_SIGNAL);
2220
}
2321

2422
/** Helper Methods */
@@ -312,10 +310,6 @@ export function prepareForCommit() {
312310
return null;
313311
}
314312

315-
export function prepareUpdate(domElement, type, oldProps, newProps) {
316-
return UPDATE_SIGNAL;
317-
}
318-
319313
export function resetAfterCommit() {
320314
// Noop
321315
}

packages/react-dom-bindings/src/client/CSSPropertyOperations.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import hyphenateStyleName from '../shared/hyphenateStyleName';
1111
import warnValidStyle from '../shared/warnValidStyle';
1212
import isUnitlessNumber from '../shared/isUnitlessNumber';
1313
import {checkCSSPropertyStringCoercion} from 'shared/CheckStringCoercion';
14-
import {diffInCommitPhase} from 'shared/ReactFeatureFlags';
1514

1615
/**
1716
* Operations for dealing with CSS properties.
@@ -126,7 +125,7 @@ export function setValueForStyles(node, styles, prevStyles) {
126125

127126
const style = node.style;
128127

129-
if (diffInCommitPhase && prevStyles != null) {
128+
if (prevStyles != null) {
130129
if (__DEV__) {
131130
validateShorthandPropertyCollisionInDev(prevStyles, styles);
132131
}
@@ -200,10 +199,7 @@ function expandShorthandMap(styles) {
200199
* {font: 'foo', fontVariant: 'bar'} -> {font: 'foo'}
201200
* becomes .style.fontVariant = ''
202201
*/
203-
export function validateShorthandPropertyCollisionInDev(
204-
prevStyles,
205-
nextStyles,
206-
) {
202+
function validateShorthandPropertyCollisionInDev(prevStyles, nextStyles) {
207203
if (__DEV__) {
208204
if (!nextStyles) {
209205
return;

0 commit comments

Comments
 (0)