支持提前向screen注入页面配置&stack的layout计算更新 #1910
Merged
+129
−24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hiyuki
reviewed
Mar 25, 2025
| @@ -586,7 +591,6 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) { | |||
| }) | |||
| usePageStatus(navigation, currentPageId) | |||
| useLayoutEffect(() => { | |||
| const isCustom = pageConfig.navigationStyle === 'custom' | |||
| navigation.setOptions({ | |||
| headerShown: !isCustom, | |||
hiyuki
reviewed
Mar 25, 2025
| @@ -577,6 +579,9 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) { | |||
| if (type === 'page') { | |||
| const { PortalHost, useSafeAreaInsets, GestureHandlerRootView, useHeaderHeight } = global.__navigationHelper | |||
| const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig) | |||
| const isCustom = pageConfig.navigationStyle === 'custom' | |||
| const windowDimensions = ReactNative.Dimensions.get('window') | |||
| const screenDimensions = ReactNative.Dimensions.get('screen') | |||
There was a problem hiding this comment.
放在模块顶部或者放在页面生命周期内，放在这个位置执行次数多且没有意义，会上来重复执行n次
hiyuki
reviewed
Mar 25, 2025
| height: screenDimensions.height - bottomVirtualHeight - headerHeight | ||
| } | ||
| } | ||
| if (__mpx_mode__ === 'android' && bottomVirtualHeight === -1) { |
hiyuki
reviewed
Mar 25, 2025
| setTimeout(() => { | ||
| const headerHeight = useHeaderHeight() | ||
| const onLayout = () => { | ||
| if (bottomVirtualHeight !== -1) { |
There was a problem hiding this comment.
判断-1主要是因为第一次推算出来底部高度，后面路由切换的时候进行固定计算，所以需要有个标识，不想添加一个额外的标识所以加了一个-1
hiyuki
reviewed
Mar 25, 2025
| // 沉浸模式的计算方式 | ||
| bottomVirtualHeight = screenDimensions.height - height - headerHeight | ||
| // 非沉浸模式计算方式, 现在默认是全用沉浸模式，所以先不算这个 | ||
| // bottomVirtualHeight = windowDimensions.height - height - headerHeight |
hiyuki
reviewed
Mar 25, 2025
| @@ -652,7 +675,8 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) { | |||
| flex: 1, | |||
| backgroundColor: pageConfig.backgroundColor || '#ffffff' | |||
| }, | |||
| ref: rootRef | |||
| ref: rootRef, | |||
| onLayout | |||
hiyuki
reviewed
Mar 25, 2025
| configObj[key] = this.jsonObj[key] | ||
| } | ||
| }) | ||
| if (Object.keys(configObj).length) mpx.pageConfigMap[pagePath] = configObj |
hiyuki
reviewed
Mar 25, 2025
packages/webpack-plugin/lib/index.js
Outdated
| if (isRuntime) { | ||
| source.add('// inject pageconfigmap for screen\n' + | ||
| 'var context = (function() { return this })() || Function("return this")();\n') | ||
| source.add(`context.pageConfigMap = ${JSON.stringify(mpx.pageConfigMap)};\n`) |
There was a problem hiding this comment.
改为context.__mpxPageConfigsMap
hiyuki
reviewed
Mar 25, 2025
packages/webpack-plugin/lib/index.js
Outdated
| @@ -656,6 +660,8 @@ class MpxWebpackPlugin { | |||
| __vfs, | |||
| // app信息，便于获取appName | |||
| appInfo: {}, | |||
| // pageConfig信息 | |||
| pageConfigMap: {}, | |||
hiyuki
reviewed
Mar 25, 2025
| if (!jsonContent) { | ||
| return callback() | ||
| } | ||
| try { | ||
| jsonObj = JSON5.parse(jsonContent) | ||
| if (isPage) { | ||
| loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordPageConfigMapDependency(parseRequest(loaderContext.resource)?.resourcePath, jsonObj)) |
hiyuki
approved these changes
Mar 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.