jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show state data in flipper Sections inspector

Browse Source 
Summary:
as title; refactored getStateData for components so we can reuse
Depends on D14386744

Reviewed By: passy

Differential Revision: D14386910

fbshipit-source-id: 088605b920fd5b489d007e5daa69f4cd53fc3072
This commit is contained in:
Mihaela Ogrezeanu
2019-03-20 09:10:30 -07:00
committed by Facebook Github Bot
parent 5195bfc0e4
commit 2d357a2ced
3 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
android/src/main/java/com/facebook/flipper/plugins/litho/DataUtils.java
View File

@@ -7,7 +7,9 @@ import android.graphics.drawable.Drawable;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.litho.StateContainer;
import com.facebook.litho.annotations.Prop;
import com.facebook.litho.annotations.State;
import java.lang.reflect.Field;
import java.util.AbstractMap;
import java.util.ArrayList;
@@ -82,6 +84,32 @@ public class DataUtils {
return data;
}
@Nullable
static FlipperObject getStateData(Object node, StateContainer stateContainer) throws Exception {
if (stateContainer == null) {
return null;
}
final FlipperObject.Builder state = new FlipperObject.Builder();
boolean hasState = false;
for (Field f : stateContainer.getClass().getDeclaredFields()) {
f.setAccessible(true);
final State annotation = f.getAnnotation(State.class);
if (annotation != null) {
if (DataUtils.isTypeMutable(f.getType())) {
state.put(f.getName(), InspectorValue.mutable(f.get(stateContainer)));
} else {
state.put(f.getName(), InspectorValue.immutable(f.get(stateContainer)));
}
hasState = true;
}
}
return hasState ? state.build() : null;
}
static boolean isTypeMutable(Class<?> type) {
if (type == int.class || type == Integer.class) {
return true;

34
android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
View File

@@ -27,7 +27,6 @@ import com.facebook.litho.DebugComponent;
import com.facebook.litho.DebugLayoutNode;
import com.facebook.litho.LithoView;
import com.facebook.litho.StateContainer;
import com.facebook.litho.annotations.State;
import com.facebook.yoga.YogaAlign;
import com.facebook.yoga.YogaDirection;
import com.facebook.yoga.YogaEdge;
@@ -266,37 +265,8 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
}
@Nullable
private static FlipperObject getStateData(DebugComponent node) {
if (node.canResolve()) {
return null;
}
final StateContainer stateContainer = node.getStateContainer();
if (stateContainer == null) {
return null;
}
final FlipperObject.Builder state = new FlipperObject.Builder();
boolean hasState = false;
for (Field f : stateContainer.getClass().getDeclaredFields()) {
try {
f.setAccessible(true);
final State annotation = f.getAnnotation(State.class);
if (annotation != null) {
if (DataUtils.isTypeMutable(f.getType())) {
state.put(f.getName(), InspectorValue.mutable(f.get(stateContainer)));
} else {
state.put(f.getName(), InspectorValue.immutable(f.get(stateContainer)));
}
hasState = true;
}
} catch (Exception ignored) {
}
}
return hasState ? state.build() : null;
private static FlipperObject getStateData(DebugComponent node) throws Exception {
return DataUtils.getStateData(node, node.getStateContainer());
}
@Override

9
android/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java
View File

@@ -76,6 +76,11 @@ public class DebugSectionDescriptor extends NodeDescriptor<DebugSection> {
data.addAll(propData);
}
final FlipperObject stateData = getStateData(node);
if (stateData != null) {
data.add(new Named<>("State", stateData));
}
return data;
}
@@ -85,6 +90,10 @@ public class DebugSectionDescriptor extends NodeDescriptor<DebugSection> {
return DataUtils.getPropData(section);
}
private static @Nullable FlipperObject getStateData(DebugSection node) throws Exception {
return DataUtils.getStateData(node, node.getStateContainer());
}
@Override
public void setValue(DebugSection node, String[] path, FlipperDynamic value) throws Exception {
// TODO T39526148