Revert "Add helper method + more key => keys fixes"

This reverts commit 1fb2ffb.

Revert "Change stringify implementation"

This reverts commit 98f4423.

Redo buried changes for key => keys

Author: Joshua-Lester3

EssentialCSharp.Web/Views/Shared/_Layout.cshtml

@@ -200,7 +200,7 @@
 
                             <div v-cloak v-if="sidebarTab == 'toc'" class="toc-tree" id="toc">
                                 <ul class="tree">
-                                    <toc-tree v-for="item in filteredTocData" :item="item" :expanded-tocs="expandedTocs" :current-page="currentPage" :first-or-default="firstOrDefault"></toc-tree>
+                                    <toc-tree v-for="item in filteredTocData" :item="item" :expanded-tocs="expandedTocs" :current-page="currentPage"></toc-tree>
                                 </ul>
                             </div>
                             <div v-cloak>
@@ -283,36 +283,36 @@
                          'toc-content' : item.level==0,
                          'nested' : item.level>
                     0,
-                    'current-section': currentPage.some(p => firstOrDefault(p.keys) == firstOrDefault(item.keys)),
+                    'current-section': currentPage.some(p => JSON.stringify(p.keys) == JSON.stringify(item.keys)),
                     }" :href="item.href">{{item.title}}
                 </summary>
                 <ul>
                     <li :class="{
                         ['indent-level-' + (item.level+1)]: true,
                         'current-li' : currentPage.some(p=>
-                        firstOrDefault(p.keys) == firstOrDefault(item.keys)) && !currentPage.some(p => p.level > item.level),
+                        JSON.stringify(p.keys) == JSON.stringify(item.keys)) && !currentPage.some(p => p.level > item.level),
                         }" >
                         <a class="section-link" :class="{
                            ['indent-level-' + (item.level+1)]: true,
                            'current-section' : currentPage.some(p=>
-                            firstOrDefault(p.keys) == firstOrDefault(item.keys)) && !currentPage.some(p => p.level > item.level),
+                            JSON.stringify(p.keys) == JSON.stringify(item.keys)) && !currentPage.some(p => p.level > item.level),
                             }" :href="item.href"> Introduction
                         </a>
                     </li>
-                    <toc-tree v-for="childItem in item.items" :item="childItem" :expanded-tocs="expandedTocs" :current-page="currentPage" :first-or-default="firstOrDefault"></toc-tree>
+                    <toc-tree v-for="childItem in item.items" :item="childItem" :expanded-tocs="expandedTocs" :current-page="currentPage"></toc-tree>
                 </ul>
                 <hr class="divider" v-if="item.level === 0" />
             </details>
         </li>
         <li v-else :class="{
             ['indent-level-' + (item.level+1)]: true,
             'current-li' : currentPage.some(p=>
-            firstOrDefault(p.keys) == firstOrDefault(item.keys)) && !currentPage.some(p => p.level > item.level),
+            JSON.stringify(p.keys) == JSON.stringify(item.keys)) && !currentPage.some(p => p.level > item.level),
             }" >
             <a class="section-link" :class="{
                ['indent-level-' + (item.level)]: true,
                'current-section' : currentPage.some(p=>
-                firstOrDefault(p.keys) == firstOrDefault(item.keys)),
+                JSON.stringify(p.keys) == JSON.stringify(item.keys)),
                 }" :href="item.href"> {{item.title}}
             </a>
         </li>

EssentialCSharp.Web/wwwroot/js/site.js

@@ -187,18 +187,6 @@ const app = createApp({
 
         const sidebarShown = ref(false);
 
-        /**
-        * Find the first element of a list, otherwise null
-        * @param {string[]} list
-        * @returns {string | undefined} first element or null
-        * */
-        function firstOrDefault(list) {
-            if (list.length > 0) {
-                return list[0];
-            }
-            return undefined;
-        }
-
         const smallScreen = computed(() => {
             return (windowWidth.value || 0) < smallScreenSize;
         });
@@ -318,7 +306,6 @@ const app = createApp({
 
             sidebarShown,
             sidebarTab,
-            firstOrDefault,
 
             smallScreen,
 
@@ -336,7 +323,7 @@ const app = createApp({
 });
 
 app.component("toc-tree", {
-    props: ["item", "expandedTocs", "currentPage", "firstOrDefault"],
+    props: ["item", "expandedTocs", "currentPage"],
     template: "#toc-tree",
 });