@slidev/client 0.48.5 → 0.48.7

package/composables/useNav.ts

@@ -86,6 +86,7 @@ export function useNavBase(
   clicksContext: ComputedRef<ClicksContext>,
   queryClicks: Ref<number> = ref(0),
   isPresenter: Ref<boolean>,
+  isPrint: Ref<boolean>,
   router?: Router,
 ): SlidevContextNav {
   const total = computed(() => slides.value.length)
@@ -157,7 +158,9 @@ export function useNavBase(
     await go(
       next,
       lastClicks
-        ? getSlide(next)?.meta.__clicksContext?.total ?? CLICKS_MAX
+        ? isPrint.value
+          ? undefined
+          : getSlide(next)?.meta.__clicksContext?.total ?? CLICKS_MAX
         : undefined,
     )
   }
@@ -226,6 +229,7 @@ export function useFixedNav(
       computed(() => clicksContext),
       ref(CLICKS_MAX),
       ref(false),
+      ref(false),
     ),
     next: noop,
     prev: noop,
@@ -241,13 +245,18 @@ const useNavState = createSharedComposable((): SlidevContextNavState => {
   const router = useRouter()
 
   const currentRoute = computed(() => router.currentRoute.value)
-  const isPrintMode = computed(() => currentRoute.value.query.print !== undefined)
-  const isPrintWithClicks = computed(() => currentRoute.value.query.print === 'clicks')
-  const isEmbedded = computed(() => currentRoute.value.query.embedded !== undefined)
+  const query = computed(() => {
+    // eslint-disable-next-line no-unused-expressions
+    router.currentRoute.value.query
+    return new URLSearchParams(location.search)
+  })
+  const isPrintMode = computed(() => query.value.has('print'))
+  const isPrintWithClicks = computed(() => query.value.get('print') === 'clicks')
+  const isEmbedded = computed(() => query.value.has('embedded'))
   const isPlaying = computed(() => currentRoute.value.name === 'play')
   const isPresenter = computed(() => currentRoute.value.name === 'presenter')
   const isNotesViewer = computed(() => currentRoute.value.name === 'notes')
-  const isPresenterAvailable = computed(() => !isPresenter.value && (!configs.remote || currentRoute.value.query.password === configs.remote))
+  const isPresenterAvailable = computed(() => !isPresenter.value && (!configs.remote || query.value.get('password') === configs.remote))
   const hasPrimarySlide = logicOr(isPlaying, isPresenter)
 
   const currentSlideNo = computed(() => hasPrimarySlide.value ? getSlide(currentRoute.value.params.no as string)?.no ?? 1 : 1)
@@ -335,6 +344,7 @@ export const useNav = createSharedComposable((): SlidevContextNavFull => {
     state.clicksContext,
     state.queryClicks,
     state.isPresenter,
+    state.isPrintMode,
     router,
   )
 

package/internals/SlideWrapper.vue

@@ -55,7 +55,7 @@ const SlideComponent = defineAsyncComponent({
     return defineComponent({
       setup(_, { attrs }) {
         onMounted(() => {
-          props.clicksContext.onMounted()
+          props.clicksContext?.onMounted?.()
         })
         return () => h(component.default, attrs)
       },
@@ -70,6 +70,7 @@ const SlideComponent = defineAsyncComponent({
   <component
     :is="SlideComponent"
     :style="style"
+    :data-slidev-no="props.route.no"
     :class="{ 'disable-view-transition': !['slide', 'presenter'].includes(props.renderContext) }"
   />
 </template>

package/internals/SlidesShow.vue

@@ -5,6 +5,8 @@ import { useNav } from '../composables/useNav'
 import { getSlideClass } from '../utils'
 import { useViewTransition } from '../composables/useViewTransition'
 import { skipTransition } from '../logic/hmr'
+import { createFixedClicks } from '../composables/useClicks'
+import { CLICKS_MAX } from '../constants'
 import SlideWrapper from './SlideWrapper.vue'
 import PresenterMouse from './PresenterMouse.vue'
 
@@ -22,6 +24,8 @@ const {
   isPresenter,
   nextRoute,
   slides,
+  isPrintMode,
+  isPrintWithClicks,
 } = useNav()
 
 // preload next route
@@ -68,16 +72,17 @@ function onAfterLeave() {
     >
       <SlideWrapper
         :is="route.component!"
-        :clicks-context="getPrimaryClicks(route)"
+        :clicks-context="isPrintMode && !isPrintWithClicks ? createFixedClicks(route, CLICKS_MAX) : getPrimaryClicks(route)"
         :class="getSlideClass(route)"
         :route="route"
         :render-context="renderContext"
         class="overflow-hidden"
       />
     </div>
-    <div id="twoslash-container" />
   </component>
 
+  <div id="twoslash-container" />
+
   <!-- Global Top -->
   <GlobalTop />
 
@@ -92,7 +97,7 @@ function onAfterLeave() {
   height: 100%;
 }
 
-#slideshow > div:not(#twoslash-container) {
+#slideshow > div {
   position: absolute;
   height: 100%;
   width: 100%;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@slidev/client",
   "type": "module",
-  "version": "0.48.5",
+  "version": "0.48.7",
   "description": "Presentation slides for developers",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -60,8 +60,8 @@
     "vue": "^3.4.21",
     "vue-demi": "^0.14.7",
     "vue-router": "^4.3.0",
-    "@slidev/parser": "0.48.5",
-    "@slidev/types": "0.48.5"
+    "@slidev/types": "0.48.7",
+    "@slidev/parser": "0.48.7"
   },
   "devDependencies": {
     "vite": "^5.1.6"

package/pages/play.vue

@@ -63,6 +63,7 @@ if (__SLIDEV_FEATURE_DRAWINGS__)
       </template>
       <template #controls>
         <div
+          v-if="!isPrintMode"
           class="absolute bottom-0 left-0 transition duration-300 opacity-0 hover:opacity-100"
           :class="[
             persistNav ? '!opacity-100 right-0' : 'opacity-0 p-2',
@@ -81,5 +82,5 @@ if (__SLIDEV_FEATURE_DRAWINGS__)
       <SideEditor :resize="true" />
     </template>
   </div>
-  <Controls />
-</template>../composables/drawings
+  <Controls v-if="!isPrintMode" />
+</template>