@slidev/client 52.15.2 → 52.17.0

package/App.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { watchEffect } from 'vue'
 import { themeVars } from './env'
+import PwaIndicator from './internals/PwaIndicator.vue'
 import setupRoot from './setup/root'
 
 setupRoot()
@@ -13,4 +14,5 @@ watchEffect(() => {
 
 <template>
   <RouterView />
+  <PwaIndicator v-if="__SLIDEV_FEATURE_PWA__" />
 </template>

package/builtin/AutoFitText.vue

@@ -1,9 +1,8 @@
 <!--
-[Experimental]
-
-Think this component as the TextBox you that will see
+Think of this component as the TextBox that you will see
 in PowerPoint or Keynote. It will automatically resize
-the font size based on it's content to fit them in.
+the font size based on its content to fit them in,
+powered by fitty (https://github.com/rikschennink/fitty).
 
 Usage:
 
@@ -11,12 +10,14 @@ Usage:
 
 or
 
-<AutoFitText :max="80" :min="100" v-model="text"/>
+<AutoFitText :max="100" :min="30" v-model="text"/>
 -->
 
 <script setup lang="ts">
-import { useElementSize, useVModel } from '@vueuse/core'
-import { computed, ref, watch } from 'vue'
+import type { FittyInstance } from 'fitty'
+import { useResizeObserver, useVModel } from '@vueuse/core'
+import fitty from 'fitty'
+import { onMounted, onUnmounted, ref, watch } from 'vue'
 
 const props = defineProps({
   modelValue: {
@@ -28,40 +29,59 @@ const props = defineProps({
   min: {
     default: 30,
   },
+  multiLine: {
+    type: Boolean,
+    default: true,
+  },
 })
 
-const emit = defineEmits<{
-  (e: any): void
-}>()
-const container = ref<HTMLDivElement>()
-const inner = ref<HTMLDivElement>()
-const size = ref(100)
-const fontSize = computed(() => `${size.value}px`)
+const emit = defineEmits(['update:modelValue'])
+
 const value = useVModel(props, 'modelValue', emit)
 
-const containerSize = useElementSize(container)
-const innerSize = useElementSize(inner)
+const container = ref<HTMLDivElement>()
+const inner = ref<HTMLDivElement>()
 
-const wrapLen = ref(0)
-const wrap = ref('nowrap')
+let instance: FittyInstance | undefined
 
-watch([container, value, containerSize.width, innerSize.width], async () => {
-  if (!container.value || innerSize.width.value <= 0)
+function init() {
+  instance?.unsubscribe()
+  instance = undefined
+  if (!inner.value)
     return
-  const ratio = containerSize.width.value / innerSize.width.value
-  if (Number.isNaN(ratio) || ratio <= 0)
+  instance = fitty(inner.value, {
+    minSize: props.min,
+    maxSize: props.max,
+    multiLine: props.multiLine,
+  })
+}
+
+onMounted(() => {
+  init()
+  // Refit once web fonts are loaded, as glyph metrics may change
+  document.fonts?.ready.then(() => instance?.fit())
+})
+
+onUnmounted(() => {
+  instance?.unsubscribe()
+  instance = undefined
+})
+
+watch(() => [props.min, props.max, props.multiLine], init)
+
+// Fitty observes content mutations and window resizes on its own,
+// but not resizes of the container itself
+useResizeObserver(container, () => {
+  if (!container.value || container.value.clientWidth <= 0)
     return
-  let newSize = size.value * (containerSize.width.value / innerSize.width.value)
-  if (newSize < props.min) {
-    wrapLen.value = value.value.length
-    wrap.value = ''
-  }
-  else {
-    if (value.value.length < wrapLen.value)
-      wrap.value = 'nowrap'
-  }
-  newSize = Math.max(props.min, Math.min(props.max, newSize))
-  size.value = newSize
+  // If fitty was initialized while the element was hidden (e.g. on a
+  // preloaded slide), its internal state is invalid and refitting can
+  // never recover, so reinitialize it once the container is visible.
+  // A successful fit always leaves an inline font-size on the element.
+  if (inner.value && !inner.value.style.fontSize)
+    init()
+  else
+    instance?.fit()
 })
 </script>
 
@@ -78,11 +98,10 @@ watch([container, value, containerSize.width, innerSize.width], async () => {
 <style scoped>
 .slidev-auto-fit-text {
   overflow: auto;
-  font-size: v-bind(fontSize);
-  white-space: v-bind(wrap);
 }
 
 .slidev-auto-fit-text-inner {
   display: inline-block;
+  white-space: nowrap;
 }
 </style>

package/builtin/KaTexBlockWrapper.test.ts

@@ -0,0 +1,41 @@
+import { describe, expect, it } from 'vitest'
+import { collectKatexEquationLines } from './katex-lines'
+
+function fakeElement(options: {
+  parent?: Element | null
+  closest?: Element | null
+  children?: Element[]
+} = {}) {
+  const el = {
+    parentElement: options.parent ?? null,
+    closest: () => options.closest ?? null,
+    querySelectorAll: () => options.children ?? [],
+  }
+  return el as unknown as Element
+}
+
+describe('collectKatexEquationLines', () => {
+  it('ignores nested KaTeX tables when mapping equation lines', () => {
+    const rowA1 = fakeElement()
+    const rowA2 = fakeElement()
+    const rowB1 = fakeElement()
+    const rowB2 = fakeElement()
+    const nestedRow = fakeElement()
+
+    const outerLeftParent = fakeElement({ children: [rowA1, rowA2] })
+    const outerRightParent = fakeElement({ children: [rowB1, rowB2] })
+    const nestedParent = fakeElement({
+      parent: fakeElement({ closest: outerLeftParent }),
+      children: [nestedRow],
+    })
+
+    const root = fakeElement({
+      children: [outerLeftParent, nestedParent, outerRightParent],
+    })
+
+    expect(collectKatexEquationLines(root)).toEqual([
+      [rowA1, rowB1],
+      [rowA2, rowB2],
+    ])
+  })
+})

package/builtin/KaTexBlockWrapper.vue

@@ -26,6 +26,7 @@ import { computed, onMounted, onUnmounted, ref, watchEffect } from 'vue'
 import { CLASS_VCLICK_HIDDEN, CLASS_VCLICK_TARGET, CLICKS_MAX } from '../constants'
 import { useSlideContext } from '../context'
 import { makeId } from '../logic/utils'
+import { collectKatexEquationLines } from './katex-lines'
 
 const props = defineProps({
   ranges: {
@@ -77,26 +78,10 @@ onMounted(() => {
     if (hide)
       rangeStr = props.ranges[index.value + 1] ?? finallyRange.value
 
-    // KaTeX equations have col-align-XXX as parent
-    const equationParents = el.value.querySelectorAll('.mtable > [class*=col-align]')
-    if (!equationParents)
-      return
-
-    // For each row we extract the individual equation rows
-    const equationRowsOfEachParent = Array.from(equationParents)
-      .map(item => Array.from(item.querySelectorAll(':scope > .vlist-t > .vlist-r > .vlist > span > .mord')))
     // This list maps rows from different parents to line them up
-    const lines: Element[][] = []
-    for (const equationRowParent of equationRowsOfEachParent) {
-      equationRowParent.forEach((equationRow, idx) => {
-        if (!equationRow)
-          return
-        if (Array.isArray(lines[idx]))
-          lines[idx].push(equationRow)
-        else
-          lines[idx] = [equationRow]
-      })
-    }
+    const lines = collectKatexEquationLines(el.value)
+    if (!lines.length)
+      return
 
     const startLine = props.startLine
     const highlights: number[] = parseRangeString(lines.length + startLine - 1, rangeStr)

package/builtin/ShikiMagicMove.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { KeyedTokensInfo } from 'shiki-magic-move/types'
+import type { KeyedTokensInfo } from '@shikijs/magic-move/types'
 import type { PropType } from 'vue'
 import { sleep } from '@antfu/utils'
+import { ShikiMagicMovePrecompiled } from '@shikijs/magic-move/vue'
 import { useClipboard } from '@vueuse/core'
 import lz from 'lz-string'
-import { ShikiMagicMovePrecompiled } from 'shiki-magic-move/vue'
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useNav } from '../composables/useNav'
 import { CLICKS_MAX } from '../constants'

package/builtin/TocList.vue

@@ -8,9 +8,9 @@ Usage:
 -->
 <script setup lang="ts">
 import type { TocItem } from '@slidev/types'
-import TitleRenderer from '#slidev/title-renderer'
 import { toArray } from '@antfu/utils'
 import { computed } from 'vue'
+import TitleRenderer from '#slidev/title-renderer'
 import { useNav } from '../composables/useNav'
 
 const props = withDefaults(

package/builtin/katex-lines.ts

@@ -0,0 +1,22 @@
+const KATEX_EQUATION_PARENT_SELECTOR = '.mtable > [class*=col-align]'
+const KATEX_EQUATION_ROW_SELECTOR = ':scope > .vlist-t > .vlist-r > .vlist > span > .mord'
+
+export function collectKatexEquationLines(el: Element): Element[][] {
+  const equationParents = Array.from(el.querySelectorAll(KATEX_EQUATION_PARENT_SELECTOR))
+    .filter(parent => !parent.parentElement?.closest(KATEX_EQUATION_PARENT_SELECTOR))
+
+  const lines: Element[][] = []
+  for (const equationRowParent of equationParents) {
+    const equationRows = Array.from(equationRowParent.querySelectorAll(KATEX_EQUATION_ROW_SELECTOR))
+    equationRows.forEach((equationRow, idx) => {
+      if (!equationRow)
+        return
+      if (Array.isArray(lines[idx]))
+        lines[idx].push(equationRow)
+      else
+        lines[idx] = [equationRow]
+    })
+  }
+
+  return lines
+}

package/composables/useEmbeddedCtrl.ts

@@ -31,8 +31,10 @@ export function useEmbeddedControl() {
 
   if (nav.isEmbedded.value) {
     throttledWatch(
-      [nav.currentSlideNo, nav.clicks, nav.hasNext, nav.hasPrev],
-      ([no, clicks, hasNext, hasPrev]) => {
+      [nav.currentSlideNo, nav.clicks, nav.hasNext, nav.hasPrev, nav.hasPrimarySlide],
+      ([no, clicks, hasNext, hasPrev, hasPrimarySlide]) => {
+        if (!hasPrimarySlide)
+          return
         window.parent.postMessage(
           {
             target: 'slidev',

package/composables/useNav.ts

@@ -1,12 +1,12 @@
 import type { ClicksContext, SlideRoute, TocItem } from '@slidev/types'
 import type { ComputedRef, Ref, TransitionGroupProps, WritableComputedRef } from 'vue'
 import type { RouteLocationNormalized, Router } from 'vue-router'
-import { slides } from '#slidev/slides'
 import { clamp } from '@antfu/utils'
 import { parseRangeString } from '@slidev/parser/utils'
 import { createSharedComposable } from '@vueuse/core'
 import { computed, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import { slides } from '#slidev/slides'
 import { CLICKS_MAX } from '../constants'
 import { configs } from '../env'
 import { useRouteQuery } from '../logic/route'

package/composables/usePreloadImages.ts

@@ -1,7 +1,7 @@
 import type { SlideRoute } from '@slidev/types'
 import type { ComputedRef, Ref } from 'vue'
+import { computed, ref, watchEffect } from 'vue'
 import configs from '#slidev/configs'
-import { watchEffect } from 'vue'
 
 const loaded = new Set<string>()
 const loading = new Set<string>()
@@ -14,6 +14,23 @@ function resolveUrl(url: string): string {
   return `${base}${url.startsWith('/') ? url : `/${url}`}`
 }
 
+const RETRY_LIMIT = 2
+const retries = new Map<string, number>()
+
+const preloadedCount = ref(0)
+const totalImagesCount = ref(0)
+
+/**
+ * Progress of slide-image preloading, from 0 to 1 (1 when every preloadable
+ * image in the deck has loaded, or when the deck has no images).
+ */
+export const preloadProgress = computed(() =>
+  totalImagesCount.value === 0 ? 1 : preloadedCount.value / totalImagesCount.value,
+)
+
+/** Whether all preloadable slide images have finished loading. */
+export const preloadComplete = computed(() => preloadProgress.value >= 1)
+
 function preloadImage(url: string): void {
   const resolved = resolveUrl(url)
   if (loaded.has(resolved) || loading.has(resolved))
@@ -23,9 +40,18 @@ function preloadImage(url: string): void {
   img.onload = () => {
     loading.delete(resolved)
     loaded.add(resolved)
+    retries.delete(resolved)
+    preloadedCount.value = loaded.size
   }
   img.onerror = () => {
     loading.delete(resolved)
+    // Retry transient preload failures (e.g. flaky network) instead of silently
+    // giving up; bounded so genuinely-missing assets aren't hammered.
+    const attempts = retries.get(resolved) ?? 0
+    if (attempts < RETRY_LIMIT) {
+      retries.set(resolved, attempts + 1)
+      setTimeout(preloadImage, 1000 * (attempts + 1), url)
+    }
   }
   img.src = resolved
 }
@@ -50,6 +76,19 @@ export function usePreloadImages(
 
   const ahead = (typeof config === 'object' && config?.ahead) || 3
 
+  // Track total preloadable images across the deck for progress reporting
+  watchEffect(() => {
+    const all = slides.value
+    if (!all?.length)
+      return
+    const urls = new Set<string>()
+    for (const route of all) {
+      for (const url of route.meta?.slide?.images ?? [])
+        urls.add(resolveUrl(url))
+    }
+    totalImagesCount.value = urls.size
+  })
+
   // Preload current + prev + next + look-ahead window
   watchEffect(() => {
     const current = currentRoute.value

package/constants.ts

@@ -86,6 +86,7 @@ export const HEADMATTER_FIELDS = [
   'comark',
   'contextMenu',
   'wakeLock',
+  'pwa',
   'seoMeta',
   'notesAutoRuby',
   'magicMoveDuration',

package/env.ts

@@ -1,6 +1,6 @@
-import configs from '#slidev/configs'
 import { objectMap } from '@antfu/utils'
 import { computed } from 'vue'
+import configs from '#slidev/configs'
 
 export { configs }
 

package/internals/ClicksSlider.vue

@@ -1,70 +1,146 @@
 <script setup lang="ts">
 import type { ClicksContext } from '@slidev/types'
 import { clamp, range } from '@antfu/utils'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { CLICKS_MAX } from '../constants'
 
 const props = withDefaults(defineProps<{
   clicksContext: ClicksContext
   readonly?: boolean
   active?: boolean
+  resettable?: boolean
+  compact?: boolean
+  attached?: boolean
 }>(), {
   active: true,
 })
 
+const emit = defineEmits<{
+  (type: 'activate'): void
+  (type: 'reset'): void
+}>()
+
 const total = computed(() => props.clicksContext.total)
 const start = computed(() => clamp(0, props.clicksContext.clicksStart, total.value))
 const length = computed(() => total.value - start.value + 1)
 const current = computed({
   get() {
+    if (props.resettable && !props.active)
+      return -1
     return props.clicksContext.current > total.value ? -1 : props.clicksContext.current
   },
   set(value: number) {
+    if (props.resettable && value < 0) {
+      emit('reset')
+      // eslint-disable-next-line vue/no-mutating-props
+      props.clicksContext.current = CLICKS_MAX
+      return
+    }
+    emit('activate')
     // eslint-disable-next-line vue/no-mutating-props
     props.clicksContext.current = value
   },
 })
 
+const isReset = computed(() => props.resettable && current.value < 0)
 const clicksRange = computed(() => range(start.value, total.value + 1))
+const sliderEl = ref<HTMLElement>()
+let pointerDown: { id: number, x: number, y: number } | undefined
+
+function getPointerRatio(event: PointerEvent) {
+  const rect = sliderEl.value!.getBoundingClientRect()
+  return (event.clientX - rect.left) / Math.max(1, rect.width)
+}
+
+// Presses snap to a cell; drags switch only after crossing half a cell.
+function setCurrentFromPointer(event: PointerEvent, snap: boolean) {
+  if (props.readonly || !sliderEl.value || (!snap && !(event.buttons & 1)))
+    return
+  const ratio = getPointerRatio(event)
+  // In resettable mode, dragging left of the rail restores the inactive state.
+  if (props.resettable && ratio < 0) {
+    current.value = -1
+    return
+  }
+  // Keep press-at-right-edge inside the last cell.
+  const position = clamp(0, ratio, snap ? 0.999999 : 1) * length.value
+  const currentOffset = clamp(0, current.value - start.value, length.value - 1)
+  let next = snap ? start.value + Math.floor(position) : current.value
+  if (!snap && position >= currentOffset + 1.5)
+    next = start.value + Math.floor(position - 0.5)
+  else if (!snap && position < currentOffset - 0.5)
+    next = start.value + Math.ceil(position - 0.5)
+  current.value = clamp(start.value, next, total.value)
+}
 
-function onMousedown() {
+function onPointerDown(event: PointerEvent) {
   if (props.readonly)
     return
-  if (current.value < 0 || current.value > total.value)
-    current.value = 0
+  sliderEl.value?.setPointerCapture(event.pointerId)
+  pointerDown = { id: event.pointerId, x: event.clientX, y: event.clientY }
+  setCurrentFromPointer(event, true)
+}
+
+function onPointerMove(event: PointerEvent) {
+  if (pointerDown?.id === event.pointerId) {
+    // Treat tiny movement after pointerdown as part of the click.
+    if (Math.abs(event.clientX - pointerDown.x) <= 3 && Math.abs(event.clientY - pointerDown.y) <= 3)
+      return
+    pointerDown = undefined
+  }
+  setCurrentFromPointer(event, false)
 }
 </script>
 
 <template>
   <div
-    class="flex gap-1 items-center select-none"
+    class="flex gap-1 select-none"
     :title="`Clicks in this slide: ${length}`"
-    :class="length && props.clicksContext.isMounted ? '' : 'op50'"
+    :class="[attached ? 'items-end' : 'items-center', length && props.clicksContext.isMounted ? '' : 'op50']"
   >
-    <div class="flex gap-0.2 items-center min-w-16 font-mono mr1">
-      <div class="i-carbon:cursor-1 text-sm op50" />
+    <div
+      class="flex items-center font-mono"
+      :class="[compact ? 'gap-1 min-w-0 mr0' : 'gap-0.2 min-w-16 mr1', attached ? 'h-[22px]' : '']"
+    >
+      <div class="i-carbon:cursor-1 text-sm op50" :class="compact ? 'ml-1' : ''" />
       <template v-if="current >= 0 && current !== CLICKS_MAX && active">
-        <div flex-auto />
-        <span text-primary>{{ current }}</span>
-        <span op25 text-sm>/</span>
-        <span op50 text-sm>{{ total }}</span>
+        <div v-if="!compact" flex-auto />
+        <span>
+          <span text-primary>{{ current }}</span>
+          <span op25 text-sm>/</span>
+          <span op50 text-sm>{{ total }}</span>
+        </span>
       </template>
       <div
         v-else
-        op50 flex-auto pl1
+        op50
+        :class="compact ? '' : 'flex-auto pl1'"
       >
-        {{ total }}
+        <span
+          :class="compact ? 'inline-block text-center' : ''"
+          :style="compact ? { width: `${String(total).length * 2 + 1}ch`, marginLeft: '-0.25ch' } : undefined"
+        >{{ total }}</span>
       </div>
     </div>
     <div
-      relative flex-auto h5 font-mono flex="~"
+      ref="sliderEl"
+      relative flex-auto font-mono flex="~"
+      touch-none
+      :class="[attached ? 'h-[22px]' : 'h5', isReset ? 'op80' : '']"
+      @pointerdown.capture="onPointerDown"
+      @pointermove="onPointerMove"
+      @pointerup="pointerDown = undefined"
+      @pointercancel="pointerDown = undefined"
     >
       <div
         v-for="i of clicksRange" :key="i"
         border="y main" of-hidden relative
         :class="[
-          i === 0 ? 'rounded-l border-l' : '',
-          i === total ? 'rounded-r border-r' : '',
+          i === 0 ? 'border-l' : '',
+          i === 0 ? attached ? 'rounded-tl' : 'rounded-l' : '',
+          i === total ? 'border-r' : '',
+          i === total && +i !== +current ? attached ? 'rounded-tr' : 'rounded-r' : '',
+          attached ? 'border-b-0' : '',
         ]"
         :style="{ width: length > 0 ? `${1 / length * 100}%` : '100%' }"
       >
@@ -72,45 +148,20 @@ function onMousedown() {
           absolute inset-0
           :class="(i <= current && active) ? 'bg-primary op15' : ''"
         />
+        <div
+          v-if="+i === +current && active"
+          absolute inset-y-0 right-0 w-0.5 bg-primary z-1
+        />
         <div
           :class="[
-            (+i === +current && active) ? 'text-primary font-bold op100 border-primary' : 'op30 border-main',
-            i === 0 ? 'rounded-l' : '',
-            i === total ? 'rounded-r' : 'border-r-2',
+            (+i === +current && active) ? 'text-primary font-bold op100' : 'op30',
+            i !== total ? 'border-r-2 border-main' : '',
           ]"
           w-full h-full text-xs flex items-center justify-center z-1
         >
           {{ i }}
         </div>
       </div>
-      <input
-        v-model="current"
-        class="range"
-        type="range" :min="start" :max="total" :step="1"
-        absolute inset-0 z-label op0
-        :class="readonly ? 'pointer-events-none' : ''"
-        :style="{ '--thumb-width': `${1 / (length + 1) * 100}%` }"
-        @mousedown="onMousedown"
-        @focus="event => (event.currentTarget as HTMLElement)?.blur()"
-      >
     </div>
   </div>
 </template>
-
-<style scoped>
-.range {
-  -webkit-appearance: none;
-  appearance: none;
-  background: transparent;
-}
-.range::-webkit-slider-thumb {
-  -webkit-appearance: none;
-  height: 100%;
-  width: var(--thumb-width, 0.5rem);
-}
-
-.range::-moz-range-thumb {
-  height: 100%;
-  width: var(--thumb-width, 0.5rem);
-}
-</style>

package/internals/CodeRunner.vue

@@ -22,12 +22,12 @@ const props = defineProps<{
 
 const emit = defineEmits(['update:modelValue'])
 
-const { isPrintMode } = useNav()
+const { isEmbedded, isPrintMode } = useNav()
 
 const code = useVModel(props, 'modelValue', emit)
 
 const { $renderContext, $clicksContext } = useSlideContext()
-const disabled = computed(() => !['slide', 'presenter'].includes($renderContext.value))
+const disabled = computed(() => !['slide', 'presenter'].includes($renderContext.value) && !($renderContext.value === 'overview' && isEmbedded.value))
 
 const autorun = isPrintMode.value ? 'once' : props.autorun
 const isRunning = ref(autorun)

package/internals/Goto.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import TitleRenderer from '#slidev/title-renderer'
 import Fuse from 'fuse.js'
 import { computed, ref, watch } from 'vue'
+import TitleRenderer from '#slidev/title-renderer'
 import { useNav } from '../composables/useNav'
 import { activeElement, showGotoDialog } from '../state'
 
@@ -136,7 +136,7 @@ watch(activeElement, () => {
       >
     </div>
     <div
-      v-if="result.length > 0"
+      v-if="showGotoDialog && result.length > 0"
       ref="list"
       class="autocomplete-list"
       shadow="~"

package/internals/NavControls.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import CustomNavControls from '#slidev/custom-nav-controls'
 import { computed, ref, shallowRef } from 'vue'
+import CustomNavControls from '#slidev/custom-nav-controls'
 import { useDrawings } from '../composables/useDrawings'
 import { useNav } from '../composables/useNav'
 import { configs } from '../env'

package/internals/NoteDisplay.vue

@@ -172,4 +172,9 @@ watchEffect(() => {
 .slidev-note :first-child {
   margin-top: 0;
 }
+
+.slidev-note {
+  overflow-wrap: anywhere;
+  word-break: break-word;
+}
 </style>