Skip to content

Fix focus and key up + down on first toggle #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 6, 2018
Merged

Fix focus and key up + down on first toggle #613

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d38b07c
Fix focus and key up + down on first toggle
huv1k Mar 28, 2018
cfba310
Fix condition
huv1k Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 35 additions & 38 deletions packages/graphql-playground-react/src/components/Playground/DocExplorer/GraphDocs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,43 +224,39 @@ class GraphDocs extends React.Component<
onMouseDown={this.handleDocsResizeStart}
/>
<div className="doc-explorer-gradient" />
{docsOpen && (
<div
className="doc-explorer"
onKeyDown={this.handleKeyDown}
onMouseMove={this.handleMouseMove}
tabIndex={0}
ref={this.setDocExplorerRef}
>
<div className="doc-explorer-container">
{emptySchema && <ColumnDoc>{emptySchema}</ColumnDoc>}
{!emptySchema &&
schema && (
<RootColumn
schema={schema}
width={this.state.widthMap.root || columnWidth - 1}
searchValue={this.state.searchValue}
handleSearch={this.handleSearch}
sessionId={this.props.sessionId}
/>
)}
{!emptySchema &&
navStack.map((stack, index) => (
<ColumnDoc
key={index}
width={this.state.widthMap[stack.field.path] || columnWidth}
>
<FieldDoc
schema={schema}
field={stack.field}
level={index + 1}
sessionId={this.props.sessionId}
/>
</ColumnDoc>
))}
</div>
<div
className="doc-explorer"
onKeyDown={this.handleKeyDown}
onMouseMove={this.handleMouseMove}
tabIndex={0}
ref={this.setDocExplorerRef}
>
<div className="doc-explorer-container">
{emptySchema && <ColumnDoc>{emptySchema}</ColumnDoc>}
{schema && (
<RootColumn
schema={schema}
width={this.state.widthMap.root || columnWidth - 1}
searchValue={this.state.searchValue}
handleSearch={this.handleSearch}
sessionId={this.props.sessionId}
/>
)}
{navStack.map((stack, index) => (
Copy link
Member

@timsuchanek timsuchanek Mar 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add !emptySchema again, otherwise the column will incorrectly be rendered after deserialization, when there is not yet a schema

<ColumnDoc
key={index}
width={this.state.widthMap[stack.field.path] || columnWidth}
>
<FieldDoc
schema={schema}
field={stack.field}
level={index + 1}
sessionId={this.props.sessionId}
/>
</ColumnDoc>
))}
</div>
)}
</div>
</div>
)
}
Expand Down Expand Up @@ -362,16 +358,17 @@ class GraphDocs extends React.Component<
}
} else {
const obj = serializeRoot(this.props.schema)
const y = lastNavStack ? lastNavStack.y : 0
const element = getElementRoot(
obj,
keyPressed === 'up' ? lastNavStack.y - 1 : lastNavStack.y + 1,
keyPressed === 'up' ? y - 1 : y + 1,
)
if (element) {
this.props.addStack(
this.props.sessionId,
element,
0,
keyPressed === 'up' ? lastNavStack.y - 1 : lastNavStack.y + 1,
keyPressed === 'up' ? y - 1 : y + 1,
)
}
}
Expand Down