Skip to content
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

add enter key event handler and focus style to open button in navigator #6158

Merged
merged 1 commit into from
Sep 11, 2019
Merged

add enter key event handler and focus style to open button in navigator #6158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions packages/core/src/browser/style/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,14 @@ button.theia-button, .theia-button {
min-width: 65px;
outline: none;
cursor: pointer;
padding-left: 9px;
padding-right: 9px;
padding-top: 4px;
padding-bottom: 4px;
padding: 4px 9px;
margin-left: calc(var(--theia-ui-padding)*2);
border-radius: 1px;
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2), 0px 1px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 1px -2px rgba(0, 0, 0, 0.12);
transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
}

button.theia-button:hover, .theia-button:hover {
button.theia-button:hover, .theia-button:hover, .theia-button:focus {
akosyakov marked this conversation as resolved.
Show resolved Hide resolved
background-color: var(--theia-ui-button-color-hover);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/navigator/src/browser/navigator-contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ export class FileNavigatorContribution extends AbstractViewContribution<FileNavi
isVisible: () => true
});
registry.registerCommand(FileNavigatorCommands.TOGGLE_AUTO_REVEAL, {
isEnabled: widget => this.withWidget(widget, () => this.workspaceService.opened),
isVisible: widget => this.withWidget(widget, () => this.workspaceService.opened),
execute: () => {
const autoReveal = !this.fileNavigatorPreferences['explorer.autoReveal'];
this.preferenceService.set('explorer.autoReveal', autoReveal, PreferenceScope.User);
Expand Down
13 changes: 10 additions & 3 deletions packages/navigator/src/browser/navigator-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { injectable, inject, postConstruct } from 'inversify';
import { Message } from '@phosphor/messaging';
import URI from '@theia/core/lib/common/uri';
import { CommandService, SelectionService } from '@theia/core/lib/common';
import { CommonCommands, CorePreferences, LabelProvider, ViewContainerTitleOptions } from '@theia/core/lib/browser';
import { CommonCommands, CorePreferences, LabelProvider, ViewContainerTitleOptions, Key } from '@theia/core/lib/browser';
import {
ContextMenuRenderer, ExpandableTreeNode,
TreeProps, TreeModel, TreeNode,
Expand Down Expand Up @@ -215,6 +215,11 @@ export class FileNavigatorWidget extends FileTreeWidget {
this.commandService.executeCommand(WorkspaceCommands.OPEN_FOLDER.id);
}

protected readonly keyUpHandler = (e: React.KeyboardEvent) => {
if (Key.ENTER.keyCode === e.keyCode) {
(e.target as HTMLElement).click();
}
}
/**
* Instead of rendering the file resources from the workspace, we render a placeholder
* button when the workspace root is not yet set.
Expand All @@ -223,11 +228,13 @@ export class FileNavigatorWidget extends FileTreeWidget {
let openButton;

if (this.canOpenWorkspaceFileAndFolder) {
openButton = <button className='open-workspace-button' title='Select a folder or a workspace-file to open as your workspace' onClick={this.openWorkspace}>
openButton = <button className='theia-button open-workspace-button' title='Select a folder or a workspace-file to open as your workspace'
onClick={this.openWorkspace} onKeyUp={this.keyUpHandler}>
Open Workspace
</button>;
} else {
openButton = <button className='open-workspace-button' title='Select a folder as your workspace root' onClick={this.openFolder}>
openButton = <button className='theia-button open-workspace-button' title='Select a folder as your workspace root' onClick={this.openFolder}
onKeyUp={this.keyUpHandler}>
Open Folder
</button>;
}
Expand Down
13 changes: 2 additions & 11 deletions packages/navigator/src/browser/style/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,9 @@
}

.p-Widget .open-workspace-button {
border: 1px solid var(--theia-border-color1);
color: var(--theia-ui-font-color1);
font-size: var(--theia-ui-font-size1);
border-radius: 0;
background-color: var(--theia-accent-color3);
outline: none;
cursor: pointer;
padding-left: 12px;
padding-right: 12px;
padding-top: 4px;
padding-bottom: 4px;
padding: 4px 12px;
width: calc(100% - var(--theia-ui-padding)*4);
margin-left: 0;
}

.navigator-tab-icon {
Expand Down