Merge branch 'master' into fix-scoped-deep

didi · Dec 19, 2024 · bba979f · bba979f
2 parents 40b44c0 + 3dfe8ac
commit bba979f
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 11 deletions.
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
@@ -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/core/src/platform/patch/getDefaultOptions.ios.js b/packages/core/src/platform/patch/getDefaultOptions.ios.js
@@ -560,10 +560,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 backgroundColor: pageConfig.backgroundColor || '#ffffff'
               },
               ref: rootRef,
-              onLayout,
-              onTouchStart: () => {
-                ReactNative.Keyboard.isVisible() && ReactNative.Keyboard.dismiss()
-              }
+              onLayout
             },
             createElement(RouteContext.Provider,
               {

diff --git a/packages/webpack-plugin/lib/runtime/components/react/mpx-input.tsx b/packages/webpack-plugin/lib/runtime/components/react/mpx-input.tsx
@@ -187,7 +187,7 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
     { padding: 0, backgroundColor: '#fff' },
     style,
     multiline && autoHeight
-      ? { height: Math.max((style as any)?.minHeight || 35, contentHeight) }
+      ? { minHeight: Math.max((style as any)?.minHeight || 35, contentHeight) }
       : {}
   )