Skip to content

Commit b5855bf

Browse files
committed
fix: devtools broken in some situation
1 parent 9103050 commit b5855bf

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

packages/nerv-devtools/src/devtools.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// tslint:disable-next-line:no-var-requires
2-
import { options } from 'nervjs'
2+
import { options, findDOMNode } from 'nervjs'
33
import {
44
isComposite,
55
isWidget,
@@ -64,7 +64,7 @@ function createReactDOMComponent (vnode) {
6464
// This is used to send the appropriate notifications when DOM components
6565
// are added or updated between composite component updates.
6666
_inDevTools: false,
67-
node: !isText ? vnode.dom : null
67+
node: !isText ? findDOMNode(vnode) : null
6868
}
6969
}
7070

@@ -100,7 +100,7 @@ function createReactCompositeComponent (vnode) {
100100
const isCompositeComponent = isComposite(vnode)
101101
const _currentElement = createReactElement(vnode)
102102
const component = isCompositeComponent ? vnode.component : vnode
103-
const node = vnode.dom
103+
const node = findDOMNode(vnode)
104104

105105
const instance: any = {
106106
// --- ReactDOMComponent properties
@@ -171,7 +171,7 @@ function getKeyForVNode (vnode) {
171171
} else if (isStateless(vnode)) {
172172
return vnode.type
173173
} else if (vnode && vnode.vtype) {
174-
return vnode.dom
174+
return findDOMNode(vnode)
175175
}
176176
}
177177

@@ -206,7 +206,7 @@ function findVNodeFromDom (vnode, dom) {
206206
}
207207
} else {
208208
if (
209-
vnode.dom === dom
209+
findDOMNode(vnode) === dom
210210
) {
211211
return vnode
212212
}

packages/nerv-utils/src/next-tick.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { isFunction } from './is'
44
const isMacSafari = navigator && navigator.platform &&
55
navigator.platform.includes('Mac') && /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
66

7-
const canUsePromise = 'Promise' in global && isMacSafari
7+
const canUsePromise = 'Promise' in global && !isMacSafari
88

99
let resolved
1010
if (canUsePromise) {

0 commit comments

Comments
 (0)