Use member.open to toggle fullText visibility

+ minor cleanups

Author: 2007heaven

packages/devtools-reps/src/object-inspector/component.js

@@ -218,7 +218,7 @@ class ObjectInspector extends Component {
     value?: string | Element,
     label?: string
   }) {
-    let label = item.name;
+    const label = item.name;
     const isPrimitive = nodeIsPrimitive(item);
 
     if (nodeIsOptimizedOut(item)) {
@@ -307,7 +307,9 @@ class ObjectInspector extends Component {
         repProps.mode = MODE.TINY;
       }
 
-      repProps.showFullText = nodeHasFullText(item) && expanded;
+      repProps.member = {
+        open: nodeHasFullText(item) && expanded
+      };
 
       return {
         label,

packages/devtools-reps/src/object-inspector/utils/node.js

@@ -249,10 +249,12 @@ function nodeHasEntries(
     return false;
   }
 
-  return value.class === "Map"
-    || value.class === "Set"
-    || value.class === "WeakMap"
-    || value.class === "WeakSet";
+  return [
+    "Map",
+    "Set",
+    "WeakMap",
+    "WeakSet"
+  ].includes(value.class);
 }
 
 function nodeHasAllEntriesInPreview(item : Node) : boolean {

packages/devtools-reps/src/reps/string.js

@@ -29,11 +29,10 @@ StringRep.propTypes = {
   escapeWhitespace: PropTypes.bool,
   style: PropTypes.object,
   cropLimit: PropTypes.number.isRequired,
-  member: PropTypes.string,
+  member: PropTypes.object,
   object: PropTypes.object.isRequired,
   openLink: PropTypes.func,
   className: PropTypes.string,
-  showFullText: PropTypes.bool,
 };
 
 function StringRep(props) {
@@ -45,14 +44,14 @@ function StringRep(props) {
     useQuotes = true,
     escapeWhitespace = true,
     member,
-    openLink,
-    showFullText
+    openLink
   } = props;
 
   let text = object;
 
   const isLong = isLongString(object);
-  const shouldCrop = (!member || !member.open) && cropLimit && text.length > cropLimit;
+  const isOpen = member && member.open;
+  const shouldCrop = !isOpen && cropLimit && text.length > cropLimit;
 
   if (isLong) {
     text = maybeCropLongString({
@@ -61,7 +60,7 @@ function StringRep(props) {
     }, text);
 
     const { fullText } = object;
-    if (showFullText && fullText) {
+    if (isOpen && fullText) {
       text = fullText;
     }
   }