Merge pull request #2291 from Sefaria/bug/sc-25530/current-place-in-toc-not-displaying-properly

fix: [sc-25530] Current place in TOC not displaying properly in the resource panel TOC.

Force merged due to flaky playwright tests

Author: yitzhakc

static/js/BookPage.jsx

@@ -557,10 +557,31 @@ class SchemaNode extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      // Collapse nodes below top level, and those that aren't default or makred includedSections
-      collapsed: "nodes" in props.schema && !(props.topLevel || props.disableSubCollapse) ? props.schema.nodes.map(node => !(node.default || node.includeSections)) : []
+      collapsed: this.getCollapsedState(this.props.schema, this.props.topLevel, this.props.disableSubCollapse)
     };
   }
+  componentDidUpdate(prevProps) {
+    if (this.props.currentlyVisibleRef !== prevProps.currentlyVisibleRef) {
+      this.setState({collapsed: this.getCollapsedState(this.props.schema, this.props.topLevel, this.props.disableSubCollapse)});
+    }
+  }
+  shouldNodeCollapse(node) {
+    // Determine 'collapsed' state for node.
+    // A node should be collapsed if it is not the currently visible node and if it is not a default node.
+    const fullNodeRef = this.props.refPath + (node.default ? "" : `, ${node.title}`);
+    const currentlyVisible = Sefaria.refContains(fullNodeRef, this.props.currentlyVisibleRef);
+    return !currentlyVisible && !node.default && !node.includeSections;
+  }
+  getCollapsedState(schema, topLevel, disableSubCollapse) {
+    // Determine 'collapsed' state for each node in schema.
+    // If no children or topLevel, return [] which is equivalent to no nodes collapsed.
+    // Otherwise, return array of booleans based on call to `shouldNodeCollapse` for each node.
+    if (topLevel || disableSubCollapse || !("nodes" in schema)) {
+      return [];
+    } else {
+      return schema.nodes.map(this.shouldNodeCollapse);
+    }
+  }
   toggleCollapse(i) {
     if(this.props.disableSubCollapse) return;
 
@@ -598,7 +619,7 @@ class SchemaNode extends Component {
     } else { //we do have subcontent
       let content = this.props.schema.nodes.map(function(node, i) {
         let path;
-        if (node.nodeType == "ArrayMapNode") {
+        if (node.nodeType === "ArrayMapNode") {
           //ArrayMapNode content
           path = this.props.refPath + ", " + node.title;
           return <ArrayMapNode schema={node} currentlyVisibleRef={this.props.currentlyVisibleRef}  currentlyVisibleSectionRef={this.props.currentlyVisibleSectionRef} key={path}/>;
@@ -700,15 +721,16 @@ class JaggedArrayNode extends Component {
   render() {
     const offset = this.props.schema?.index_offsets_by_depth?.['1'] || 0;
     if ("toc_zoom" in this.props.schema) {
-      let zoom = this.props.schema.toc_zoom - 1;
+      const zoom = this.props.schema.toc_zoom - 1;
+      const currentZoomedOutRef = this.props.currentlyVisibleSectionRef && Sefaria.zoomOutRef(this.props.currentlyVisibleSectionRef, zoom);
       return (<JaggedArrayNodeSection
                 depth={this.props.schema.depth - zoom}
                 sectionNames={this.props.schema.sectionNames.slice(0, -zoom)}
                 addressTypes={this.props.schema.addressTypes.slice(0, -zoom)}
                 contentCounts={this.props.schema.content_counts}
                 refPath={this.props.refPath}
                 currentlyVisibleRef={this.props.currentlyVisibleRef}
-                currentlyVisibleSectionRef={this.props.currentlyVisibleSectionRef}
+                currentlyVisibleSectionRef={currentZoomedOutRef}
                 offset={offset}
               />);
     }

static/js/sefaria/sefaria.js

@@ -292,6 +292,15 @@ Sefaria = extend(Sefaria, {
     return oref ? oref.sectionRef : null;
 
   },
+  zoomOutRef: function(ref, zoom=1) {
+    // go up `zoom` levels in the ref's sections and toSections
+    // for example, if ref == "Ramban on Genesis, Introduction 2" and zoom == 1, this returns "Ramabn on Genesis, Introduction"
+    // if ref == "Ramban on Genesis, Introduction 2" and zoom == 2, this returns "Ramban on Genesis, Introduction" because we're only zooming out on the ref's sections/toSections
+    const pRef = Sefaria.util.clone(Sefaria.parseRef(ref));
+    pRef.sections = pRef.sections.slice(0, -zoom);
+    pRef.toSections = pRef.toSections.slice(0, -zoom);
+    return Sefaria.makeRef(pRef);
+  },
   splitSpanningRefNaive: function(ref){
       if (ref.indexOf("-") == -1) { return ref; }
       return ref.split("-");