feat(up): truncate util; NuxtLink in AppFooter textLinks; upgrade to …

…Pinceau ^0.9.12
nuxt-themes · Dec 26, 2022 · e01844b · e01844b
1 parent d682fcf
commit e01844b
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 123 deletions.
diff --git a/app/integrations/docsearch.ts b/app/integrations/docsearch.ts
@@ -48,7 +48,7 @@ export default defineNuxtPlugin(() => {
      * Initialize the DocSearch instance.
      * @param userOptions
      */
-    const initialize = async (userOptions: DocSearchOptions) => {
+    const initialize = async (userOptions: any & DocSearchOptions) => {
       const el = document.createElement('div')
       el.id = '#docsearch-container'
       el.style.width = '0'
@@ -118,7 +118,6 @@ export default defineNuxtPlugin(() => {
                 }
               }
             },
-        // @ts-expect-error - We don't actually use `hitComponent` but react on its calls.
         hitComponent: userOptions.hitComponent
           ? userOptions.hitComponent
           : ({ hit, children }) => {
@@ -155,7 +154,7 @@ export default defineNuxtPlugin(() => {
           // Skip already used keys
           .filter(([key]) => !['applicationId', 'apiKey', 'indexName', 'transformItems', 'navigator', 'hitComponent', 'facetFilters', 'langAttribute', 'lang'].includes(key))
           // Recompose options
-          .reduce((acc, [key, value]) => {
+          .reduce((acc: any, [key, value]) => {
             acc[key] = value
             return acc
           }, {})

diff --git a/components/app/AppFooter.vue b/components/app/AppFooter.vue
@@ -20,8 +20,7 @@ const nbSocialIcons = computed(() => (socialIcons.value ? socialIconsCount.value
 
       <!-- Center -->
       <div class="center">
-        <!-- TODO: inner app links with NuxtLink -->
-        <a
+        <NuxtLink
           v-for="link in textLinks"
           :key="link.href"
           class="text-link"
@@ -30,7 +29,7 @@ const nbSocialIcons = computed(() => (socialIcons.value ? socialIconsCount.value
           :target="link.target || '_self'"
         >
           {{ link.text }}
-        </a>
+        </NuxtLink>
       </div>
 
       <div class="right">

diff --git a/components/app/AppHeaderNavigation.vue b/components/app/AppHeaderNavigation.vue
@@ -10,7 +10,7 @@ const filtered = computed(() => docus.value.header?.exclude || [])
 
 const tree = computed(() => {
   return (navigation.value || []).filter((item: any) => {
-    if (filtered.value.includes(item._path)) { return false }
+    if (filtered.value.includes(item._path as never)) { return false }
     return true
   })
 })
@@ -51,10 +51,7 @@ css({
       justifyContent: 'center',
       flex: '1',
       maxWidth: '100%',
-      // TODO: truncate
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      whiteSpace: 'nowrap',
+      truncate: true,
 
       '& > * + *': {
         marginLeft: '{space.2}'

diff --git a/components/docs/DocsPrevNext.vue b/components/docs/DocsPrevNext.vue
@@ -88,10 +88,7 @@ css({
           fontWeight: '{fontWeight.medium}',
           textAlign: 'right',
           color: '{color.gray.500}',
-          // TODO: truncate
-          overflow: 'hidden',
-          textOverflow: 'ellipsis',
-          whiteSpace: 'nowrap',
+          truncate: true
         }
       },
       '&.next': {
@@ -102,10 +99,7 @@ css({
           lineHeight: '{text.xs.lineHeight}',
           fontWeight: '{fontWeight.medium}',
           color: '{color.gray.500}',
-          // TODO: truncate
-          overflow: 'hidden',
-          textOverflow: 'ellipsis',
-          whiteSpace: 'nowrap',
+          truncate: true
         }
       },
       '.title-wrapper': {
@@ -122,10 +116,7 @@ css({
         flex: '1 1 0%',
         fontWeight: '{fontWeight.medium}',
         lineHeight: '{lead.5}',
-        // TODO: truncate
-        overflow: 'hidden',
-        textOverflow: 'ellipsis',
-        whiteSpace: 'nowrap',
+        truncate: true
       }
     }
   }

diff --git a/components/docs/DocsTocLinks.vue b/components/docs/DocsTocLinks.vue
@@ -11,7 +11,6 @@ defineProps({
 
 const emit = defineEmits(['move'])
 
-const route = useRoute()
 const router = useRouter()
 
 const { activeHeadings, updateHeadings } = useScrollspy()
@@ -63,10 +62,7 @@ css({
       fontSize: '{text.sm.fontSize}',
       lineHeight: '{text.sm.lineHeight}',
       color: '{color.gray.500}',
-      // TODO: truncate
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      whiteSpace: 'nowrap',
+      truncate: true,
       '@lg': {
         paddingRight: '{space.3}'
       },

diff --git a/package.json b/package.json
@@ -27,11 +27,11 @@
   },
   "dependencies": {
     "@nuxt-themes/elements": "^0.3.3",
-    "@nuxt-themes/tokens": "^1.4.2",
+    "@nuxt-themes/tokens": "^1.4.3",
     "@nuxt-themes/typography": "^0.2.2",
     "@nuxt/content": "^2.3.0",
-    "@nuxthq/studio": "^0.4.1",
-    "@vueuse/nuxt": "^9.8.2"
+    "@nuxthq/studio": "^0.4.2",
+    "@vueuse/nuxt": "^9.9.0"
   },
   "devDependencies": {
     "@algolia/client-search": "^4.14.3",