Fix actionsheet 0106 #1803
Fix actionsheet 0106 #1803
Conversation
packages/api-proxy/@types/index.d.ts
Outdated
There was a problem hiding this comment.
- 切换Portal引用
- 补充list超过6条返回错误逻辑
- 修改bind事件方式，解决安卓点不动问题
There was a problem hiding this comment.
- 修改Portal引用
- 修正toast展示位置
There was a problem hiding this comment.
修改引用为内部的Provider
There was a problem hiding this comment.
- 修改portal引用
- 补充webview加载失败是兜底展示
- 之前合并title丢失代码fix
- 解决h5直接back回RN页面，没有走自己的回退逻辑(navigateBack这个除外)
packages/webview-bridge/src/index.js
Outdated
There was a problem hiding this comment.
- RN的调用和web分离
- 删掉了getLoadError， 微信小程序文档中没有提供给web该方法
| } | ||
|
|
||
| useEffect(() => { | ||
| const navigation = getFocusedNavigation() |
There was a problem hiding this comment.
const focusState = useRef(true)
navigation.addListener('focus', ()=>{focusState.current = true})
navigation.addListener('blur', ()=>{focusState.current = false})
_mount(){
if(!focusState.current) return
}
| */ | ||
| export const portal = new PortalGuard() | ||
|
|
||
| const PortalHost = ({ children } :PortalHostProps): JSX.Element => { |
There was a problem hiding this comment.
const pageId = props.pageId
const isMounted = useRef(false)
const queue=useRef([])
useMemo(()=>{
addEventListener(addType, ({id})=>{
if(id!==pageId) return
if(!isMounted){
queue.push({type:addType})
} else {
manager.add(...)
}
})
addEventListener(removeType, ()=>{
if(!isMounted){
queue.push({type:removeType})
} else {
manager.add(...)
}
})
}, [])
useEffect(()=>{
if(queue.length){
flushQueue(queue)
}
return ()=>{
removeListener(addType)
removeListener(removeType)
}
}, [])
| TopViewEventEmitter.emit(updateType, key, e) | ||
| } | ||
| } | ||
| /** |
There was a problem hiding this comment.
// apiProxy中toast之类需要加的逻辑
function show(){
const currentInstance=getCurrentInstance()
const navigation = getFocusedNavigation()
const id = currentInstance?currentInstance.getPageId():navigation?navigation.pageId:null
if(id === null) {
error('no id')
return
}
portalHost.add({id})
}
| } | ||
| /** | ||
| * portal | ||
| */ |
There was a problem hiding this comment.
portalHost 的props中传递pageId
| manager.current.unmount(operation.key) | ||
| } | ||
| } | ||
| const focusSubscription = navigation.addListener('focus', () => { |
| const navigation = useNavigation() | ||
| const pageId = navigation?.pageId | ||
| return ( | ||
| <PortalContext.Consumer> |
| } | ||
| } | ||
|
|
||
| const mount = (children: ReactNode, _key?: number) => { |
| const _mount = (children: ReactNode, _key?: number, id?: number) => { | ||
| if (id !== pageId) return | ||
| const key = _key || _nextKey.current++ | ||
| if (!isMounted.current) { |
There was a problem hiding this comment.
不需要isMounted了，直接使用manager.current就可以了
No description provided.