We need to get the lastProp in when diffInCommitPhase is false

sebmarkbage · sebmarkbage · commit fbcdceb41eb9 · 2023-04-23T17:12:52.000-04:00
diff --git a/packages/react-dom-bindings/src/client/ReactDOMComponent.js b/packages/react-dom-bindings/src/client/ReactDOMComponent.js
@@ -1182,7 +1182,7 @@ export function setInitialProperties(
             break;
           }
           default: {
-            setProp(domElement, tag, propKey, propValue, props);
+            setProp(domElement, tag, propKey, propValue, props, null);
           }
         }
       }
@@ -1213,7 +1213,7 @@ export function setInitialProperties(
             break;
           }
           default: {
-            setProp(domElement, tag, propKey, propValue, props);
+            setProp(domElement, tag, propKey, propValue, props, null);
           }
         }
       }
@@ -1979,7 +1979,14 @@ export function updatePropertiesWithDiff(
             break;
           }
           default: {
-            setProp(domElement, tag, propKey, propValue, nextProps, null);
+            setProp(
+              domElement,
+              tag,
+              propKey,
+              propValue,
+              nextProps,
+              lastProps[propKey],
+            );
           }
         }
       }
@@ -2054,7 +2061,14 @@ export function updatePropertiesWithDiff(
           }
           // defaultValue are ignored by setProp
           default: {
-            setProp(domElement, tag, propKey, propValue, nextProps, null);
+            setProp(
+              domElement,
+              tag,
+              propKey,
+              propValue,
+              nextProps,
+              lastProps[propKey],
+            );
           }
         }
       }
@@ -2089,7 +2103,14 @@ export function updatePropertiesWithDiff(
           }
           // defaultValue is ignored by setProp
           default: {
-            setProp(domElement, tag, propKey, propValue, nextProps, null);
+            setProp(
+              domElement,
+              tag,
+              propKey,
+              propValue,
+              nextProps,
+              lastProps[propKey],
+            );
           }
         }
       }
@@ -2110,7 +2131,14 @@ export function updatePropertiesWithDiff(
             break;
           }
           default: {
-            setProp(domElement, tag, propKey, propValue, nextProps, null);
+            setProp(
+              domElement,
+              tag,
+              propKey,
+              propValue,
+              nextProps,
+              lastProps[propKey],
+            );
           }
         }
       }
@@ -2149,7 +2177,14 @@ export function updatePropertiesWithDiff(
           }
           // defaultChecked and defaultValue are ignored by setProp
           default: {
-            setProp(domElement, tag, propKey, propValue, nextProps, null);
+            setProp(
+              domElement,
+              tag,
+              propKey,
+              propValue,
+              nextProps,
+              lastProps[propKey],
+            );
           }
         }
       }
@@ -2166,7 +2201,7 @@ export function updatePropertiesWithDiff(
             propKey,
             propValue,
             nextProps,
-            null,
+            lastProps[propKey],
           );
         }
         return;
@@ -2178,7 +2213,7 @@ export function updatePropertiesWithDiff(
   for (let i = 0; i < updatePayload.length; i += 2) {
     const propKey = updatePayload[i];
     const propValue = updatePayload[i + 1];
-    setProp(domElement, tag, propKey, propValue, nextProps, null);
+    setProp(domElement, tag, propKey, propValue, nextProps, lastProps[propKey]);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1182,7 +1182,7 @@ export function setInitialProperties(`
`1182`	`1182`	`break;`
`1183`	`1183`	`}`
`1184`	`1184`	`default: {`
`1185`		`- setProp(domElement, tag, propKey, propValue, props);`
	`1185`	`+ setProp(domElement, tag, propKey, propValue, props, null);`
`1186`	`1186`	`}`
`1187`	`1187`	`}`
`1188`	`1188`	`}`
`@@ -1213,7 +1213,7 @@ export function setInitialProperties(`
`1213`	`1213`	`break;`
`1214`	`1214`	`}`
`1215`	`1215`	`default: {`
`1216`		`- setProp(domElement, tag, propKey, propValue, props);`
	`1216`	`+ setProp(domElement, tag, propKey, propValue, props, null);`
`1217`	`1217`	`}`
`1218`	`1218`	`}`
`1219`	`1219`	`}`
`@@ -1979,7 +1979,14 @@ export function updatePropertiesWithDiff(`
`1979`	`1979`	`break;`
`1980`	`1980`	`}`
`1981`	`1981`	`default: {`
`1982`		`- setProp(domElement, tag, propKey, propValue, nextProps, null);`
	`1982`	`+ setProp(`
	`1983`	`+ domElement,`
	`1984`	`+ tag,`
	`1985`	`+ propKey,`
	`1986`	`+ propValue,`
	`1987`	`+ nextProps,`
	`1988`	`+ lastProps[propKey],`
	`1989`	`+ );`
`1983`	`1990`	`}`
`1984`	`1991`	`}`
`1985`	`1992`	`}`
`@@ -2054,7 +2061,14 @@ export function updatePropertiesWithDiff(`
`2054`	`2061`	`}`
`2055`	`2062`	`// defaultValue are ignored by setProp`
`2056`	`2063`	`default: {`
`2057`		`- setProp(domElement, tag, propKey, propValue, nextProps, null);`
	`2064`	`+ setProp(`
	`2065`	`+ domElement,`
	`2066`	`+ tag,`
	`2067`	`+ propKey,`
	`2068`	`+ propValue,`
	`2069`	`+ nextProps,`
	`2070`	`+ lastProps[propKey],`
	`2071`	`+ );`
`2058`	`2072`	`}`
`2059`	`2073`	`}`
`2060`	`2074`	`}`
`@@ -2089,7 +2103,14 @@ export function updatePropertiesWithDiff(`
`2089`	`2103`	`}`
`2090`	`2104`	`// defaultValue is ignored by setProp`
`2091`	`2105`	`default: {`
`2092`		`- setProp(domElement, tag, propKey, propValue, nextProps, null);`
	`2106`	`+ setProp(`
	`2107`	`+ domElement,`
	`2108`	`+ tag,`
	`2109`	`+ propKey,`
	`2110`	`+ propValue,`
	`2111`	`+ nextProps,`
	`2112`	`+ lastProps[propKey],`
	`2113`	`+ );`
`2093`	`2114`	`}`
`2094`	`2115`	`}`
`2095`	`2116`	`}`
`@@ -2110,7 +2131,14 @@ export function updatePropertiesWithDiff(`
`2110`	`2131`	`break;`
`2111`	`2132`	`}`
`2112`	`2133`	`default: {`
`2113`		`- setProp(domElement, tag, propKey, propValue, nextProps, null);`
	`2134`	`+ setProp(`
	`2135`	`+ domElement,`
	`2136`	`+ tag,`
	`2137`	`+ propKey,`
	`2138`	`+ propValue,`
	`2139`	`+ nextProps,`
	`2140`	`+ lastProps[propKey],`
	`2141`	`+ );`
`2114`	`2142`	`}`
`2115`	`2143`	`}`
`2116`	`2144`	`}`
`@@ -2149,7 +2177,14 @@ export function updatePropertiesWithDiff(`
`2149`	`2177`	`}`
`2150`	`2178`	`// defaultChecked and defaultValue are ignored by setProp`
`2151`	`2179`	`default: {`
`2152`		`- setProp(domElement, tag, propKey, propValue, nextProps, null);`
	`2180`	`+ setProp(`
	`2181`	`+ domElement,`
	`2182`	`+ tag,`
	`2183`	`+ propKey,`
	`2184`	`+ propValue,`
	`2185`	`+ nextProps,`
	`2186`	`+ lastProps[propKey],`
	`2187`	`+ );`
`2153`	`2188`	`}`
`2154`	`2189`	`}`
`2155`	`2190`	`}`
`@@ -2166,7 +2201,7 @@ export function updatePropertiesWithDiff(`
`2166`	`2201`	`propKey,`
`2167`	`2202`	`propValue,`
`2168`	`2203`	`nextProps,`
`2169`		`- null,`
	`2204`	`+ lastProps[propKey],`
`2170`	`2205`	`);`
`2171`	`2206`	`}`
`2172`	`2207`	`return;`
`@@ -2178,7 +2213,7 @@ export function updatePropertiesWithDiff(`
`2178`	`2213`	`for (let i = 0; i < updatePayload.length; i += 2) {`
`2179`	`2214`	`const propKey = updatePayload[i];`
`2180`	`2215`	`const propValue = updatePayload[i + 1];`
`2181`		`- setProp(domElement, tag, propKey, propValue, nextProps, null);`
	`2216`	`+ setProp(domElement, tag, propKey, propValue, nextProps, lastProps[propKey]);`
`2182`	`2217`	`}`
`2183`	`2218`	`}`
`2184`	`2219`