Skip to content

Add a prevent clipping prop #18

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

Merged
merged 2 commits into from
Jun 22, 2022
Merged

Add a prevent clipping prop #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e62a48
Add a preventClipping prop that prevents a subview from ever being cl…
Jun 22, 2022
2aa4b70
Undo accidental changes
Jun 22, 2022
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
26 changes: 23 additions & 3 deletions ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ public void onLayoutChange(
private int mLayoutDirection;
private float mBackfaceOpacity = 1.f;
private String mBackfaceVisibility = "visible";
private boolean mPreventClipping = false;

public ReactViewGroup(Context context) {
super(context);
Expand Down Expand Up @@ -280,6 +281,19 @@ public void setBorderStyle(@Nullable String style) {
getOrCreateReactViewBackground().setBorderStyle(style);
}

public void setPreventClipping(boolean preventClipping) {
mPreventClipping = preventClipping;

// TODO(apkumar)
//
// It would be nice to trigger the LayoutChangeListener at this point.
}

public boolean getPreventClipping() {
return mPreventClipping;
}


@Override
public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
if (removeClippedSubviews == mRemoveClippedSubviews) {
Expand Down Expand Up @@ -367,16 +381,22 @@ private void updateSubviewClipStatus(Rect clippingRect, int idx, int clippedSoFa
// it won't be size and located properly.
Animation animation = child.getAnimation();
boolean isAnimating = animation != null && !animation.hasEnded();
if (!intersects && child.getParent() != null && !isAnimating) {

boolean preventClipping = false;
if (child instanceof ReactViewGroup) {
preventClipping = ((ReactViewGroup)child).getPreventClipping();
}

if (!intersects && child.getParent() != null && !isAnimating && !preventClipping) {
// We can try saving on invalidate call here as the view that we remove is out of visible area
// therefore invalidation is not necessary.
super.removeViewsInLayout(idx - clippedSoFar, 1);
needUpdateClippingRecursive = true;
} else if (intersects && child.getParent() == null) {
} else if ((intersects || preventClipping) && child.getParent() == null) {
super.addViewInLayout(child, idx - clippedSoFar, sDefaultLayoutParam, true);
invalidate();
needUpdateClippingRecursive = true;
} else if (intersects) {
} else if (intersects || preventClipping) {
// If there is any intersection we need to inform the child to update its clipping rect
needUpdateClippingRecursive = true;
}
Expand Down
5 changes: 5 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
private static final int CMD_SET_PRESSED = 2;
private static final String HOTSPOT_UPDATE_KEY = "hotspotUpdate";

@ReactProp(name = "preventClipping")
public void setPreventClipping(ReactViewGroup view, boolean preventClipping) {
view.setPreventClipping(preventClipping);
}

@ReactProp(name = "accessible")
public void setAccessible(ReactViewGroup view, boolean accessible) {
view.setFocusable(accessible);
Expand Down