Skip to content

Commit

Permalink
Revert "Clean up Selective Hydration / Event Replay flag (facebook#24156
Browse files Browse the repository at this point in the history
)"

This reverts commit b5cca18.
  • Loading branch information
rickhanlonii committed Apr 19, 2022
1 parent d63cd97 commit 3dba438
Show file tree
Hide file tree
Showing 19 changed files with 565 additions and 72 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2415,8 +2415,18 @@ describe('ReactDOMServerPartialHydration', () => {
await promise;
});

expect(clicks).toBe(0);
expect(container.textContent).toBe('Click meHello');
if (
gate(
flags =>
flags.enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
)
) {
expect(clicks).toBe(0);
expect(container.textContent).toBe('Click meHello');
} else {
expect(clicks).toBe(1);
expect(container.textContent).toBe('Hello');
}
document.body.removeChild(container);
});

Expand Down Expand Up @@ -2498,7 +2508,17 @@ describe('ReactDOMServerPartialHydration', () => {
await promise;
});

expect(onEvent).toHaveBeenCalledTimes(0);
if (
gate(
flags =>
flags.enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
)
) {
expect(onEvent).toHaveBeenCalledTimes(0);
} else {
expect(onEvent).toHaveBeenCalledTimes(2);
}

document.body.removeChild(container);
});

Expand Down Expand Up @@ -2578,7 +2598,16 @@ describe('ReactDOMServerPartialHydration', () => {
await promise;
});

expect(clicks).toBe(0);
if (
gate(
flags =>
flags.enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
)
) {
expect(clicks).toBe(0);
} else {
expect(clicks).toBe(2);
}

document.body.removeChild(container);
});
Expand Down Expand Up @@ -2663,7 +2692,17 @@ describe('ReactDOMServerPartialHydration', () => {
resolve();
await promise;
});
expect(onEvent).toHaveBeenCalledTimes(0);
if (
gate(
flags =>
flags.enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
)
) {
expect(onEvent).toHaveBeenCalledTimes(0);
} else {
expect(onEvent).toHaveBeenCalledTimes(2);
}

document.body.removeChild(container);
});

Expand Down Expand Up @@ -2734,8 +2773,19 @@ describe('ReactDOMServerPartialHydration', () => {
await promise;
});

expect(clicksOnChild).toBe(0);
expect(clicksOnParent).toBe(0);
if (
gate(
flags =>
flags.enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
)
) {
expect(clicksOnChild).toBe(0);
expect(clicksOnParent).toBe(0);
} else {
expect(clicksOnChild).toBe(1);
// This will be zero due to the stopPropagation.
expect(clicksOnParent).toBe(0);
}

document.body.removeChild(container);
});
Expand Down Expand Up @@ -2811,7 +2861,16 @@ describe('ReactDOMServerPartialHydration', () => {
});

// We're now full hydrated.
expect(clicks).toBe(0);
if (
gate(
flags =>
flags.enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
)
) {
expect(clicks).toBe(0);
} else {
expect(clicks).toBe(1);
}

document.body.removeChild(parentContainer);
});
Expand Down Expand Up @@ -3080,9 +3139,19 @@ describe('ReactDOMServerPartialHydration', () => {
await promise;
});

// discrete event not replayed
expect(submits).toBe(0);
expect(container.textContent).toBe('Click meHello');
if (
gate(
flags =>
flags.enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
)
) {
// discrete event not replayed
expect(submits).toBe(0);
expect(container.textContent).toBe('Click meHello');
} else {
expect(submits).toBe(1);
expect(container.textContent).toBe('Hello');
}

document.body.removeChild(container);
});
Expand Down
Loading

0 comments on commit 3dba438

Please sign in to comment.