Merge branch 'master' of https://github.com/didi/mpx

didi · Dec 20, 2024 · e283018 · e283018
2 parents 639e3f0 + 475b997
commit e283018
Show file tree

Hide file tree

Showing 13 changed files with 180 additions and 14 deletions.
diff --git a/packages/api-proxy/@types/index.d.ts b/packages/api-proxy/@types/index.d.ts
@@ -110,6 +110,13 @@ export const createVideoContext: WechatMiniprogram.Wx['createVideoContext']
 export const onWindowResize: WechatMiniprogram.Wx['onWindowResize']
 export const offWindowResize: WechatMiniprogram.Wx['offWindowResize']
 export const createAnimation: WechatMiniprogram.Wx['createAnimation']
+export const hideHomeButton: WechatMiniprogram.Wx['hideHomeButton']
+export const getSetting: WechatMiniprogram.Wx['getSetting']
+export const openSetting: WechatMiniprogram.Wx['openSetting']
+export const enableAlertBeforeUnload: WechatMiniprogram.Wx['enableAlertBeforeUnload']
+export const disableAlertBeforeUnload: WechatMiniprogram.Wx['disableAlertBeforeUnload']
+export const getMenuButtonBoundingClientRect: WechatMiniprogram.Wx['getMenuButtonBoundingClientRect']
+export const getImageInfo: WechatMiniprogram.Wx['getImageInfo']
 export const vibrateShort: WechatMiniprogram.Wx['vibrateShort']
 export const vibrateLong: WechatMiniprogram.Wx['vibrateLong']
 export const getExtConfig: WechatMiniprogram.Wx['getExtConfig']

diff --git a/packages/api-proxy/src/platform/api/action-sheet/rnActionSheet.jsx b/packages/api-proxy/src/platform/api/action-sheet/rnActionSheet.jsx
@@ -91,7 +91,7 @@ function showActionSheet (options = {}) {
       remove()
     }
     return (
-      <TouchableHighlight underlayColor="rgba(0,0,0,0.6)" onPress={cancelAction} style={styles.actionActionMask}>
+      <TouchableHighlight underlayColor="rgba(0,0,0,0.6)" activeOpacity={1} onPress={cancelAction} style={styles.actionActionMask}>
         <Animated.View style={[styles.actionSheetContent, animatedStyles]} >
           { alertText ? <View style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{alertText}</Text></View> : null }
           { itemList.map((item, index) => <TouchableHighlight key={index} underlayColor="#ececec" onPress={() => selectAction(index)} style={ [styles.itemStyle, itemList.length -1 === index ? {

diff --git a/packages/api-proxy/src/platform/api/image/index.ali.js b/packages/api-proxy/src/platform/api/image/index.ali.js
@@ -30,7 +30,10 @@ function compressImage (options = {}) {
   return ENV_OBJ.compressImage(opts)
 }
 
+const getImageInfo = ENV_OBJ.getImageInfo
+
 export {
   previewImage,
-  compressImage
+  compressImage,
+  getImageInfo
 }
diff --git a/packages/api-proxy/src/platform/api/image/index.ios.js b/packages/api-proxy/src/platform/api/image/index.ios.js
@@ -0,0 +1,45 @@
+import { envError, defineUnsupportedProps, successHandle, failHandle } from '../../../common/js'
+import { Image } from 'react-native'
+
+const previewImage = envError('previewImage')
+
+const compressImage = envError('compressImage')
+
+const getImageInfo = function (options = {}) {
+  const { src, success, fail, complete } = options
+  if (src === undefined) {
+    const result = {
+      errMsg: 'getImageInfo:fail parameter error: parameter.src should be String instead of Undefined;',
+      errno: 1001
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  if (src === '') {
+    const result = {
+      errMsg: 'getImageInfo:fail image not found'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  Image.getSize(src, (width, height) => {
+    const result = {
+      errMsg: 'getImageInfo:ok',
+      width,
+      height
+    }
+    defineUnsupportedProps(result, ['path', 'orientation', 'type'])
+    successHandle(result, success, complete)
+  }, (err) => {
+    const result = {
+      errMsg: 'getImageInfo:fail download image fail. reason: ' + err
+    }
+    failHandle(result, fail, complete)
+  })
+}
+
+export {
+  previewImage,
+  compressImage,
+  getImageInfo
+}
diff --git a/packages/api-proxy/src/platform/api/image/index.js b/packages/api-proxy/src/platform/api/image/index.js
@@ -4,7 +4,10 @@ const previewImage = ENV_OBJ.previewImage || envError('previewImage')
 
 const compressImage = ENV_OBJ.compressImage || envError('compressImage')
 
+const getImageInfo = ENV_OBJ.getImageInfo || envError('getImageInfo')
+
 export {
   previewImage,
-  compressImage
+  compressImage,
+  getImageInfo
 }
diff --git a/packages/api-proxy/src/platform/api/image/index.web.js b/packages/api-proxy/src/platform/api/image/index.web.js
@@ -1,5 +1,5 @@
 import Preview from './Preview'
-import { isBrowser, throwSSRWarning, envError } from '../../../common/js'
+import { isBrowser, throwSSRWarning, envError, defineUnsupportedProps, successHandle, failHandle } from '../../../common/js'
 
 let preview = null
 
@@ -15,9 +15,53 @@ const previewImage = (options) => {
   if (!preview) preview = new Preview()
   preview.show(options)
 }
+
 const compressImage = envError('compressImage')
 
+const getImageInfo = function (options = {}) {
+  const { src, success, fail, complete } = options
+
+  if (src === undefined) {
+    const result = {
+      errMsg: 'getImageInfo:fail parameter error: parameter.src should be String instead of Undefined;',
+      errno: 1001
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  if (src === '') {
+    const result = {
+      errMsg: 'getImageInfo:fail image not found'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+
+  const img = new Image()
+  img.src = src
+
+  img.onload = function () {
+    const width = img.width
+    const height = img.height
+    const result = {
+      errMsg: 'getImageInfo:ok',
+      width,
+      height
+    }
+    defineUnsupportedProps(result, ['path', 'orientation', 'type'])
+    successHandle(result, success, complete)
+  }
+
+  img.onerror = function () {
+    const result = {
+      errMsg: 'getImageInfo:fail download image fail. '
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
 export {
   previewImage,
-  compressImage
+  compressImage,
+  getImageInfo
 }
diff --git a/packages/api-proxy/src/platform/api/set-navigation-bar/index.ali.js b/packages/api-proxy/src/platform/api/set-navigation-bar/index.ali.js
@@ -17,7 +17,12 @@ function setNavigationBarColor (options = {}) {
   return ENV_OBJ.setNavigationBar(options)
 }
 
+function hideHomeButton (options = {}) {
+  return ENV_OBJ.hideBackHome(options)
+}
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }
diff --git a/packages/api-proxy/src/platform/api/set-navigation-bar/index.ios.js b/packages/api-proxy/src/platform/api/set-navigation-bar/index.ios.js
@@ -1,4 +1,4 @@
-import { successHandle, failHandle, getFocusedNavigation } from '../../../common/js'
+import { successHandle, failHandle, getFocusedNavigation, envError } from '../../../common/js'
 import { nextTick } from '../next-tick'
 function setNavigationBarTitle (options = {}) {
   const { title = '', success, fail, complete } = options
@@ -31,7 +31,10 @@ function setNavigationBarColor (options = {}) {
   }
 }
 
+const hideHomeButton = envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }
diff --git a/packages/api-proxy/src/platform/api/set-navigation-bar/index.js b/packages/api-proxy/src/platform/api/set-navigation-bar/index.js
@@ -4,7 +4,10 @@ const setNavigationBarTitle = ENV_OBJ.setNavigationBarTitle || envError('setNavi
 
 const setNavigationBarColor = ENV_OBJ.setNavigationBarColor || envError('setNavigationBarColor')
 
+const hideHomeButton = ENV_OBJ.hideHomeButton || envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }
diff --git a/packages/api-proxy/src/platform/api/set-navigation-bar/index.web.js b/packages/api-proxy/src/platform/api/set-navigation-bar/index.web.js
@@ -1,4 +1,4 @@
-import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
+import { isBrowser, envError, throwSSRWarning, successHandle } from '../../../common/js'
 
 function setNavigationBarTitle (options = {}) {
   if (!isBrowser) {
@@ -26,7 +26,10 @@ function setNavigationBarColor (options = {}) {
   successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
 }
 
+const hideHomeButton = envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }
diff --git a/packages/api-proxy/src/platform/api/setting/index.js b/packages/api-proxy/src/platform/api/setting/index.js
@@ -0,0 +1,19 @@
+import { ENV_OBJ, envError } from '../../../common/js'
+
+const getSetting = ENV_OBJ.getSetting || envError('getSetting')
+
+const openSetting = ENV_OBJ.openSetting || envError('openSetting')
+
+const enableAlertBeforeUnload = ENV_OBJ.enableAlertBeforeUnload || envError('enableAlertBeforeUnload')
+
+const disableAlertBeforeUnload = ENV_OBJ.disableAlertBeforeUnload || envError('disableAlertBeforeUnload')
+
+const getMenuButtonBoundingClientRect = ENV_OBJ.getMenuButtonBoundingClientRect || envError('getMenuButtonBoundingClientRect')
+
+export {
+  getSetting,
+  openSetting,
+  enableAlertBeforeUnload,
+  disableAlertBeforeUnload,
+  getMenuButtonBoundingClientRect
+}
diff --git a/packages/api-proxy/src/platform/index.js b/packages/api-proxy/src/platform/index.js
@@ -43,7 +43,7 @@ export * from './api/file'
 // getUserInfo
 export * from './api/get-user-info'
 
-// previewImage, compressImage
+// previewImage, compressImage, getImageInfo
 export * from './api/image'
 
 // login
@@ -116,3 +116,6 @@ export * from './api/vibrate'
 
 // onKeyboardHeightChange, offKeyboardHeightChange, hideKeyboard
 export * from './api/keyboard'
+
+// getSetting, openSetting, enableAlertBeforeUnload, disableAlertBeforeUnload, getMenuButtonBoundingClientRect
+export * from './api/setting'
diff --git a/packages/webpack-plugin/lib/style-compiler/plugins/scope-id.js b/packages/webpack-plugin/lib/style-compiler/plugins/scope-id.js
@@ -1,6 +1,8 @@
 const selectorParser = require('postcss-selector-parser')
 // scope-id
-
+function isSpaceCombinator (node) {
+  return node.type === 'combinator' && /^\s+$/.test(node.value)
+}
 module.exports = ({ id }) => {
   return {
     postcssPlugin: 'scope-id',
@@ -31,10 +33,36 @@ module.exports = ({ id }) => {
                 n.spaces.before = n.spaces.after = ''
                 return false
               }
+              if (n.type === 'pseudo' && n.value === ':deep') {
+                if (n.nodes.length) {
+                  let last = n
+                  n.nodes[0].each((ss) => {
+                    selector.insertAfter(last, ss)
+                    last = ss
+                  })
+                  const prev = n.prev()
+                  if (!prev || !isSpaceCombinator(prev)) {
+                    selector.insertAfter(
+                      n,
+                      selectorParser.combinator({
+                        value: ' '
+                      })
+                    )
+                  }
+                  n.remove()
+                } else {
+                  const prev = n.prev()
+                  if (prev && isSpaceCombinator(prev)) {
+                    prev.remove()
+                  }
+                  n.remove()
+                }
+                return false
+              }
               // /deep/ alias for >>>, since >>> doesn't work in SASS
               if (n.type === 'tag' && n.value === '/deep/') {
                 const prev = n.prev()
-                if (prev && prev.type === 'combinator' && prev.value === ' ') {
+                if (prev && isSpaceCombinator(prev)) {
                   prev.remove()
                 }
                 n.remove()