[pull] main from react:main

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -92,17 +92,10 @@ describe('ReactFlight', () => {
  beforeEach(() => {
  // Mock performance.now for timing tests
  let time = 10;
- const now = jest.fn().mockImplementation(() => {
+ jest.spyOn(performance, 'timeOrigin', 'get').mockReturnValue(time);
+ jest.spyOn(performance, 'now').mockImplementation(() => {
  return time++;
  });
- Object.defineProperty(performance, 'timeOrigin', {
- value: time,
- configurable: true,
- });
- Object.defineProperty(performance, 'now', {
- value: now,
- configurable: true,
- });
 
  jest.resetModules();
  jest.mock('react', () => require('react/react.react-server'));

packages/react-client/src/__tests__/ReactFlightDebugChannel-test.js

@@ -29,17 +29,10 @@ describe('ReactFlight', () => {
  beforeEach(() => {
  // Mock performance.now for timing tests
  let time = 10;
- const now = jest.fn().mockImplementation(() => {
+ jest.spyOn(performance, 'timeOrigin', 'get').mockReturnValue(time);
+ jest.spyOn(performance, 'now').mockImplementation(() => {
  return time++;
  });
- Object.defineProperty(performance, 'timeOrigin', {
- value: time,
- configurable: true,
- });
- Object.defineProperty(performance, 'now', {
- value: now,
- configurable: true,
- });
 
  jest.resetModules();
  jest.mock('react', () => require('react/react.react-server'));

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

@@ -3152,7 +3152,7 @@ function normalizeListenerOptions(
  opts: ?EventListenerOptionsOrUseCapture,
 ): string {
  if (opts == null) {
- return '0';
+ return 'c=0';
  }
 
  if (typeof opts === 'boolean') {

packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js

@@ -832,6 +832,47 @@ describe('FragmentRefs', () => {
  expect(logs).toEqual([]);
  });
 
+ // @gate enableFragmentRefs
+ it('matches listeners by their normalized capture flag', async () => {
+ const fragmentRef = React.createRef();
+ const childRef = React.createRef();
+ const root = ReactDOMClient.createRoot(container);
+ const logs = [];
+
+ function addedWithOmittedOptions() {
+ logs.push('addedWithOmittedOptions');
+ }
+
+ function addedWithCaptureFalse() {
+ logs.push('addedWithCaptureFalse');
+ }
+
+ await act(() => {
+ root.render(
+ <Fragment ref={fragmentRef}>
+ <div ref={childRef}>child</div>
+ </Fragment>,
+ );
+ });
+
+ fragmentRef.current.addEventListener('click', addedWithOmittedOptions);
+ fragmentRef.current.addEventListener('click', addedWithCaptureFalse, {
+ capture: false,
+ });
+
+ // Omitted options and an explicit capture: false are the same
+ // EventTarget listener identity, so each removal should match.
+ fragmentRef.current.removeEventListener(
+ 'click',
+ addedWithOmittedOptions,
+ false,
+ );
+ fragmentRef.current.removeEventListener('click', addedWithCaptureFalse);
+
+ childRef.current.click();
+ expect(logs).toEqual([]);
+ });
+
  // @gate enableFragmentRefs
  it('adds and removes event listeners from children with multiple fragments', async () => {
  const fragmentRef = React.createRef();

packages/react-reconciler/src/__tests__/ReactOwnerStacks-test.js

@@ -27,17 +27,10 @@ describe('ReactOwnerStacks', () => {
  time += timeMS;
  };
 
- const now = jest.fn().mockImplementation(() => {
+ jest.spyOn(performance, 'timeOrigin', 'get').mockReturnValue(time);
+ jest.spyOn(performance, 'now').mockImplementation(() => {
  return time++;
  });
- Object.defineProperty(performance, 'timeOrigin', {
- value: time,
- configurable: true,
- });
- Object.defineProperty(performance, 'now', {
- value: now,
- configurable: true,
- });
 
  jest.resetModules();
  React = require('react');

packages/react-reconciler/src/__tests__/ReactPerformanceTrack-test.js

@@ -19,18 +19,17 @@ describe('ReactPerformanceTracks', () => {
 
  beforeEach(() => {
  performanceMeasureCalls.length = 0;
- Object.defineProperty(performance, 'measure', {
- value: jest.fn((measureName, reusableOptions) => {
+ jest
+ .spyOn(performance, 'measure')
+ .mockImplementation((measureName, reusableOptions) => {
  performanceMeasureCalls.push([
  measureName,
  {
  // React will mutate the options it passes to performance.measure.
  ...reusableOptions,
  },
  ]);
- }),
- configurable: true,
- });
+ });
  console.timeStamp = () => {};
  jest.spyOn(console, 'timeStamp').mockImplementation(() => {});
 

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js

@@ -47,17 +47,10 @@ describe('ReactFlightDOMEdge', () => {
  beforeEach(() => {
  // Mock performance.now for timing tests
  let time = 10;
- const now = jest.fn().mockImplementation(() => {
+ jest.spyOn(performance, 'timeOrigin', 'get').mockReturnValue(time);
+ jest.spyOn(performance, 'now').mockImplementation(() => {
  return time++;
  });
- Object.defineProperty(performance, 'timeOrigin', {
- value: time,
- configurable: true,
- });
- Object.defineProperty(performance, 'now', {
- value: now,
- configurable: true,
- });
 
  jest.resetModules();
 

packages/react-server/src/__tests__/ReactFlightServer-test.js

@@ -46,17 +46,10 @@ describe('ReactFlight', () => {
  time += timeMS;
  jest.advanceTimersByTime(timeMS);
  };
- const now = jest.fn().mockImplementation(() => {
+ jest.spyOn(performance, 'timeOrigin', 'get').mockReturnValue(time);
+ jest.spyOn(performance, 'now').mockImplementation(() => {
  return time++;
  });
- Object.defineProperty(performance, 'timeOrigin', {
- value: time,
- configurable: true,
- });
- Object.defineProperty(performance, 'now', {
- value: now,
- configurable: true,
- });
 
  jest.resetModules();
  jest.mock('react', () => require('react/react.react-server'));