@mpxjs/api-proxy 2.7.28 → 2.7.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.7.28",
+  "version": "2.7.49",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "7f62d5dca1b523570369900d92ab1d86decba974"
+  "gitHead": "d24eb21aeb7b11087d5aaaffb1047e7344bfe9cf"
 }

package/src/mini/promisify.js

@@ -27,7 +27,8 @@ const blackList = [
   'reportAnalytics',
   'getMenuButtonBoundingClientRect',
   'reportMonitor',
-  'createOffscreenCanvas'
+  'createOffscreenCanvas',
+  'reportEvent'
 ]
 
 function getMapFromList (list) {

package/src/web/api/create-intersection-observer/IntersectionObserver.js

@@ -0,0 +1,127 @@
+import { nextTick } from '../next-tick'
+
+let isInit = true
+
+class WebIntersectionObserver {
+  constructor (_component, options) {
+    this._component = _component
+    this._options = options || {}
+    this._relativeInfo = []
+    this._callback = null
+    this._observer = null
+    this._root = null
+    this._rootMargin = ''
+    this._disconnected = false
+    this._minThreshold = this.getMinThreshold()
+  }
+
+  initObserver () {
+    if (this._observer) {
+      this._observer = null
+    }
+    this._disconnected = false
+    // eslint-disable-next-line no-undef
+    return new IntersectionObserver((entries, observer) => {
+      const initialRatio = this._options.initialRatio || 0
+      entries.forEach(entry => {
+        if (!isInit || (isInit && (entry.intersectionRatio !== initialRatio && (this._minThreshold <= entry.intersectionRatio)))) {
+          Object.defineProperties(entry, {
+            id: {
+              value: entry.target.getAttribute('id') || '',
+              writable: false,
+              enumerable: true,
+              configurable: true
+            },
+            dataset: {
+              value: entry.target.dataset || {},
+              writable: false,
+              enumerable: true,
+              configurable: true
+            },
+            relativeRect: {
+              value: entry.rootBounds || {},
+              writable: false,
+              enumerable: true,
+              configurable: true
+            },
+            time: {
+              value: new Date().valueOf(),
+              writable: false,
+              enumerable: true,
+              configurable: true
+            }
+          })
+          this._callback && this._callback(entry)
+        }
+      })
+      isInit = false
+    }, {
+      root: this._root || null,
+      rootMargin: this._rootMargin,
+      threshold: this._options.thresholds || [0]
+    })
+  }
+
+  observe (targetSelector, callback) {
+    nextTick(async () => {
+      if (!targetSelector) {
+        const res = { errMsg: 'observe:targetSelector can not be empty' }
+        return Promise.reject(res)
+      }
+      this._observer = await this.initObserver()
+      this._callback = callback
+      let targetElement = []
+      if (this._options.observeAll) {
+        targetElement = [...document.querySelectorAll(targetSelector)]
+      } else {
+        targetElement = [document.querySelector(targetSelector)]
+      }
+      targetElement.forEach((element) => {
+        this._observer && this._observer.observe(element)
+      })
+    })
+  }
+
+  relativeTo (selector, margins) {
+    nextTick(() => {
+      const marginsTemp = margins || {}
+      const { left = 0, right = 0, top = 0, bottom = 0 } = marginsTemp
+      this._root = document.querySelector(selector)
+      this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
+      this._relativeInfo.push({ selector, margins })
+    })
+    return this
+  }
+
+  relativeToViewport (margins) {
+    nextTick(() => {
+      const marginsTemp = margins || {}
+      const { left = 0, right = 0, top = 0, bottom = 0 } = marginsTemp
+      this._root = document.querySelector('html')
+      const viewportWidth = window.innerWidth || document.documentElement.clientWidth
+      const viewportHeight = window.innerHeight || document.documentElement.clientHeight
+      const rootWidth = this._root.offsetWidth || 0
+      const rootHeight = this._root.offsetHeight || 0
+      if (rootHeight >= viewportHeight) {
+        this._rootMargin = `${top}px ${viewportWidth - rootWidth + right}px ${viewportHeight - rootHeight + bottom}px ${left}px`
+      } else {
+        this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
+      }
+      this._relativeInfo.push({ selector: null, margins })
+    })
+    return this
+  }
+
+  disconnect () {
+    this._disconnected = true
+    this._observer.disconnect()
+  }
+
+  getMinThreshold () {
+    const thresholds = this._options.thresholds || [0]
+    const thresholdsSortArr = thresholds.sort((a, b) => a - b)
+    return thresholdsSortArr[0] || 0
+  }
+}
+
+export default WebIntersectionObserver

package/src/web/api/create-intersection-observer/index.js

@@ -0,0 +1,9 @@
+import WebIntersectionObserver from './IntersectionObserver'
+
+function createIntersectionObserver (component, options) {
+  return new WebIntersectionObserver(component, options)
+}
+
+export {
+  createIntersectionObserver
+}

package/src/web/api/create-selector-query/SelectQuery.js

@@ -38,29 +38,34 @@ class SelectQuery {
       const { selector, component, single, fields } = item
 
       let curComponent = document
-
       if (component && component.$el) {
         curComponent = component.$el
       } else if (component && component.nodeType === 1) {
         curComponent = component
       }
-
-      const selectSelf =
-        curComponent === document
-          ? false
-          : Array
-            .from(curComponent.parentNode.querySelectorAll(selector))
-            .every(item => item === curComponent)
-
-      if (single) {
-        const el = selectSelf ? curComponent : curComponent.querySelector(selector)
-        res.push(handleFields(fields, el, selector))
+      if (this._isEl(selector)) {
+        if (single) {
+          res.push(handleFields(fields, selector, null))
+        } else {
+          res.push(selector.map(el => handleFields(fields, el, null)))
+        }
       } else {
-        const els = selectSelf
-          ? [curComponent]
-          : curComponent.querySelectorAll(selector)
-        const elsArr = Array.from(els).map(el => handleFields(fields, el, null))
-        res.push(elsArr)
+        const selectSelf =
+          curComponent === document
+            ? false
+            : Array
+              .from(curComponent.parentNode.querySelectorAll(selector))
+              .every(item => item === curComponent)
+        if (single) {
+          const el = selectSelf ? curComponent : curComponent.querySelector(selector)
+          res.push(handleFields(fields, el, selector))
+        } else {
+          const els = selectSelf
+            ? [curComponent]
+            : curComponent.querySelectorAll(selector)
+          const elsArr = Array.from(els).map(el => handleFields(fields, el, null))
+          res.push(elsArr)
+        }
       }
     })
     res.forEach((item, idx) => {
@@ -162,6 +167,10 @@ class SelectQuery {
     })
     this._queueCb.push(callback)
   }
+  _isEl (selector) {
+    if (Array.isArray(selector)) return this._isEl(selector[0])
+    return selector && selector.nodeType === 1
+  }
 }
 
 export default SelectQuery

package/src/web/api/index.js

@@ -60,3 +60,6 @@ export * from './app'
 
 // createAnimation
 export * from './animation'
+
+// createIntersectionObserver
+export * from './create-intersection-observer'