fix: injection_return undefined, close #138

slidevjs · May 20, 2021 · 1e40ca8 · SquirrelJimmy · May 20, 2021 · antfu
1 parent c796152
commit 1e40ca8
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 34 deletions.
diff --git a/packages/client/modules/directives.ts b/packages/client/modules/directives.ts
@@ -31,23 +31,25 @@ export default function createDirectives() {
 
           const prev = elements?.value?.length || 0
 
-          if (!elements?.value?.includes(el))
+          if (elements && !elements?.value?.includes(el))
             elements.value.push(el)
 
           el?.classList.toggle(CLASS_VCLICK_TARGET, true)
 
-          watch(
-            clicks,
-            () => {
-              const c = clicks?.value ?? 0
-              const show = dir.value != null
-                ? c >= dir.value
-                : c > prev
-              if (!el.classList.contains(CLASS_VCLICK_HIDDEN_EXP))
-                el.classList.toggle(CLASS_VCLICK_HIDDEN, !show)
-            },
-            { immediate: true },
-          )
+          if (clicks) {
+            watch(
+              clicks,
+              () => {
+                const c = clicks?.value ?? 0
+                const show = dir.value != null
+                  ? c >= dir.value
+                  : c > prev
+                if (!el.classList.contains(CLASS_VCLICK_HIDDEN_EXP))
+                  el.classList.toggle(CLASS_VCLICK_HIDDEN, !show)
+              },
+              { immediate: true },
+            )
+          }
         },
         unmounted(el: HTMLElement, dir) {
           el?.classList.toggle(CLASS_VCLICK_TARGET, false)
@@ -72,15 +74,17 @@ export default function createDirectives() {
 
           el?.classList.toggle(CLASS_VCLICK_TARGET, true)
 
-          watch(
-            clicks,
-            () => {
-              const show = (clicks.value ?? 0) >= (dir.value ?? prev ?? 0)
-              if (!el.classList.contains(CLASS_VCLICK_HIDDEN_EXP))
-                el.classList.toggle(CLASS_VCLICK_HIDDEN, !show)
-            },
-            { immediate: true },
-          )
+          if (clicks) {
+            watch(
+              clicks,
+              () => {
+                const show = (clicks.value ?? 0) >= (dir.value ?? prev ?? 0)
+                if (!el.classList.contains(CLASS_VCLICK_HIDDEN_EXP))
+                  el.classList.toggle(CLASS_VCLICK_HIDDEN, !show)
+              },
+              { immediate: true },
+            )
+          }
         },
         unmounted(el: HTMLElement) {
           el?.classList.toggle(CLASS_VCLICK_TARGET, true)
@@ -99,15 +103,17 @@ export default function createDirectives() {
 
           el?.classList.toggle(CLASS_VCLICK_TARGET, true)
 
-          watch(
-            clicks,
-            () => {
-              const hide = (clicks?.value || 0) > dir.value
-              el.classList.toggle(CLASS_VCLICK_HIDDEN, hide)
-              el.classList.toggle(CLASS_VCLICK_HIDDEN_EXP, hide)
-            },
-            { immediate: true },
-          )
+          if (clicks) {
+            watch(
+              clicks,
+              () => {
+                const hide = (clicks?.value || 0) > dir.value
+                el.classList.toggle(CLASS_VCLICK_HIDDEN, hide)
+                el.classList.toggle(CLASS_VCLICK_HIDDEN_EXP, hide)
+              },
+              { immediate: true },
+            )
+          }
         },
         unmounted(el, dir) {
           el?.classList.toggle(CLASS_VCLICK_TARGET, false)

diff --git a/packages/client/setup/root.ts b/packages/client/setup/root.ts
@@ -29,7 +29,7 @@ export default function setupRoot() {
         if (+serverState.value.page !== +currentPage.value || clicks.value !== serverState.value.clicks) {
           router.replace({
             path: getPath(serverState.value.page),
-            query: { ...router.currentRoute.query, clicks: serverState.value.clicks || 0 },
+            query: { ...router.currentRoute.value.query, clicks: serverState.value.clicks || 0 },
           })
         }
       },

diff --git a/packages/slidev/node/plugins/setupClient.ts b/packages/slidev/node/plugins/setupClient.ts
@@ -30,11 +30,13 @@ export function createClientSetupPlugin({ clientRoot, themeRoots, userRoot }: Re
           imports.push(`import __n${idx} from '${toAtFS(path)}'`)
           injections.push(
             `// ${path}`,
-            `injection_return = __n${idx}()`,
+            (code.includes('injection_return'))
+              ? `injection_return = __n${idx}();`
+              : `__n${idx}();`,
           )
           asyncInjections.push(
             `// ${path}`,
-            `await __n${idx}(injection_arg)`,
+            `await __n${idx}(injection_arg);`,
           )
         })