Skip to content

Ship diffInCommitPhase #27409

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 23, 2023
Merged

Ship diffInCommitPhase #27409

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
6 changes: 0 additions & 6 deletions packages/react-art/src/ReactFiberConfigART.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
const pooledTransform = new Transform();

const NO_CONTEXT = {};
const UPDATE_SIGNAL = {};
if (__DEV__) {
Object.freeze(NO_CONTEXT);
Object.freeze(UPDATE_SIGNAL);
}

/** Helper Methods */
Expand Down Expand Up @@ -312,10 +310,6 @@ export function prepareForCommit() {
return null;
}

export function prepareUpdate(domElement, type, oldProps, newProps) {
return UPDATE_SIGNAL;
}

export function resetAfterCommit() {
// Noop
}
Expand Down
8 changes: 2 additions & 6 deletions packages/react-dom-bindings/src/client/CSSPropertyOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import hyphenateStyleName from '../shared/hyphenateStyleName';
import warnValidStyle from '../shared/warnValidStyle';
import isUnitlessNumber from '../shared/isUnitlessNumber';
import {checkCSSPropertyStringCoercion} from 'shared/CheckStringCoercion';
import {diffInCommitPhase} from 'shared/ReactFeatureFlags';

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

const style = node.style;

if (diffInCommitPhase && prevStyles != null) {
if (prevStyles != null) {
if (__DEV__) {
validateShorthandPropertyCollisionInDev(prevStyles, styles);
}
Expand Down Expand Up @@ -200,10 +199,7 @@ function expandShorthandMap(styles) {
* {font: 'foo', fontVariant: 'bar'} -> {font: 'foo'}
* becomes .style.fontVariant = ''
*/
export function validateShorthandPropertyCollisionInDev(
prevStyles,
nextStyles,
) {
function validateShorthandPropertyCollisionInDev(prevStyles, nextStyles) {
if (__DEV__) {
if (!nextStyles) {
return;
Expand Down
Loading