Skip to content

Android: Refactor HierarchyOptimizer in preparation of inline view support#8908

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

Closed
rigdern wants to merge 2 commits into from
Closed

Android: Refactor HierarchyOptimizer in preparation of inline view support #8908

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c40ae1
Refactor HierarchyOptimizer to collapse add*LayoutOnlyNodeToLayoutOnl…
Jul 5, 2016
14c3afe
Refactor HierarchyOptimizer to extract addGrandchildren
Jul 5, 2016
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
142 changes: 68 additions & 74 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,16 @@
*/
public class NativeViewHierarchyOptimizer {

private static class NodeIndexPair {
public final ReactShadowNode node;
public final int index;

NodeIndexPair(ReactShadowNode node, int index) {
this.node = node;
this.index = index;
}
}

private static final boolean ENABLED = true;

private final UIViewOperationQueue mUIViewOperationQueue;
Expand DownExpand Up@@ -221,21 +231,39 @@ public void onBatchComplete() {
mTagsWithLayoutVisited.clear();
}

private NodeIndexPair walkUpUntilNonLayoutOnly(
ReactShadowNode node,
int indexInNativeChildren) {
while (node.isLayoutOnly()) {
ReactShadowNode parent = node.getParent();
if (parent == null) {
return null;
}

indexInNativeChildren = indexInNativeChildren + parent.getNativeOffsetForChild(node);
node = parent;
}

return new NodeIndexPair(node, indexInNativeChildren);
}

private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
boolean parentIsLayoutOnly = parent.isLayoutOnly();
boolean childIsLayoutOnly = child.isLayoutOnly();

// Switch on the four cases of:
// add (layout-only|not layout-only) to (layout-only|not layout-only)
if (!parentIsLayoutOnly && !childIsLayoutOnly) {
addNonLayoutNodeToNonLayoutNode(parent, child, indexInNativeChildren);
} else if (!childIsLayoutOnly) {
addNonLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
} else if (!parentIsLayoutOnly) {
addLayoutOnlyNodeToNonLayoutOnlyNode(parent, child, indexInNativeChildren);
if (parent.isLayoutOnly()) {
NodeIndexPair result = walkUpUntilNonLayoutOnly(parent, indexInNativeChildren);
if (result == null) {
// If the parent hasn't been attached to its native parent yet, don't issue commands to the
// native hierarchy. We'll do that when the parent node actually gets attached somewhere.
return;
}
parent = result.node;
indexInNativeChildren = result.index;
}

if (!child.isLayoutOnly()) {
addNonLayoutNode(parent, child, indexInNativeChildren);
} else {
addLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
addLayoutOnlyNode(parent, child, indexInNativeChildren);
}
}

Expand All@@ -262,73 +290,14 @@ private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDe
}
}

private void addLayoutOnlyNodeToLayoutOnlyNode(
ReactShadowNode parent,
ReactShadowNode child,
int index) {
ReactShadowNode parentParent = parent.getParent();

// If the parent hasn't been attached to its parent yet, don't issue commands to the native
// hierarchy. We'll do that when the parent node actually gets attached somewhere.
if (parentParent == null) {
return;
}

int transformedIndex = index + parentParent.getNativeOffsetForChild(parent);
if (parentParent.isLayoutOnly()) {
addLayoutOnlyNodeToLayoutOnlyNode(parentParent, child, transformedIndex);
} else {
addLayoutOnlyNodeToNonLayoutOnlyNode(parentParent, child, transformedIndex);
}
}

private void addNonLayoutOnlyNodeToLayoutOnlyNode(
ReactShadowNode layoutOnlyNode,
ReactShadowNode nonLayoutOnlyNode,
int index) {
ReactShadowNode parent = layoutOnlyNode.getParent();

// If the parent hasn't been attached to its parent yet, don't issue commands to the native
// hierarchy. We'll do that when the parent node actually gets attached somewhere.
if (parent == null) {
return;
}

int transformedIndex = index + parent.getNativeOffsetForChild(layoutOnlyNode);
if (parent.isLayoutOnly()) {
addNonLayoutOnlyNodeToLayoutOnlyNode(parent, nonLayoutOnlyNode, transformedIndex);
} else {
addNonLayoutNodeToNonLayoutNode(parent, nonLayoutOnlyNode, transformedIndex);
}
}

private void addLayoutOnlyNodeToNonLayoutOnlyNode(
private void addLayoutOnlyNode(
ReactShadowNode nonLayoutOnlyNode,
ReactShadowNode layoutOnlyNode,
int index) {
// Add all of the layout-only node's children to its parent instead
int currentIndex = index;
for (int i = 0; i < layoutOnlyNode.getChildCount(); i++) {
ReactShadowNode childToAdd = layoutOnlyNode.getChildAt(i);
Assertions.assertCondition(childToAdd.getNativeParent() == null);

if (childToAdd.isLayoutOnly()) {
// Adding this layout-only child could result in adding multiple native views
int childCountBefore = nonLayoutOnlyNode.getNativeChildCount();
addLayoutOnlyNodeToNonLayoutOnlyNode(
nonLayoutOnlyNode,
childToAdd,
currentIndex);
int childCountAfter = nonLayoutOnlyNode.getNativeChildCount();
currentIndex += childCountAfter - childCountBefore;
} else {
addNonLayoutNodeToNonLayoutNode(nonLayoutOnlyNode, childToAdd, currentIndex);
currentIndex++;
}
}
addGrandchildren(nonLayoutOnlyNode, layoutOnlyNode, index);
}

private void addNonLayoutNodeToNonLayoutNode(
private void addNonLayoutNode(
ReactShadowNode parent,
ReactShadowNode child,
int index) {
Expand All@@ -340,6 +309,31 @@ private void addNonLayoutNodeToNonLayoutNode(
null);
}

private void addGrandchildren(
ReactShadowNode nativeParent,
ReactShadowNode child,
int index) {
Assertions.assertCondition(!nativeParent.isLayoutOnly());

// `child` can't hold native children. Add all of `child`'s children to `parent`.
int currentIndex = index;
for (int i = 0; i < child.getChildCount(); i++) {
ReactShadowNode grandchild = child.getChildAt(i);
Assertions.assertCondition(grandchild.getNativeParent() == null);

if (grandchild.isLayoutOnly()) {
// Adding this child could result in adding multiple native views
int grandchildCountBefore = nativeParent.getNativeChildCount();
addLayoutOnlyNode(nativeParent, grandchild, currentIndex);
int grandchildCountAfter = nativeParent.getNativeChildCount();
currentIndex += grandchildCountAfter - grandchildCountBefore;
} else {
addNonLayoutNode(nativeParent, grandchild, currentIndex);
currentIndex++;
}
}
}

private void applyLayoutBase(ReactShadowNode node) {
int tag = node.getReactTag();
if (mTagsWithLayoutVisited.get(tag)) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Android: Refactor HierarchyOptimizer in preparation of inline view support by rigdern · Pull Request #8908 · react/react-native · GitHub
Skip to content
Android: Refactor HierarchyOptimizer in preparation of inline view support#8908

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

 Closed

rigdern
wants to merge
2
commits into

from

 Closed


Android: Refactor HierarchyOptimizer in preparation of inline view support
#8908
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6c40ae1

Refactor HierarchyOptimizer to collapse add*LayoutOnlyNodeToLayoutOnl…

Jul 5, 2016
14c3afe

Refactor HierarchyOptimizer to extract addGrandchildren

Jul 5, 2016

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


142 changes: 68 additions & 74 deletions
ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,16 @@
 */
public class NativeViewHierarchyOptimizer {

 private static class NodeIndexPair {
 public final ReactShadowNode node;
 public final int index;

 NodeIndexPair(ReactShadowNode node, int index) {
 this.node = node;
 this.index = index;
 }
 }

 private static final boolean ENABLED = true;

 private final UIViewOperationQueue mUIViewOperationQueue;
Expand DownExpand Up@@ -221,21 +231,39 @@ public void onBatchComplete() {
 mTagsWithLayoutVisited.clear();
 }

 private NodeIndexPair walkUpUntilNonLayoutOnly(
 ReactShadowNode node,
 int indexInNativeChildren) {
 while (node.isLayoutOnly()) {
 ReactShadowNode parent = node.getParent();
 if (parent == null) {
 return null;
 }

 indexInNativeChildren = indexInNativeChildren + parent.getNativeOffsetForChild(node);
 node = parent;
 }

 return new NodeIndexPair(node, indexInNativeChildren);
 }

 private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
 int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
 boolean parentIsLayoutOnly = parent.isLayoutOnly();
 boolean childIsLayoutOnly = child.isLayoutOnly();

 // Switch on the four cases of:
 // add (layout-only|not layout-only) to (layout-only|not layout-only)
 if (!parentIsLayoutOnly && !childIsLayoutOnly) {
 addNonLayoutNodeToNonLayoutNode(parent, child, indexInNativeChildren);
 } else if (!childIsLayoutOnly) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
 } else if (!parentIsLayoutOnly) {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parent, child, indexInNativeChildren);
 if (parent.isLayoutOnly()) {
 NodeIndexPair result = walkUpUntilNonLayoutOnly(parent, indexInNativeChildren);
 if (result == null) {
 // If the parent hasn't been attached to its native parent yet, don't issue commands to the
 // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
 return;
 }
 parent = result.node;
 indexInNativeChildren = result.index;
 }

 if (!child.isLayoutOnly()) {
 addNonLayoutNode(parent, child, indexInNativeChildren);
 } else {
addLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
addLayoutOnlyNode(parent, child, indexInNativeChildren);
 }
 }

Expand All@@ -262,73 +290,14 @@ private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDe
 }
 }

 private void addLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
 ReactShadowNode parentParent = parent.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parentParent == null) {
 return;
 }

 int transformedIndex = index + parentParent.getNativeOffsetForChild(parent);
 if (parentParent.isLayoutOnly()) {
 addLayoutOnlyNodeToLayoutOnlyNode(parentParent, child, transformedIndex);
 } else {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parentParent, child, transformedIndex);
 }
 }

 private void addNonLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode layoutOnlyNode,
 ReactShadowNode nonLayoutOnlyNode,
 int index) {
 ReactShadowNode parent = layoutOnlyNode.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parent == null) {
 return;
 }

 int transformedIndex = index + parent.getNativeOffsetForChild(layoutOnlyNode);
 if (parent.isLayoutOnly()) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, nonLayoutOnlyNode, transformedIndex);
 } else {
 addNonLayoutNodeToNonLayoutNode(parent, nonLayoutOnlyNode, transformedIndex);
 }
 }

 private void addLayoutOnlyNodeToNonLayoutOnlyNode(
 private void addLayoutOnlyNode(
 ReactShadowNode nonLayoutOnlyNode,
 ReactShadowNode layoutOnlyNode,
 int index) {
 // Add all of the layout-only node's children to its parent instead
 int currentIndex = index;
 for (int i = 0; i < layoutOnlyNode.getChildCount(); i++) {
 ReactShadowNode childToAdd = layoutOnlyNode.getChildAt(i);
 Assertions.assertCondition(childToAdd.getNativeParent() == null);

 if (childToAdd.isLayoutOnly()) {
 // Adding this layout-only child could result in adding multiple native views
 int childCountBefore = nonLayoutOnlyNode.getNativeChildCount();
 addLayoutOnlyNodeToNonLayoutOnlyNode(
 nonLayoutOnlyNode,
 childToAdd,
 currentIndex);
 int childCountAfter = nonLayoutOnlyNode.getNativeChildCount();
 currentIndex += childCountAfter - childCountBefore;
 } else {
 addNonLayoutNodeToNonLayoutNode(nonLayoutOnlyNode, childToAdd, currentIndex);
 currentIndex++;
 }
 }
 addGrandchildren(nonLayoutOnlyNode, layoutOnlyNode, index);
 }

 private void addNonLayoutNodeToNonLayoutNode(
 private void addNonLayoutNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
Expand All@@ -340,6 +309,31 @@ private void addNonLayoutNodeToNonLayoutNode(
 null);
 }

 private void addGrandchildren(
 ReactShadowNode nativeParent,
 ReactShadowNode child,
 int index) {
 Assertions.assertCondition(!nativeParent.isLayoutOnly());

 // `child` can't hold native children. Add all of `child`'s children to `parent`.
 int currentIndex = index;
 for (int i = 0; i < child.getChildCount(); i++) {
 ReactShadowNode grandchild = child.getChildAt(i);
 Assertions.assertCondition(grandchild.getNativeParent() == null);

 if (grandchild.isLayoutOnly()) {
 // Adding this child could result in adding multiple native views
 int grandchildCountBefore = nativeParent.getNativeChildCount();
 addLayoutOnlyNode(nativeParent, grandchild, currentIndex);
 int grandchildCountAfter = nativeParent.getNativeChildCount();
 currentIndex += grandchildCountAfter - grandchildCountBefore;
 } else {
 addNonLayoutNode(nativeParent, grandchild, currentIndex);
 currentIndex++;
 }
 }
 }

 private void applyLayoutBase(ReactShadowNode node) {
 int tag = node.getReactTag();
 if (mTagsWithLayoutVisited.get(tag)) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Android: Refactor HierarchyOptimizer in preparation of inline view support by rigdern · Pull Request #8908 · react/react-native · GitHub
Skip to content
Android: Refactor HierarchyOptimizer in preparation of inline view support#8908

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

 Closed

rigdern
wants to merge
2
commits into

from

 Closed


Android: Refactor HierarchyOptimizer in preparation of inline view support
#8908
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6c40ae1

Refactor HierarchyOptimizer to collapse add*LayoutOnlyNodeToLayoutOnl…

Jul 5, 2016
14c3afe

Refactor HierarchyOptimizer to extract addGrandchildren

Jul 5, 2016

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


142 changes: 68 additions & 74 deletions
ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,16 @@
 */
public class NativeViewHierarchyOptimizer {

 private static class NodeIndexPair {
 public final ReactShadowNode node;
 public final int index;

 NodeIndexPair(ReactShadowNode node, int index) {
 this.node = node;
 this.index = index;
 }
 }

 private static final boolean ENABLED = true;

 private final UIViewOperationQueue mUIViewOperationQueue;
Expand DownExpand Up@@ -221,21 +231,39 @@ public void onBatchComplete() {
 mTagsWithLayoutVisited.clear();
 }

 private NodeIndexPair walkUpUntilNonLayoutOnly(
 ReactShadowNode node,
 int indexInNativeChildren) {
 while (node.isLayoutOnly()) {
 ReactShadowNode parent = node.getParent();
 if (parent == null) {
 return null;
 }

 indexInNativeChildren = indexInNativeChildren + parent.getNativeOffsetForChild(node);
 node = parent;
 }

 return new NodeIndexPair(node, indexInNativeChildren);
 }

 private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
 int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
 boolean parentIsLayoutOnly = parent.isLayoutOnly();
 boolean childIsLayoutOnly = child.isLayoutOnly();

 // Switch on the four cases of:
 // add (layout-only|not layout-only) to (layout-only|not layout-only)
 if (!parentIsLayoutOnly && !childIsLayoutOnly) {
 addNonLayoutNodeToNonLayoutNode(parent, child, indexInNativeChildren);
 } else if (!childIsLayoutOnly) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
 } else if (!parentIsLayoutOnly) {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parent, child, indexInNativeChildren);
 if (parent.isLayoutOnly()) {
 NodeIndexPair result = walkUpUntilNonLayoutOnly(parent, indexInNativeChildren);
 if (result == null) {
 // If the parent hasn't been attached to its native parent yet, don't issue commands to the
 // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
 return;
 }
 parent = result.node;
 indexInNativeChildren = result.index;
 }

 if (!child.isLayoutOnly()) {
 addNonLayoutNode(parent, child, indexInNativeChildren);
 } else {
addLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
addLayoutOnlyNode(parent, child, indexInNativeChildren);
 }
 }

Expand All@@ -262,73 +290,14 @@ private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDe
 }
 }

 private void addLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
 ReactShadowNode parentParent = parent.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parentParent == null) {
 return;
 }

 int transformedIndex = index + parentParent.getNativeOffsetForChild(parent);
 if (parentParent.isLayoutOnly()) {
 addLayoutOnlyNodeToLayoutOnlyNode(parentParent, child, transformedIndex);
 } else {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parentParent, child, transformedIndex);
 }
 }

 private void addNonLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode layoutOnlyNode,
 ReactShadowNode nonLayoutOnlyNode,
 int index) {
 ReactShadowNode parent = layoutOnlyNode.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parent == null) {
 return;
 }

 int transformedIndex = index + parent.getNativeOffsetForChild(layoutOnlyNode);
 if (parent.isLayoutOnly()) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, nonLayoutOnlyNode, transformedIndex);
 } else {
 addNonLayoutNodeToNonLayoutNode(parent, nonLayoutOnlyNode, transformedIndex);
 }
 }

 private void addLayoutOnlyNodeToNonLayoutOnlyNode(
 private void addLayoutOnlyNode(
 ReactShadowNode nonLayoutOnlyNode,
 ReactShadowNode layoutOnlyNode,
 int index) {
 // Add all of the layout-only node's children to its parent instead
 int currentIndex = index;
 for (int i = 0; i < layoutOnlyNode.getChildCount(); i++) {
 ReactShadowNode childToAdd = layoutOnlyNode.getChildAt(i);
 Assertions.assertCondition(childToAdd.getNativeParent() == null);

 if (childToAdd.isLayoutOnly()) {
 // Adding this layout-only child could result in adding multiple native views
 int childCountBefore = nonLayoutOnlyNode.getNativeChildCount();
 addLayoutOnlyNodeToNonLayoutOnlyNode(
 nonLayoutOnlyNode,
 childToAdd,
 currentIndex);
 int childCountAfter = nonLayoutOnlyNode.getNativeChildCount();
 currentIndex += childCountAfter - childCountBefore;
 } else {
 addNonLayoutNodeToNonLayoutNode(nonLayoutOnlyNode, childToAdd, currentIndex);
 currentIndex++;
 }
 }
 addGrandchildren(nonLayoutOnlyNode, layoutOnlyNode, index);
 }

 private void addNonLayoutNodeToNonLayoutNode(
 private void addNonLayoutNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
Expand All@@ -340,6 +309,31 @@ private void addNonLayoutNodeToNonLayoutNode(
 null);
 }

 private void addGrandchildren(
 ReactShadowNode nativeParent,
 ReactShadowNode child,
 int index) {
 Assertions.assertCondition(!nativeParent.isLayoutOnly());

 // `child` can't hold native children. Add all of `child`'s children to `parent`.
 int currentIndex = index;
 for (int i = 0; i < child.getChildCount(); i++) {
 ReactShadowNode grandchild = child.getChildAt(i);
 Assertions.assertCondition(grandchild.getNativeParent() == null);

 if (grandchild.isLayoutOnly()) {
 // Adding this child could result in adding multiple native views
 int grandchildCountBefore = nativeParent.getNativeChildCount();
 addLayoutOnlyNode(nativeParent, grandchild, currentIndex);
 int grandchildCountAfter = nativeParent.getNativeChildCount();
 currentIndex += grandchildCountAfter - grandchildCountBefore;
 } else {
 addNonLayoutNode(nativeParent, grandchild, currentIndex);
 currentIndex++;
 }
 }
 }

 private void applyLayoutBase(ReactShadowNode node) {
 int tag = node.getReactTag();
 if (mTagsWithLayoutVisited.get(tag)) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Android: Refactor HierarchyOptimizer in preparation of inline view support by rigdern · Pull Request #8908 · react/react-native · GitHub
Skip to content
Android: Refactor HierarchyOptimizer in preparation of inline view support#8908

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

 Closed

rigdern
wants to merge
2
commits into

from

 Closed


Android: Refactor HierarchyOptimizer in preparation of inline view support
#8908
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6c40ae1

Refactor HierarchyOptimizer to collapse add*LayoutOnlyNodeToLayoutOnl…

Jul 5, 2016
14c3afe

Refactor HierarchyOptimizer to extract addGrandchildren

Jul 5, 2016

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


142 changes: 68 additions & 74 deletions
ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,16 @@
 */
public class NativeViewHierarchyOptimizer {

 private static class NodeIndexPair {
 public final ReactShadowNode node;
 public final int index;

 NodeIndexPair(ReactShadowNode node, int index) {
 this.node = node;
 this.index = index;
 }
 }

 private static final boolean ENABLED = true;

 private final UIViewOperationQueue mUIViewOperationQueue;
Expand DownExpand Up@@ -221,21 +231,39 @@ public void onBatchComplete() {
 mTagsWithLayoutVisited.clear();
 }

 private NodeIndexPair walkUpUntilNonLayoutOnly(
 ReactShadowNode node,
 int indexInNativeChildren) {
 while (node.isLayoutOnly()) {
 ReactShadowNode parent = node.getParent();
 if (parent == null) {
 return null;
 }

 indexInNativeChildren = indexInNativeChildren + parent.getNativeOffsetForChild(node);
 node = parent;
 }

 return new NodeIndexPair(node, indexInNativeChildren);
 }

 private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
 int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
 boolean parentIsLayoutOnly = parent.isLayoutOnly();
 boolean childIsLayoutOnly = child.isLayoutOnly();

 // Switch on the four cases of:
 // add (layout-only|not layout-only) to (layout-only|not layout-only)
 if (!parentIsLayoutOnly && !childIsLayoutOnly) {
 addNonLayoutNodeToNonLayoutNode(parent, child, indexInNativeChildren);
 } else if (!childIsLayoutOnly) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
 } else if (!parentIsLayoutOnly) {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parent, child, indexInNativeChildren);
 if (parent.isLayoutOnly()) {
 NodeIndexPair result = walkUpUntilNonLayoutOnly(parent, indexInNativeChildren);
 if (result == null) {
 // If the parent hasn't been attached to its native parent yet, don't issue commands to the
 // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
 return;
 }
 parent = result.node;
 indexInNativeChildren = result.index;
 }

 if (!child.isLayoutOnly()) {
 addNonLayoutNode(parent, child, indexInNativeChildren);
 } else {
addLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
addLayoutOnlyNode(parent, child, indexInNativeChildren);
 }
 }

Expand All@@ -262,73 +290,14 @@ private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDe
 }
 }

 private void addLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
 ReactShadowNode parentParent = parent.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parentParent == null) {
 return;
 }

 int transformedIndex = index + parentParent.getNativeOffsetForChild(parent);
 if (parentParent.isLayoutOnly()) {
 addLayoutOnlyNodeToLayoutOnlyNode(parentParent, child, transformedIndex);
 } else {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parentParent, child, transformedIndex);
 }
 }

 private void addNonLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode layoutOnlyNode,
 ReactShadowNode nonLayoutOnlyNode,
 int index) {
 ReactShadowNode parent = layoutOnlyNode.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parent == null) {
 return;
 }

 int transformedIndex = index + parent.getNativeOffsetForChild(layoutOnlyNode);
 if (parent.isLayoutOnly()) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, nonLayoutOnlyNode, transformedIndex);
 } else {
 addNonLayoutNodeToNonLayoutNode(parent, nonLayoutOnlyNode, transformedIndex);
 }
 }

 private void addLayoutOnlyNodeToNonLayoutOnlyNode(
 private void addLayoutOnlyNode(
 ReactShadowNode nonLayoutOnlyNode,
 ReactShadowNode layoutOnlyNode,
 int index) {
 // Add all of the layout-only node's children to its parent instead
 int currentIndex = index;
 for (int i = 0; i < layoutOnlyNode.getChildCount(); i++) {
 ReactShadowNode childToAdd = layoutOnlyNode.getChildAt(i);
 Assertions.assertCondition(childToAdd.getNativeParent() == null);

 if (childToAdd.isLayoutOnly()) {
 // Adding this layout-only child could result in adding multiple native views
 int childCountBefore = nonLayoutOnlyNode.getNativeChildCount();
 addLayoutOnlyNodeToNonLayoutOnlyNode(
 nonLayoutOnlyNode,
 childToAdd,
 currentIndex);
 int childCountAfter = nonLayoutOnlyNode.getNativeChildCount();
 currentIndex += childCountAfter - childCountBefore;
 } else {
 addNonLayoutNodeToNonLayoutNode(nonLayoutOnlyNode, childToAdd, currentIndex);
 currentIndex++;
 }
 }
 addGrandchildren(nonLayoutOnlyNode, layoutOnlyNode, index);
 }

 private void addNonLayoutNodeToNonLayoutNode(
 private void addNonLayoutNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
Expand All@@ -340,6 +309,31 @@ private void addNonLayoutNodeToNonLayoutNode(
 null);
 }

 private void addGrandchildren(
 ReactShadowNode nativeParent,
 ReactShadowNode child,
 int index) {
 Assertions.assertCondition(!nativeParent.isLayoutOnly());

 // `child` can't hold native children. Add all of `child`'s children to `parent`.
 int currentIndex = index;
 for (int i = 0; i < child.getChildCount(); i++) {
 ReactShadowNode grandchild = child.getChildAt(i);
 Assertions.assertCondition(grandchild.getNativeParent() == null);

 if (grandchild.isLayoutOnly()) {
 // Adding this child could result in adding multiple native views
 int grandchildCountBefore = nativeParent.getNativeChildCount();
 addLayoutOnlyNode(nativeParent, grandchild, currentIndex);
 int grandchildCountAfter = nativeParent.getNativeChildCount();
 currentIndex += grandchildCountAfter - grandchildCountBefore;
 } else {
 addNonLayoutNode(nativeParent, grandchild, currentIndex);
 currentIndex++;
 }
 }
 }

 private void applyLayoutBase(ReactShadowNode node) {
 int tag = node.getReactTag();
 if (mTagsWithLayoutVisited.get(tag)) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Android: Refactor HierarchyOptimizer in preparation of inline view support by rigdern · Pull Request #8908 · react/react-native · GitHub
Skip to content
Android: Refactor HierarchyOptimizer in preparation of inline view support#8908

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

 Closed

rigdern
wants to merge
2
commits into

from

 Closed


Android: Refactor HierarchyOptimizer in preparation of inline view support
#8908
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6c40ae1

Refactor HierarchyOptimizer to collapse add*LayoutOnlyNodeToLayoutOnl…

Jul 5, 2016
14c3afe

Refactor HierarchyOptimizer to extract addGrandchildren

Jul 5, 2016

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


142 changes: 68 additions & 74 deletions
ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,16 @@
 */
public class NativeViewHierarchyOptimizer {

 private static class NodeIndexPair {
 public final ReactShadowNode node;
 public final int index;

 NodeIndexPair(ReactShadowNode node, int index) {
 this.node = node;
 this.index = index;
 }
 }

 private static final boolean ENABLED = true;

 private final UIViewOperationQueue mUIViewOperationQueue;
Expand DownExpand Up@@ -221,21 +231,39 @@ public void onBatchComplete() {
 mTagsWithLayoutVisited.clear();
 }

 private NodeIndexPair walkUpUntilNonLayoutOnly(
 ReactShadowNode node,
 int indexInNativeChildren) {
 while (node.isLayoutOnly()) {
 ReactShadowNode parent = node.getParent();
 if (parent == null) {
 return null;
 }

 indexInNativeChildren = indexInNativeChildren + parent.getNativeOffsetForChild(node);
 node = parent;
 }

 return new NodeIndexPair(node, indexInNativeChildren);
 }

 private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
 int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
 boolean parentIsLayoutOnly = parent.isLayoutOnly();
 boolean childIsLayoutOnly = child.isLayoutOnly();

 // Switch on the four cases of:
 // add (layout-only|not layout-only) to (layout-only|not layout-only)
 if (!parentIsLayoutOnly && !childIsLayoutOnly) {
 addNonLayoutNodeToNonLayoutNode(parent, child, indexInNativeChildren);
 } else if (!childIsLayoutOnly) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
 } else if (!parentIsLayoutOnly) {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parent, child, indexInNativeChildren);
 if (parent.isLayoutOnly()) {
 NodeIndexPair result = walkUpUntilNonLayoutOnly(parent, indexInNativeChildren);
 if (result == null) {
 // If the parent hasn't been attached to its native parent yet, don't issue commands to the
 // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
 return;
 }
 parent = result.node;
 indexInNativeChildren = result.index;
 }

 if (!child.isLayoutOnly()) {
 addNonLayoutNode(parent, child, indexInNativeChildren);
 } else {
addLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
addLayoutOnlyNode(parent, child, indexInNativeChildren);
 }
 }

Expand All@@ -262,73 +290,14 @@ private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDe
 }
 }

 private void addLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
 ReactShadowNode parentParent = parent.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parentParent == null) {
 return;
 }

 int transformedIndex = index + parentParent.getNativeOffsetForChild(parent);
 if (parentParent.isLayoutOnly()) {
 addLayoutOnlyNodeToLayoutOnlyNode(parentParent, child, transformedIndex);
 } else {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parentParent, child, transformedIndex);
 }
 }

 private void addNonLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode layoutOnlyNode,
 ReactShadowNode nonLayoutOnlyNode,
 int index) {
 ReactShadowNode parent = layoutOnlyNode.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parent == null) {
 return;
 }

 int transformedIndex = index + parent.getNativeOffsetForChild(layoutOnlyNode);
 if (parent.isLayoutOnly()) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, nonLayoutOnlyNode, transformedIndex);
 } else {
 addNonLayoutNodeToNonLayoutNode(parent, nonLayoutOnlyNode, transformedIndex);
 }
 }

 private void addLayoutOnlyNodeToNonLayoutOnlyNode(
 private void addLayoutOnlyNode(
 ReactShadowNode nonLayoutOnlyNode,
 ReactShadowNode layoutOnlyNode,
 int index) {
 // Add all of the layout-only node's children to its parent instead
 int currentIndex = index;
 for (int i = 0; i < layoutOnlyNode.getChildCount(); i++) {
 ReactShadowNode childToAdd = layoutOnlyNode.getChildAt(i);
 Assertions.assertCondition(childToAdd.getNativeParent() == null);

 if (childToAdd.isLayoutOnly()) {
 // Adding this layout-only child could result in adding multiple native views
 int childCountBefore = nonLayoutOnlyNode.getNativeChildCount();
 addLayoutOnlyNodeToNonLayoutOnlyNode(
 nonLayoutOnlyNode,
 childToAdd,
 currentIndex);
 int childCountAfter = nonLayoutOnlyNode.getNativeChildCount();
 currentIndex += childCountAfter - childCountBefore;
 } else {
 addNonLayoutNodeToNonLayoutNode(nonLayoutOnlyNode, childToAdd, currentIndex);
 currentIndex++;
 }
 }
 addGrandchildren(nonLayoutOnlyNode, layoutOnlyNode, index);
 }

 private void addNonLayoutNodeToNonLayoutNode(
 private void addNonLayoutNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
Expand All@@ -340,6 +309,31 @@ private void addNonLayoutNodeToNonLayoutNode(
 null);
 }

 private void addGrandchildren(
 ReactShadowNode nativeParent,
 ReactShadowNode child,
 int index) {
 Assertions.assertCondition(!nativeParent.isLayoutOnly());

 // `child` can't hold native children. Add all of `child`'s children to `parent`.
 int currentIndex = index;
 for (int i = 0; i < child.getChildCount(); i++) {
 ReactShadowNode grandchild = child.getChildAt(i);
 Assertions.assertCondition(grandchild.getNativeParent() == null);

 if (grandchild.isLayoutOnly()) {
 // Adding this child could result in adding multiple native views
 int grandchildCountBefore = nativeParent.getNativeChildCount();
 addLayoutOnlyNode(nativeParent, grandchild, currentIndex);
 int grandchildCountAfter = nativeParent.getNativeChildCount();
 currentIndex += grandchildCountAfter - grandchildCountBefore;
 } else {
 addNonLayoutNode(nativeParent, grandchild, currentIndex);
 currentIndex++;
 }
 }
 }

 private void applyLayoutBase(ReactShadowNode node) {
 int tag = node.getReactTag();
 if (mTagsWithLayoutVisited.get(tag)) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Android: Refactor HierarchyOptimizer in preparation of inline view support by rigdern · Pull Request #8908 · react/react-native · GitHub
Skip to content
Android: Refactor HierarchyOptimizer in preparation of inline view support#8908

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

 Closed

rigdern
wants to merge
2
commits into

from

 Closed


Android: Refactor HierarchyOptimizer in preparation of inline view support
#8908
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6c40ae1

Refactor HierarchyOptimizer to collapse add*LayoutOnlyNodeToLayoutOnl…

Jul 5, 2016
14c3afe

Refactor HierarchyOptimizer to extract addGrandchildren

Jul 5, 2016

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


142 changes: 68 additions & 74 deletions
ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,16 @@
 */
public class NativeViewHierarchyOptimizer {

 private static class NodeIndexPair {
 public final ReactShadowNode node;
 public final int index;

 NodeIndexPair(ReactShadowNode node, int index) {
 this.node = node;
 this.index = index;
 }
 }

 private static final boolean ENABLED = true;

 private final UIViewOperationQueue mUIViewOperationQueue;
Expand DownExpand Up@@ -221,21 +231,39 @@ public void onBatchComplete() {
 mTagsWithLayoutVisited.clear();
 }

 private NodeIndexPair walkUpUntilNonLayoutOnly(
 ReactShadowNode node,
 int indexInNativeChildren) {
 while (node.isLayoutOnly()) {
 ReactShadowNode parent = node.getParent();
 if (parent == null) {
 return null;
 }

 indexInNativeChildren = indexInNativeChildren + parent.getNativeOffsetForChild(node);
 node = parent;
 }

 return new NodeIndexPair(node, indexInNativeChildren);
 }

 private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
 int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
 boolean parentIsLayoutOnly = parent.isLayoutOnly();
 boolean childIsLayoutOnly = child.isLayoutOnly();

 // Switch on the four cases of:
 // add (layout-only|not layout-only) to (layout-only|not layout-only)
 if (!parentIsLayoutOnly && !childIsLayoutOnly) {
 addNonLayoutNodeToNonLayoutNode(parent, child, indexInNativeChildren);
 } else if (!childIsLayoutOnly) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
 } else if (!parentIsLayoutOnly) {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parent, child, indexInNativeChildren);
 if (parent.isLayoutOnly()) {
 NodeIndexPair result = walkUpUntilNonLayoutOnly(parent, indexInNativeChildren);
 if (result == null) {
 // If the parent hasn't been attached to its native parent yet, don't issue commands to the
 // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
 return;
 }
 parent = result.node;
 indexInNativeChildren = result.index;
 }

 if (!child.isLayoutOnly()) {
 addNonLayoutNode(parent, child, indexInNativeChildren);
 } else {
addLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
addLayoutOnlyNode(parent, child, indexInNativeChildren);
 }
 }

Expand All@@ -262,73 +290,14 @@ private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDe
 }
 }

 private void addLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
 ReactShadowNode parentParent = parent.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parentParent == null) {
 return;
 }

 int transformedIndex = index + parentParent.getNativeOffsetForChild(parent);
 if (parentParent.isLayoutOnly()) {
 addLayoutOnlyNodeToLayoutOnlyNode(parentParent, child, transformedIndex);
 } else {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parentParent, child, transformedIndex);
 }
 }

 private void addNonLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode layoutOnlyNode,
 ReactShadowNode nonLayoutOnlyNode,
 int index) {
 ReactShadowNode parent = layoutOnlyNode.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parent == null) {
 return;
 }

 int transformedIndex = index + parent.getNativeOffsetForChild(layoutOnlyNode);
 if (parent.isLayoutOnly()) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, nonLayoutOnlyNode, transformedIndex);
 } else {
 addNonLayoutNodeToNonLayoutNode(parent, nonLayoutOnlyNode, transformedIndex);
 }
 }

 private void addLayoutOnlyNodeToNonLayoutOnlyNode(
 private void addLayoutOnlyNode(
 ReactShadowNode nonLayoutOnlyNode,
 ReactShadowNode layoutOnlyNode,
 int index) {
 // Add all of the layout-only node's children to its parent instead
 int currentIndex = index;
 for (int i = 0; i < layoutOnlyNode.getChildCount(); i++) {
 ReactShadowNode childToAdd = layoutOnlyNode.getChildAt(i);
 Assertions.assertCondition(childToAdd.getNativeParent() == null);

 if (childToAdd.isLayoutOnly()) {
 // Adding this layout-only child could result in adding multiple native views
 int childCountBefore = nonLayoutOnlyNode.getNativeChildCount();
 addLayoutOnlyNodeToNonLayoutOnlyNode(
 nonLayoutOnlyNode,
 childToAdd,
 currentIndex);
 int childCountAfter = nonLayoutOnlyNode.getNativeChildCount();
 currentIndex += childCountAfter - childCountBefore;
 } else {
 addNonLayoutNodeToNonLayoutNode(nonLayoutOnlyNode, childToAdd, currentIndex);
 currentIndex++;
 }
 }
 addGrandchildren(nonLayoutOnlyNode, layoutOnlyNode, index);
 }

 private void addNonLayoutNodeToNonLayoutNode(
 private void addNonLayoutNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
Expand All@@ -340,6 +309,31 @@ private void addNonLayoutNodeToNonLayoutNode(
 null);
 }

 private void addGrandchildren(
 ReactShadowNode nativeParent,
 ReactShadowNode child,
 int index) {
 Assertions.assertCondition(!nativeParent.isLayoutOnly());

 // `child` can't hold native children. Add all of `child`'s children to `parent`.
 int currentIndex = index;
 for (int i = 0; i < child.getChildCount(); i++) {
 ReactShadowNode grandchild = child.getChildAt(i);
 Assertions.assertCondition(grandchild.getNativeParent() == null);

 if (grandchild.isLayoutOnly()) {
 // Adding this child could result in adding multiple native views
 int grandchildCountBefore = nativeParent.getNativeChildCount();
 addLayoutOnlyNode(nativeParent, grandchild, currentIndex);
 int grandchildCountAfter = nativeParent.getNativeChildCount();
 currentIndex += grandchildCountAfter - grandchildCountBefore;
 } else {
 addNonLayoutNode(nativeParent, grandchild, currentIndex);
 currentIndex++;
 }
 }
 }

 private void applyLayoutBase(ReactShadowNode node) {
 int tag = node.getReactTag();
 if (mTagsWithLayoutVisited.get(tag)) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Android: Refactor HierarchyOptimizer in preparation of inline view support by rigdern · Pull Request #8908 · react/react-native · GitHub
Skip to content
Android: Refactor HierarchyOptimizer in preparation of inline view support#8908

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

 Closed

rigdern
wants to merge
2
commits into

from

 Closed


Android: Refactor HierarchyOptimizer in preparation of inline view support
#8908
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6c40ae1

Refactor HierarchyOptimizer to collapse add*LayoutOnlyNodeToLayoutOnl…

Jul 5, 2016
14c3afe

Refactor HierarchyOptimizer to extract addGrandchildren

Jul 5, 2016

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


142 changes: 68 additions & 74 deletions
ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,16 @@
 */
public class NativeViewHierarchyOptimizer {

 private static class NodeIndexPair {
 public final ReactShadowNode node;
 public final int index;

 NodeIndexPair(ReactShadowNode node, int index) {
 this.node = node;
 this.index = index;
 }
 }

 private static final boolean ENABLED = true;

 private final UIViewOperationQueue mUIViewOperationQueue;
Expand DownExpand Up@@ -221,21 +231,39 @@ public void onBatchComplete() {
 mTagsWithLayoutVisited.clear();
 }

 private NodeIndexPair walkUpUntilNonLayoutOnly(
 ReactShadowNode node,
 int indexInNativeChildren) {
 while (node.isLayoutOnly()) {
 ReactShadowNode parent = node.getParent();
 if (parent == null) {
 return null;
 }

 indexInNativeChildren = indexInNativeChildren + parent.getNativeOffsetForChild(node);
 node = parent;
 }

 return new NodeIndexPair(node, indexInNativeChildren);
 }

 private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
 int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
 boolean parentIsLayoutOnly = parent.isLayoutOnly();
 boolean childIsLayoutOnly = child.isLayoutOnly();

 // Switch on the four cases of:
 // add (layout-only|not layout-only) to (layout-only|not layout-only)
 if (!parentIsLayoutOnly && !childIsLayoutOnly) {
 addNonLayoutNodeToNonLayoutNode(parent, child, indexInNativeChildren);
 } else if (!childIsLayoutOnly) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
 } else if (!parentIsLayoutOnly) {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parent, child, indexInNativeChildren);
 if (parent.isLayoutOnly()) {
 NodeIndexPair result = walkUpUntilNonLayoutOnly(parent, indexInNativeChildren);
 if (result == null) {
 // If the parent hasn't been attached to its native parent yet, don't issue commands to the
 // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
 return;
 }
 parent = result.node;
 indexInNativeChildren = result.index;
 }

 if (!child.isLayoutOnly()) {
 addNonLayoutNode(parent, child, indexInNativeChildren);
 } else {
addLayoutOnlyNodeToLayoutOnlyNode(parent, child, indexInNativeChildren);
addLayoutOnlyNode(parent, child, indexInNativeChildren);
 }
 }

Expand All@@ -262,73 +290,14 @@ private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDe
 }
 }

 private void addLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
 ReactShadowNode parentParent = parent.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parentParent == null) {
 return;
 }

 int transformedIndex = index + parentParent.getNativeOffsetForChild(parent);
 if (parentParent.isLayoutOnly()) {
 addLayoutOnlyNodeToLayoutOnlyNode(parentParent, child, transformedIndex);
 } else {
 addLayoutOnlyNodeToNonLayoutOnlyNode(parentParent, child, transformedIndex);
 }
 }

 private void addNonLayoutOnlyNodeToLayoutOnlyNode(
 ReactShadowNode layoutOnlyNode,
 ReactShadowNode nonLayoutOnlyNode,
 int index) {
 ReactShadowNode parent = layoutOnlyNode.getParent();

 // If the parent hasn't been attached to its parent yet, don't issue commands to the native
 // hierarchy. We'll do that when the parent node actually gets attached somewhere.
 if (parent == null) {
 return;
 }

 int transformedIndex = index + parent.getNativeOffsetForChild(layoutOnlyNode);
 if (parent.isLayoutOnly()) {
 addNonLayoutOnlyNodeToLayoutOnlyNode(parent, nonLayoutOnlyNode, transformedIndex);
 } else {
 addNonLayoutNodeToNonLayoutNode(parent, nonLayoutOnlyNode, transformedIndex);
 }
 }

 private void addLayoutOnlyNodeToNonLayoutOnlyNode(
 private void addLayoutOnlyNode(
 ReactShadowNode nonLayoutOnlyNode,
 ReactShadowNode layoutOnlyNode,
 int index) {
 // Add all of the layout-only node's children to its parent instead
 int currentIndex = index;
 for (int i = 0; i < layoutOnlyNode.getChildCount(); i++) {
 ReactShadowNode childToAdd = layoutOnlyNode.getChildAt(i);
 Assertions.assertCondition(childToAdd.getNativeParent() == null);

 if (childToAdd.isLayoutOnly()) {
 // Adding this layout-only child could result in adding multiple native views
 int childCountBefore = nonLayoutOnlyNode.getNativeChildCount();
 addLayoutOnlyNodeToNonLayoutOnlyNode(
 nonLayoutOnlyNode,
 childToAdd,
 currentIndex);
 int childCountAfter = nonLayoutOnlyNode.getNativeChildCount();
 currentIndex += childCountAfter - childCountBefore;
 } else {
 addNonLayoutNodeToNonLayoutNode(nonLayoutOnlyNode, childToAdd, currentIndex);
 currentIndex++;
 }
 }
 addGrandchildren(nonLayoutOnlyNode, layoutOnlyNode, index);
 }

 private void addNonLayoutNodeToNonLayoutNode(
 private void addNonLayoutNode(
 ReactShadowNode parent,
 ReactShadowNode child,
 int index) {
Expand All@@ -340,6 +309,31 @@ private void addNonLayoutNodeToNonLayoutNode(
 null);
 }

 private void addGrandchildren(
 ReactShadowNode nativeParent,
 ReactShadowNode child,
 int index) {
 Assertions.assertCondition(!nativeParent.isLayoutOnly());

 // `child` can't hold native children. Add all of `child`'s children to `parent`.
 int currentIndex = index;
 for (int i = 0; i < child.getChildCount(); i++) {
 ReactShadowNode grandchild = child.getChildAt(i);
 Assertions.assertCondition(grandchild.getNativeParent() == null);

 if (grandchild.isLayoutOnly()) {
 // Adding this child could result in adding multiple native views
 int grandchildCountBefore = nativeParent.getNativeChildCount();
 addLayoutOnlyNode(nativeParent, grandchild, currentIndex);
 int grandchildCountAfter = nativeParent.getNativeChildCount();
 currentIndex += grandchildCountAfter - grandchildCountBefore;
 } else {
 addNonLayoutNode(nativeParent, grandchild, currentIndex);
 currentIndex++;
 }
 }
 }

 private void applyLayoutBase(ReactShadowNode node) {
 int tag = node.getReactTag();
 if (mTagsWithLayoutVisited.get(tag)) {
Expand Down