Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1012,18 +1012,18 @@ public void setTouchCancel(@NonNull T view, boolean value) {
* especially helpful for views that are recycled so we can retain and restore the original
* listener upon recycling (onDropViewInstance).
*/
private class BaseVMFocusChangeListener<V extends View> implements OnFocusChangeListener {
private static class BaseVMFocusChangeListener implements OnFocusChangeListener {
private @Nullable OnFocusChangeListener mOriginalFocusChangeListener;

public BaseVMFocusChangeListener(@Nullable OnFocusChangeListener originalFocusChangeListener) {
mOriginalFocusChangeListener = originalFocusChangeListener;
}

public void attach(T view) {
public void attach(View view) {
view.setOnFocusChangeListener(this);
}

public void detach(T view) {
public void detach(View view) {
view.setOnFocusChangeListener(mOriginalFocusChangeListener);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ public void setMaxHeight(Dynamic maxHeight) {
maxHeight.recycle();
}

@Override
@ReactProp(name = ViewProps.FLEX, defaultFloat = 0f)
public void setFlex(float flex) {
if (isVirtual()) {
Expand All @@ -238,6 +239,7 @@ public void setFlex(float flex) {
super.setFlex(flex);
}

@Override
@ReactProp(name = ViewProps.FLEX_GROW, defaultFloat = 0f)
public void setFlexGrow(float flexGrow) {
if (isVirtual()) {
Expand Down Expand Up @@ -309,6 +311,7 @@ public void setGap(Dynamic gap) {
gap.recycle();
}

@Override
@ReactProp(name = ViewProps.FLEX_SHRINK, defaultFloat = 0f)
public void setFlexShrink(float flexShrink) {
if (isVirtual()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,6 @@ public void onBatchComplete() {
mTagsWithLayoutVisited.clear();
}

private NodeIndexPair walkUpUntilNativeKindIsParent(
ReactShadowNode node, int indexInNativeChildren) {
// Logic removed due to NativeKind removal
return new NodeIndexPair(node, indexInNativeChildren);
}

private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
// Logic removed due to NativeKind removal
}
Expand Down Expand Up @@ -289,8 +283,6 @@ private void applyLayoutBase(ReactShadowNode node) {
}
mTagsWithLayoutVisited.put(tag, true);

ReactShadowNode parent = node.getParent();

// We use screenX/screenY (which round to integer pixels) at each node in the hierarchy to
// emulate what the layout would look like if it were actually built with native views which
// have to have integral top/left/bottom/right values
Expand Down
Loading