@explorer-1/vue 0.2.31 → 0.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorer-1/vue",
-  "version": "0.2.31",
+  "version": "0.2.32",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -30,7 +30,7 @@
     "vue-bind-once": "^0.2.1",
     "vue-observe-visibility": "^1.0.0",
     "vue3-compare-image": "^1.2.5",
-    "@explorer-1/common": "1.1.9"
+    "@explorer-1/common": "1.1.10"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",

package/src/components/BlockHeading/BlockHeading.vue

@@ -55,7 +55,7 @@ export default defineComponent({
   &:target {
     @apply scroll-mt-14;
     @screen lg {
-      @apply scroll-mt-20;
+      @apply scroll-mt-[8rem];
     }
   }
 }

package/src/templates/edu/PageEduLesson/PageEduLesson.stories.js

@@ -164,7 +164,14 @@ export const BaseStory = {
       management: BlockStreamfieldMinimalData.body,
       managementHeading: 'Management stuff',
 
-      background: BlockStreamfieldMinimalData.body,
+      background: [
+        ...BlockStreamfieldMinimalData.body,
+        {
+          blockType: 'RichTextBlock',
+          value:
+            '<ol><li data-block-key="wv2pw">A list<ol><li data-block-key="mc91">A nested list should be a.<ol><li data-block-key="3p0pb">Another nested should be i.<ol><li data-block-key="22afo">Another is a number again.</li></ol></li></ol></li></ol></li></ol>'
+        }
+      ],
       backgroundHeading: 'Background heading',
 
       procedures: [
@@ -173,7 +180,15 @@ export const BaseStory = {
           stepsNumbering: true,
           steps: [
             {
-              blocks: BlockStreamfieldMinimalData.body
+              blocks: [
+                ...BlockStreamfieldMinimalData.body,
+
+                {
+                  blockType: 'RichTextBlock',
+                  value:
+                    '<ol><li data-block-key="wv2pw">A list<ol><li data-block-key="mc91">A nested list should be a.<ol><li data-block-key="3p0pb">Another nested should be i.<ol><li data-block-key="22afo">Another is a number again.</li></ol></li></ol></li></ol></li></ol>'
+                }
+              ]
             },
             {
               blocks: BlockStreamfieldMinimalData.body

package/src/templates/edu/PageEduLesson/PageEduLesson.vue

@@ -231,8 +231,7 @@ const consolidatedSections = computed((): EduLessonSectionObject[] => {
           : undefined,
         blocks: section !== 'materials' && section !== 'procedures' ? data[section] : undefined,
         text: section === 'materials' ? data[section] : undefined,
-        procedures: section === 'procedures' ? data[section] : undefined,
-        procedureSteps: section === 'procedures' ? data.proceduresStepsNumbering : false
+        procedures: section === 'procedures' ? data[section] : undefined
       })
     }
     // include custom "after_" sections
@@ -333,18 +332,20 @@ const consolidatedSections = computed((): EduLessonSectionObject[] => {
       v-for="(value, _key) in consolidatedSections"
       :key="_key"
     >
-      <BlockStreamfield
-        v-if="value.type === 'streamfield'"
-        :data="value.blocks"
-      />
-      <PageEduLessonSection
-        v-else
-        :heading="value.heading"
-        :blocks="value.blocks"
-        :procedures="value.procedures"
-        :text="value.text"
-        :image="value.image"
-      />
+      <template v-if="value.blocks?.length || value.procedures?.length">
+        <BlockStreamfield
+          v-if="value.type === 'streamfield'"
+          :data="value.blocks"
+        />
+        <PageEduLessonSection
+          v-else
+          :heading="value.heading"
+          :blocks="value.blocks"
+          :procedures="value.procedures"
+          :text="value.text"
+          :image="value.image"
+        />
+      </template>
     </template>
 
     <!-- streamfield blocks -->

package/src/utils/mixins.ts

@@ -148,19 +148,21 @@ export const mixinHighlightPrimary = (value: boolean) => {
       Useful for dropdown toggles.
     */
 export const mixinIsActivePath = (itemPath: string): Boolean => {
-  const route = useRoute()
-  const currentPath = route ? route.path : false
-  const path = itemPath.startsWith('http') ? itemPath.replace(/^.*\/\/[^/]+/, '') : itemPath
-  const ancestorPath = path ? (path.endsWith('/') ? path : path + '/') : false
+  if (itemPath) {
+    const route = useRoute()
+    const currentPath = route ? route.path : false
+    const path = itemPath.startsWith('http') ? itemPath.replace(/^.*\/\/[^/]+/, '') : itemPath
+    const ancestorPath = path ? (path.endsWith('/') ? path : path + '/') : false
 
-  if (currentPath && path && ancestorPath) {
-    if (currentPath === path) {
-      return true
-    } else if (currentPath.startsWith('/edu/events')) {
-      // special treatment since EDU combines News & Events in the main nav
-      return path.startsWith('/edu/news')
-    } else {
-      return currentPath.startsWith(ancestorPath)
+    if (currentPath && path && ancestorPath) {
+      if (currentPath === path) {
+        return true
+      } else if (currentPath.startsWith('/edu/events')) {
+        // special treatment since EDU combines News & Events in the main nav
+        return path.startsWith('/edu/news')
+      } else {
+        return currentPath.startsWith(ancestorPath)
+      }
     }
   }
   return false