fix(plugin-redirect): fix scrollLock, close #105

vuepress · Apr 17, 2024 · 238e222 · 238e222
1 parent de55e4d
commit 238e222
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/plugins/plugin-redirect/src/client/components/LanguageSwitch.ts b/plugins/plugin-redirect/src/client/components/LanguageSwitch.ts
@@ -8,8 +8,8 @@ import {
   computed,
   defineComponent,
   h,
+  onBeforeUnmount,
   onMounted,
-  onUnmounted,
   ref,
   TransitionGroup,
   watch,
@@ -111,35 +111,35 @@ export default defineComponent({
         { immediate: true },
       )
 
-      onUnmounted(() => {
+      onBeforeUnmount(() => {
         isLocked.value = false
       })
     })
 
     return (): VNode | null =>
       showModal.value
-        ? h(TransitionGroup, { name: 'lang-modal-fade' }, () =>
+        ? h(TransitionGroup, { name: 'redirect-modal-fade' }, () =>
             showModal.value
               ? h(
                   'div',
-                  { key: 'mask', class: 'lang-modal-mask' },
+                  { key: 'mask', class: 'redirect-modal-mask' },
                   h(
                     'div',
                     {
                       key: 'popup',
-                      class: 'lang-modal-wrapper',
+                      class: 'redirect-modal-wrapper',
                     },
                     [
                       h(
                         'div',
-                        { class: 'lang-modal-content' },
+                        { class: 'redirect-modal-content' },
                         locale.value?.hint.map((text) => h('p', text)),
                       ),
                       h(
                         'button',
                         {
                           type: 'button',
-                          class: 'lang-modal-action primary',
+                          class: 'redirect-modal-action primary',
                           onClick: () => {
                             updateStatus()
                             router.replace(targetRoute.value!)
@@ -151,7 +151,7 @@ export default defineComponent({
                         'button',
                         {
                           type: 'button',
-                          class: 'lang-modal-action',
+                          class: 'redirect-modal-action',
                           onClick: () => updateStatus(),
                         },
                         locale.value?.cancel,

diff --git a/plugins/plugin-redirect/src/client/styles/language-switch.scss b/plugins/plugin-redirect/src/client/styles/language-switch.scss
@@ -1,14 +1,14 @@
-.lang-modal-fade-enter-active,
-.lang-modal-fade-leave-active {
+.redirect-modal-fade-enter-active,
+.redirect-modal-fade-leave-active {
   transition: opacity 0.5s;
 }
 
-.lang-modal-fade-enter,
-.lang-modal-fade-leave-to {
+.redirect-modal-fade-enter,
+.redirect-modal-fade-leave-to {
   opacity: 0;
 }
 
-.lang-modal-mask {
+.redirect-modal-mask {
   position: fixed;
   inset: 0;
   z-index: var(--redirect-z-index);
@@ -24,7 +24,7 @@
   }
 }
 
-.lang-modal-wrapper {
+.redirect-modal-wrapper {
   position: relative;
   z-index: 1500;
 
@@ -38,7 +38,7 @@
   box-shadow: 0 2px 6px 0 var(--card-shadow);
 }
 
-.lang-modal-action {
+.redirect-modal-action {
   display: block;
 
   width: 100%;

diff --git a/plugins/plugin-redirect/src/node/getRedirectLocaleConfig.ts b/plugins/plugin-redirect/src/node/getRedirectLocaleConfig.ts
@@ -24,8 +24,6 @@ export const getRedirectLocaleConfig = (
     fromEntries(
       entries(locales)
         .filter(([key, { lang }]) => {
-          if (key === '/') return false
-
           if (!lang) {
             logger.error(
               `Missing ${colors.magenta(

diff --git a/themes/theme-default/src/client/styles/vars.scss b/themes/theme-default/src/client/styles/vars.scss
@@ -170,7 +170,7 @@ body {
 }
 
 // plugin-redirect
-.language-modal-mask {
+.redirect-modal-mask {
   --redirect-bg-color: var(--c-bg);
   --redirect-bg-color-light: var(--c-bg-light);
   --redirect-bg-color-lighter: var(--c-bg-lighter);