- Open the developer tools, and the React tab will appear to the right. + Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
diff --git a/packages/react-devtools-extensions/popups/development.html b/packages/react-devtools-extensions/popups/development.html index 9c2089cc2f37c..3d092a5eb69f8 100644 --- a/packages/react-devtools-extensions/popups/development.html +++ b/packages/react-devtools-extensions/popups/development.html @@ -24,5 +24,5 @@- Open the developer tools, and the React tab will appear to the right. + Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
diff --git a/packages/react-devtools-extensions/popups/outdated.html b/packages/react-devtools-extensions/popups/outdated.html index a6ec12bcafc1d..8f3f3f9508766 100644 --- a/packages/react-devtools-extensions/popups/outdated.html +++ b/packages/react-devtools-extensions/popups/outdated.html @@ -25,5 +25,5 @@- Open the developer tools, and the React tab will appear to the right. + Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
diff --git a/packages/react-devtools-extensions/popups/production.html b/packages/react-devtools-extensions/popups/production.html index 1b65eb5b219b6..7b92841c6c75c 100644 --- a/packages/react-devtools-extensions/popups/production.html +++ b/packages/react-devtools-extensions/popups/production.html @@ -17,5 +17,5 @@
This page is using the production build of React. ✅
- Open the developer tools, and the React tab will appear to the right.
+ Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
- Open the developer tools, and the React tab will appear to the right. + Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
diff --git a/packages/react-devtools-extensions/src/main.js b/packages/react-devtools-extensions/src/main.js index 1e8e29df0a113..7d786e0321917 100644 --- a/packages/react-devtools-extensions/src/main.js +++ b/packages/react-devtools-extensions/src/main.js @@ -24,6 +24,8 @@ import DevTools from 'react-devtools-shared/src/devtools/views/DevTools'; const LOCAL_STORAGE_SUPPORTS_PROFILING_KEY = 'React::DevTools::supportsProfiling'; +const isChrome = getBrowserName() === 'Chrome'; + let panelCreated = false; // The renderer interface can't read saved component filters directly, @@ -126,7 +128,7 @@ function createPanelIfReactLoaded() { store = new Store(bridge, { isProfiling, - supportsReloadAndProfile: getBrowserName() === 'Chrome', + supportsReloadAndProfile: isChrome, supportsProfiling, }); store.profilerStore.profilingData = profilingData; @@ -232,7 +234,7 @@ function createPanelIfReactLoaded() { let needsToSyncElementSelection = false; chrome.devtools.panels.create( - '⚛ Components', + isChrome ? '⚛ Components' : 'Components', '', 'panel.html', extensionPanel => { @@ -262,7 +264,7 @@ function createPanelIfReactLoaded() { ); chrome.devtools.panels.create( - '⚛ Profiler', + isChrome ? '⚛ Profiler' : 'Profiler', '', 'panel.html', extensionPanel => { diff --git a/packages/react-devtools-inline/package.json b/packages/react-devtools-inline/package.json index 26f30ccf91bfc..d9554a09d1425 100644 --- a/packages/react-devtools-inline/package.json +++ b/packages/react-devtools-inline/package.json @@ -1,6 +1,6 @@ { "name": "react-devtools-inline", - "version": "4.0.5", + "version": "4.0.6", "description": "Embed react-devtools within a website", "license": "MIT", "main": "./dist/backend.js", @@ -20,7 +20,9 @@ "prepublish": "yarn run build", "start": "cross-env NODE_ENV=development webpack --config webpack.config.js --watch" }, - "dependencies": {}, + "dependencies": { + "es6-symbol": "^3" + }, "devDependencies": { "@babel/core": "^7.1.6", "@babel/plugin-proposal-class-properties": "^7.1.0", diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/renderer.js index f150ae71beaa9..9eafedaa9548b 100644 --- a/packages/react-devtools-shared/src/backend/renderer.js +++ b/packages/react-devtools-shared/src/backend/renderer.js @@ -2074,7 +2074,10 @@ export function attach( let fiber = findCurrentFiberUsingSlowPathById(id); if (fiber !== null) { instance = fiber.stateNode; - style = fiber.memoizedProps.style; + + if (fiber.memoizedProps !== null) { + style = fiber.memoizedProps.style; + } } return {instance, style}; diff --git a/packages/react-devtools-shared/src/hydration.js b/packages/react-devtools-shared/src/hydration.js index 0823ec6e362ac..27a30a14f976b 100644 --- a/packages/react-devtools-shared/src/hydration.js +++ b/packages/react-devtools-shared/src/hydration.js @@ -1,5 +1,6 @@ // @flow +import Symbol from 'es6-symbol'; import { isElement, typeOf, diff --git a/packages/react-devtools-shared/src/utils.js b/packages/react-devtools-shared/src/utils.js index 0a19fb83e59d8..6cf811943a010 100644 --- a/packages/react-devtools-shared/src/utils.js +++ b/packages/react-devtools-shared/src/utils.js @@ -1,5 +1,6 @@ // @flow +import Symbol from 'es6-symbol'; import LRU from 'lru-cache'; import { TREE_OPERATION_ADD, diff --git a/packages/react-devtools/package.json b/packages/react-devtools/package.json index 6386e3d57b705..f4b4838883972 100644 --- a/packages/react-devtools/package.json +++ b/packages/react-devtools/package.json @@ -1,6 +1,6 @@ { "name": "react-devtools", - "version": "4.0.5", + "version": "4.0.6", "description": "Use react-devtools outside of the browser", "license": "MIT", "repository": { @@ -27,7 +27,7 @@ "electron": "^5.0.0", "ip": "^1.1.4", "minimist": "^1.2.0", - "react-devtools-core": "4.0.5", + "react-devtools-core": "4.0.6", "update-notifier": "^2.1.0" } } diff --git a/yarn.lock b/yarn.lock index 12b1a37f0b471..eda5b7fa45402 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4551,7 +4551,7 @@ es6-set@~0.1.5: es6-symbol "3.1.1" event-emitter "~0.3.5" -es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: +es6-symbol@3.1.1, es6-symbol@^3, es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=