fix(react,vue2,vue3): 🐛 issue#78

i7eo · Nov 16, 2023 · 6ad916e · 6ad916e · vercel · Nov 16, 2023
1 parent 8ff12e6
commit 6ad916e
Show file tree

Hide file tree

Showing 4 changed files with 1,801 additions and 1,851 deletions.
diff --git a/.changeset/selfish-monkeys-act.md b/.changeset/selfish-monkeys-act.md
@@ -0,0 +1,7 @@
+---
+'@google-translate-select/vue2': patch
+'@google-translate-select/vue3': patch
+'@google-translate-select/react': patch
+---
+
+bump version for PR
diff --git a/packages/vue2/src/google-translate-select.vue b/packages/vue2/src/google-translate-select.vue
@@ -306,21 +306,18 @@ export default Vue.extend<
      * @param select
      */
     triggerTranslate(select: HTMLSelectElement | string) {
-      if (!select) return
-      let selectValue = ''
-      if (isString(select)) {
-        selectValue = select
-      } else {
-        selectValue = select.value ?? ''
+      if (!select) {
+        return
       }
-
+      const selectValue = isString(select) ? select : select.value ?? ''
       const googleTranslateOriginalSelectEl = document.querySelector(
         GOOGLE_TRANSLATE_ORIGINAL_SELECT_CLASSNAME
-      ) as HTMLSelectElement
+      ) as HTMLSelectElement | null
       const googleTranslateSelectEl = document.querySelector(`.${ns.b()}`)
 
       if (
         !googleTranslateSelectEl ||
+        !googleTranslateOriginalSelectEl ||
         googleTranslateSelectEl.innerHTML.length === 0 ||
         googleTranslateOriginalSelectEl.options.length === 0
       ) {

diff --git a/packages/vue3/src/google-translate-select.vue b/packages/vue3/src/google-translate-select.vue
@@ -262,22 +262,18 @@ export default defineComponent({
      * @param select
      */
     function triggerTranslate(select: HTMLSelectElement | string) {
-      if (!select) return
-
-      let selectValue = ''
-      if (isString(select)) {
-        selectValue = select
-      } else {
-        selectValue = select.value ?? ''
+      if (!select) {
+        return
       }
-
+      const selectValue = isString(select) ? select : select.value ?? ''
       const googleTranslateOriginalSelectEl = document.querySelector(
         GOOGLE_TRANSLATE_ORIGINAL_SELECT_CLASSNAME
-      ) as HTMLSelectElement
+      ) as HTMLSelectElement | null
       const googleTranslateSelectEl = document.querySelector(`.${ns.b()}`)
 
       if (
         !googleTranslateSelectEl ||
+        !googleTranslateOriginalSelectEl ||
         googleTranslateSelectEl.innerHTML.length === 0 ||
         googleTranslateOriginalSelectEl.options.length === 0
       ) {