[feat]rn-relatons #1679
Open
[feat]rn-relatons #1679
+145
−10
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
Jan 9, 2025
| const root = rawOptions.options?.disableMemo ? proxy.effect.run() : useMemo(() => proxy.effect.run(), [proxy.stateVersion]) | ||
| const runRenderEffect = () => { | ||
| if (needRelationContext(rawOptions)) { | ||
| return createElement(RelationsContext.Provider, { |
hiyuki
reviewed
Jan 9, 2025
| @@ -117,6 +118,7 @@ global.currentInject.firstPage = ${JSON.stringify(firstPage)}\n` | |||
| content += `global.currentInject.getComponents = function () { | |||
| return ${shallowStringify(componentsMap)} | |||
| }\n` | |||
| content += `global.currentInject.componentPath = '/' + ${JSON.stringify(outputPath)}\n` | |||
hiyuki
reviewed
Jan 9, 2025
| }) | ||
| } | ||
|
|
||
| const RelationsContext = createContext(null) |
There was a problem hiding this comment.
context可以以outputPath为key存一系列
hiyuki
reviewed
Jan 9, 2025
| if (item.type?.__mpxBuiltIn) { // 如果是基础节点，继续向下查找 | ||
| return isChildNode(item, instance) | ||
| } else { | ||
| return item.type === instance.__getReactFunctionComponent() |
There was a problem hiding this comment.
光凭这个ctor也没办法判断当前的instance一定是child吧
CommanderXL
force-pushed
the
feat-rn-relations
branch
from
4ded781 to
4418593
Compare
hiyuki
reviewed
Jan 17, 2025
| @@ -0,0 +1,2 @@ | |||
| import relationsMixin from './relationsMixin.ios' | |||
There was a problem hiding this comment.
现在不需要加这个额外的.android了，文件条件编译找不到.android会自动去找.ios
hiyuki
reviewed
Jan 17, 2025
| @@ -233,6 +233,18 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps | |||
| }, | |||
| enumerable: false | |||
| }, | |||
| __componentPath: { | |||
There was a problem hiding this comment.
这里也限定组件再挂载吧，否则会取到其他组件的值很奇怪
hiyuki
reviewed
Jan 17, 2025
| @@ -374,6 +386,43 @@ function usePageStatus (navigation, pageId) { | |||
| }, [navigation]) | |||
| } | |||
|
|
|||
| const RelationsContext = createContext(null) | |||
|
|
|||
| const needRelationContext = (options) => { | |||
There was a problem hiding this comment.
relations的分析可以createComponent里做完直接存在闭包里，没有必要在render里做
hiyuki
reviewed
Jan 17, 2025
| @@ -384,11 +433,12 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) { | |||
| const propsRef = useRef(null) | |||
| const intersectionCtx = useContext(IntersectionObserverContext) | |||
| const pageId = useContext(RouteContext) | |||
| const relation = useContext(RelationsContext) | |||
There was a problem hiding this comment.
解析放到mount中进行，render中简单透传relation即可
hiyuki
reviewed
Jan 17, 2025
| if (relationMap[path]) { | ||
| const target = relationMap[path] | ||
| const targetRelation = target.__mpxProxy.options.relations?.[this.__componentPath] | ||
| if (targetRelation && targetRelation.type === relationTypeMap[type] && target.__componentPath) { |
There was a problem hiding this comment.
target.__componentPath 这个判断为啥需要
hiyuki
reviewed
Jan 17, 2025
| getRelationNodes (path) { | ||
| return this.__mpxRelationNodesMap[path] || null | ||
| }, | ||
| __mpxCollectRelations () { |
There was a problem hiding this comment.
感觉这个循环还有this.__mpxRelations有点多余，如果下面的this.__relation是按需生成的这里可以省略很多逻辑
hiyuki
reviewed
Jan 20, 2025
| if (!relation[componentPath]) { | ||
| relation[componentPath] = instance | ||
| } | ||
| return relation |
hiyuki
reviewed
Jan 20, 2025
| if (rawOptions.methods) rawOptions.methods = wrapMethodsWithErrorHandling(rawOptions.methods) | ||
| const defaultOptions = memo(forwardRef((props, ref) => { | ||
| const instanceRef = useRef(null) | ||
| const propsRef = useRef(null) | ||
| const intersectionCtx = useContext(IntersectionObserverContext) | ||
| const pageId = useContext(RouteContext) | ||
| const relation = useContext(RelationsContext) |
There was a problem hiding this comment.
if(hasDescendantRelation || hasAncestorRelation) {
relation = useContext(RelationsContext)
}
hiyuki
reviewed
Jan 20, 2025
| const collectRelations = (ancestorRelations, relationMap, componentPath = '') => { | ||
| const relations = {} | ||
| const relationNodesMap = {} | ||
| Object.keys(ancestorRelations).forEach(path => { |
There was a problem hiding this comment.
这个遍历还是放在mounted时执行吧，可以和exec('linked')用一个循环
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.