From 17a966651cc1ee92ece83b71f4671133f2a830ce Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Wed, 20 Mar 2019 09:39:14 -0700 Subject: [PATCH] Added suspense to TODO list and added interactions to 'Commit Info' panel --- package.json | 7 +-- shells/dev/app/ToDoList/List.js | 49 +++++++++++-------- shells/dev/app/ToDoList/ListItem.js | 6 ++- src/devtools/cache.js | 21 ++++++-- .../views/Profiler/SidebarCommitInfo.css | 12 +++-- .../views/Profiler/SidebarCommitInfo.js | 33 +++++++++---- .../views/Profiler/SnapshotSelector.js | 2 + yarn.lock | 35 +++++++------ 8 files changed, 109 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 938a3b6aca..94358e3197 100644 --- a/package.json +++ b/package.json @@ -93,13 +93,14 @@ "opener": "^1.5.1", "prettier": "^1.16.1", "prop-types": "^15.6.2", - "react": "^16.8", + "react": "^16.8.4", "react-color": "^2.11.7", - "react-dom": "^16.8", - "react-is": "^16.8", + "react-dom": "^16.8.4", + "react-is": "^16.8.4", "react-portal": "^3.1.0", "react-virtualized-auto-sizer": "^1.0.2", "react-window": "^1.5.1", + "scheduler": "^0.13", "semver": "^5.5.1", "style-loader": "^0.23.1", "web-ext": "^1.10.1", diff --git a/shells/dev/app/ToDoList/List.js b/shells/dev/app/ToDoList/List.js index b8a2a4636a..f164d6975d 100644 --- a/shells/dev/app/ToDoList/List.js +++ b/shells/dev/app/ToDoList/List.js @@ -1,6 +1,7 @@ // @flow import React, { Fragment, useCallback, useState } from 'react'; +import { unstable_trace as trace } from 'scheduler/tracing'; import ListItem from './ListItem'; import styles from './List.css'; @@ -23,16 +24,18 @@ export default function List(props: Props) { const handleClick = useCallback(() => { if (newItemText !== '') { - setItems([ - ...items, - { - id: uid, - isComplete: false, - text: newItemText, - }, - ]); - setUID(uid + 1); - setNewItemText(''); + trace(`Add "${newItemText}"`, performance.now(), () => { + setItems([ + ...items, + { + id: uid, + isComplete: false, + text: newItemText, + }, + ]); + setUID(uid + 1); + setNewItemText(''); + }); } }, [newItemText, items, uid]); @@ -54,24 +57,28 @@ export default function List(props: Props) { const removeItem = useCallback( itemToRemove => { - setItems(items.filter(item => item !== itemToRemove)); + trace(`Remove "${itemToRemove.text}"`, performance.now(), () => { + setItems(items.filter(item => item !== itemToRemove)); + }); }, [items] ); const toggleItem = useCallback( itemToToggle => { - const index = items.indexOf(itemToToggle); + trace(`Toggle "${itemToToggle.text}"`, performance.now(), () => { + const index = items.indexOf(itemToToggle); - setItems( - items - .slice(0, index) - .concat({ - ...itemToToggle, - isComplete: !itemToToggle.isComplete, - }) - .concat(items.slice(index + 1)) - ); + setItems( + items + .slice(0, index) + .concat({ + ...itemToToggle, + isComplete: !itemToToggle.isComplete, + }) + .concat(items.slice(index + 1)) + ); + }); }, [items] ); diff --git a/shells/dev/app/ToDoList/ListItem.js b/shells/dev/app/ToDoList/ListItem.js index e3e6794147..2305e28ce6 100644 --- a/shells/dev/app/ToDoList/ListItem.js +++ b/shells/dev/app/ToDoList/ListItem.js @@ -1,6 +1,6 @@ // @flow -import React, { useCallback } from 'react'; +import React, { memo, useCallback } from 'react'; import styles from './ListItem.css'; import type { Item } from './List'; @@ -11,7 +11,7 @@ type Props = {| toggleItem: (item: Item) => void, |}; -export default function ListItem({ item, removeItem, toggleItem }: Props) { +function ListItem({ item, removeItem, toggleItem }: Props) { const handleDelete = useCallback(() => { removeItem(item); }, [item, removeItem]); @@ -37,3 +37,5 @@ export default function ListItem({ item, removeItem, toggleItem }: Props) { ); } + +export default memo(ListItem); diff --git a/src/devtools/cache.js b/src/devtools/cache.js index 92df88a37a..58577adf32 100644 --- a/src/devtools/cache.js +++ b/src/devtools/cache.js @@ -1,6 +1,6 @@ // @flow -import { createContext, useContext } from 'react'; +import React, { createContext } from 'react'; // Cache implementation was forked from the React repo: // https://github.com/facebook/react/blob/master/packages/react-cache/src/ReactCache.js @@ -46,6 +46,21 @@ const Pending = 0; const Resolved = 1; const Rejected = 2; +const ReactCurrentDispatcher = (React: any) + .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher; + +function readContext(Context, observedBits) { + const dispatcher = ReactCurrentDispatcher.current; + if (dispatcher === null) { + throw new Error( + 'react-cache: read and preload may only be called from within a ' + + "component's render. They are not supported in event handlers or " + + 'lifecycle methods.' + ); + } + return dispatcher.readContext(Context, observedBits); +} + function identityHashFn(input) { return input; } @@ -106,7 +121,7 @@ export function createResource( read(input: I): V { // Prevent access outside of render. // eslint-disable-next-line react-hooks/rules-of-hooks - useContext(CacheContext); + readContext(CacheContext); const key = hashInput(input); const result: Result = accessResult(resource, fetch, input, key); @@ -132,7 +147,7 @@ export function createResource( preload(input: I): void { // Prevent access outside of render. // eslint-disable-next-line react-hooks/rules-of-hooks - useContext(CacheContext); + readContext(CacheContext); const key = hashInput(input); accessResult(resource, fetch, input, key); diff --git a/src/devtools/views/Profiler/SidebarCommitInfo.css b/src/devtools/views/Profiler/SidebarCommitInfo.css index d36c4aec11..c62374ab90 100644 --- a/src/devtools/views/Profiler/SidebarCommitInfo.css +++ b/src/devtools/views/Profiler/SidebarCommitInfo.css @@ -12,14 +12,20 @@ padding: 0.5rem; } -.List { +.List, +.InteractionList { list-style: none; margin: 0; padding: 0; } -.ListItem { - margin: 0 0 0.25rem; +.InteractionList { + padding: 0.5rem; +} + +.ListItem, +.InteractionListItem { + margin: 0 0 0.5rem; } .Label { diff --git a/src/devtools/views/Profiler/SidebarCommitInfo.js b/src/devtools/views/Profiler/SidebarCommitInfo.js index e2c8c987c1..ce6616b615 100644 --- a/src/devtools/views/Profiler/SidebarCommitInfo.js +++ b/src/devtools/views/Profiler/SidebarCommitInfo.js @@ -15,6 +15,11 @@ export default function SidebarCommitInfo(_: Props) { ); const { profilingCache } = useContext(StoreContext); + + if (selectedCommitIndex === null) { + return null; // TODO (profiling) Use a better UI + } + const { commitDurations, commitTimes } = profilingCache.ProfilingSummary.read( { rendererID: ((rendererID: any): number), @@ -22,9 +27,11 @@ export default function SidebarCommitInfo(_: Props) { } ); - if (selectedCommitIndex === null) { - return 'TODO'; - } + const { interactions } = profilingCache.CommitDetails.read({ + commitIndex: ((selectedCommitIndex: any): number), + rendererID: ((rendererID: any): number), + rootID: ((rootID: any): number), + }); return ( @@ -34,21 +41,29 @@ export default function SidebarCommitInfo(_: Props) {
  • :{' '} - {formatTime(commitTimes[selectedCommitIndex])}s + {formatTime(commitTimes[((selectedCommitIndex: any): number)])}s
  • :{' '} - {formatDuration(commitDurations[selectedCommitIndex])}ms + {formatDuration( + commitDurations[((selectedCommitIndex: any): number)] + )} + ms
  • : -
      -
    • -
      Coming soon
      -
    • +
        + {interactions.length === 0 ? ( +
      • None
      • + ) : null} + {interactions.map((interaction, index) => ( +
      • + {interaction.name} +
      • + ))}
    diff --git a/src/devtools/views/Profiler/SnapshotSelector.js b/src/devtools/views/Profiler/SnapshotSelector.js index ff4abdf4ae..81f7260888 100644 --- a/src/devtools/views/Profiler/SnapshotSelector.js +++ b/src/devtools/views/Profiler/SnapshotSelector.js @@ -12,6 +12,8 @@ import styles from './SnapshotSelector.css'; export type Props = {||}; +// TODO (profiling) Left/right arrow navigation. + export default function SnapshotSelector(_: Props) { const { isCommitFilterEnabled, diff --git a/yarn.lock b/yarn.lock index 2f71613ed1..3779ffc9ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8630,21 +8630,26 @@ react-color@^2.11.7: reactcss "^1.2.0" tinycolor2 "^1.4.1" -react-dom@^16.8: - version "16.8.3" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32" - integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA== +react-dom@^16.8.4: + version "16.8.4" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48" + integrity sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.3" + scheduler "^0.13.4" -react-is@^16.8, react-is@^16.8.1: +react-is@^16.8.1: version "16.8.3" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.3.tgz#4ad8b029c2a718fc0cfc746c8d4e1b7221e5387d" integrity sha512-Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA== +react-is@^16.8.4: + version "16.8.4" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2" + integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA== + react-portal@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-3.2.0.tgz#4224e19b2b05d5cbe730a7ba0e34ec7585de0043" @@ -8665,15 +8670,15 @@ react-window@^1.5.1: "@babel/runtime" "^7.0.0" memoize-one "^3.1.1" -react@^16.8: - version "16.8.3" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9" - integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA== +react@^16.8.4: + version "16.8.4" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768" + integrity sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.3" + scheduler "^0.13.4" reactcss@^1.2.0: version "1.2.3" @@ -9279,10 +9284,10 @@ sax@>=0.6.0, sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.13.3: - version "0.13.3" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896" - integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ== +scheduler@^0.13, scheduler@^0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298" + integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1"