feat(inIOS): 支持在小程序中使用

fjc0k · Jul 23, 2020 · e804fb8 · e804fb8
1 parent ba90ab8
commit e804fb8
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/src/utils/inIOS.test.ts b/src/utils/inIOS.test.ts
@@ -1,3 +1,5 @@
+/// <reference types="miniprogram-api-typings" />
+
 Object.defineProperty(window.navigator, 'platform', {
   writable: true,
 })
@@ -7,17 +9,45 @@ describe('inIOS', () => {
     jest.resetModules()
   })
 
-  test('不在 iOS 设备中', async () => {
+  test('<浏览器> 不在 iOS 设备中', async () => {
     const { inIOS } = await import('./inIOS')
     // @ts-ignore
     window.navigator.platform = 'x'
     expect(inIOS()).toBeFalse()
   })
 
-  test('在 iOS 设备中', async () => {
+  test('<浏览器> 在 iOS 设备中', async () => {
     const { inIOS } = await import('./inIOS')
     // @ts-ignore
     window.navigator.platform = 'xx iPhone yy'
     expect(inIOS()).toBeTrue()
   })
+
+  test('<小程序> 不在 iOS 设备中', async () => {
+    const { inIOS } = await import('./inIOS')
+    // @ts-ignore
+    window.wx = {
+      getSystemInfoSync() {
+        return {
+          platform: 'devtools',
+          system: '123',
+        }
+      },
+    } as Partial<WechatMiniprogram.Wx>
+    expect(inIOS()).toBeFalse()
+  })
+
+  test('<小程序> 在 iOS 设备中', async () => {
+    const { inIOS } = await import('./inIOS')
+    // @ts-ignore
+    window.wx = {
+      getSystemInfoSync() {
+        return {
+          platform: 'ios',
+          system: '123',
+        }
+      },
+    } as Partial<WechatMiniprogram.Wx>
+    expect(inIOS()).toBeTrue()
+  })
 })
diff --git a/src/utils/inIOS.ts b/src/utils/inIOS.ts
@@ -1,4 +1,5 @@
 import { inBrowser } from './inBrowser'
+import { inMiniProgram } from './inMiniProgram'
 
 let yes!: boolean
 
@@ -15,10 +16,16 @@ let yes!: boolean
  */
 export function inIOS(): boolean {
   if (yes == null) {
-    yes =
-      inBrowser() &&
-      typeof window.navigator === 'object' &&
-      /iPad|iPhone|iPod/i.test(window.navigator.platform || '')
+    const mp = inMiniProgram()
+    if (mp) {
+      const sysInfo = mp.getSystemInfoSync()
+      yes = sysInfo.platform === 'ios' || /iOS/i.test(sysInfo.system)
+    } else {
+      yes =
+        inBrowser() &&
+        typeof window.navigator === 'object' &&
+        /iPad|iPhone|iPod/i.test(window.navigator.platform || '')
+    }
   }
   return yes
 }