Skip to content

Commit fba82af

Browse files
committed
Improve general code readability
1 parent 5b24cfd commit fba82af

File tree

1 file changed

+22
-27
lines changed

1 file changed

+22
-27
lines changed

packages/react-dom/src/client/ReactDOMHostConfig.js

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -670,45 +670,40 @@ export function registerSuspenseInstanceRetry(
670670
instance._reactRetry = callback;
671671
}
672672

673-
function isHydratableNode(node: Node) {
674-
const nodeType = node.nodeType;
675-
if (nodeType === ELEMENT_NODE || nodeType === TEXT_NODE) {
676-
return true;
677-
}
678-
if (enableSuspenseServerRenderer) {
679-
if (nodeType === COMMENT_NODE) {
680-
return true;
673+
function getNextHydratable(node) {
674+
// Skip non-hydratable nodes.
675+
for (; node != null; node = node.nextSibling) {
676+
const nodeType = node.nodeType;
677+
if (nodeType === ELEMENT_NODE || nodeType === TEXT_NODE) {
678+
break;
679+
}
680+
if (enableSuspenseServerRenderer) {
681+
if (nodeType === COMMENT_NODE) {
682+
break;
683+
}
684+
const nodeData = (node: any).data;
685+
if (
686+
nodeData === SUSPENSE_START_DATA ||
687+
nodeData === SUSPENSE_FALLBACK_START_DATA ||
688+
nodeData === SUSPENSE_PENDING_START_DATA
689+
) {
690+
break;
691+
}
681692
}
682-
const nodeData = (node: any).data;
683-
return (
684-
nodeData === SUSPENSE_START_DATA ||
685-
nodeData === SUSPENSE_FALLBACK_START_DATA ||
686-
nodeData === SUSPENSE_PENDING_START_DATA
687-
);
688693
}
689-
return false;
694+
return (node: any);
690695
}
691696

692697
export function getNextHydratableSibling(
693698
instance: HydratableInstance,
694699
): null | HydratableInstance {
695-
let node = instance.nextSibling;
696-
// Skip non-hydratable nodes.
697-
while (node != null && !isHydratableNode(node)) {
698-
node = node.nextSibling;
699-
}
700-
return (node: any);
700+
return getNextHydratable(instance.nextSibling);
701701
}
702702

703703
export function getFirstHydratableChild(
704704
parentInstance: Container | Instance,
705705
): null | HydratableInstance {
706-
let node = parentInstance.firstChild;
707-
// Skip non-hydratable nodes.
708-
while (node != null && !isHydratableNode(node)) {
709-
node = node.nextSibling;
710-
}
711-
return (node: any);
706+
return getNextHydratable(parentInstance.firstChild);
712707
}
713708

714709
export function hydrateInstance(

0 commit comments

Comments
 (0)