Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0db33932
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0db33932
编写于
6月 29, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wip: tree keyboard navigation
上级
d1e4efdc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
73 addition
and
5 deletion
+73
-5
src/vs/base/browser/ui/tree/tree.ts
src/vs/base/browser/ui/tree/tree.ts
+67
-1
src/vs/base/browser/ui/tree/treeModel.ts
src/vs/base/browser/ui/tree/treeModel.ts
+6
-4
未找到文件。
src/vs/base/browser/ui/tree/tree.ts
浏览文件 @
0db33932
...
...
@@ -10,7 +10,10 @@ import { TreeModel, ITreeNode, ITreeElement } from 'vs/base/browser/ui/tree/tree
import
{
IIterator
,
empty
}
from
'
vs/base/common/iterator
'
;
import
{
IDelegate
,
IRenderer
,
IListMouseEvent
}
from
'
vs/base/browser/ui/list/list
'
;
import
{
append
,
$
}
from
'
vs/base/browser/dom
'
;
import
{
Event
,
Relay
}
from
'
vs/base/common/event
'
;
import
{
Event
,
Relay
,
chain
}
from
'
vs/base/common/event
'
;
import
{
domEvent
}
from
'
vs/base/browser/event
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
function
toTreeListOptions
<
T
>
(
options
?:
IListOptions
<
T
>
):
IListOptions
<
ITreeNode
<
T
>>
{
if
(
!
options
)
{
...
...
@@ -127,6 +130,10 @@ function getLocation<T>(node: ITreeNode<T>): number[] {
return
location
.
reverse
();
}
function
isInputElement
(
e
:
HTMLElement
):
boolean
{
return
e
.
tagName
===
'
INPUT
'
||
e
.
tagName
===
'
TEXTAREA
'
;
}
export
class
Tree
<
T
>
implements
IDisposable
{
private
view
:
List
<
ITreeNode
<
T
>>
;
...
...
@@ -152,6 +159,14 @@ export class Tree<T> implements IDisposable {
onDidChangeCollapseStateRelay
.
input
=
this
.
model
.
onDidChangeCollapseState
;
this
.
view
.
onMouseClick
(
this
.
onMouseClick
,
this
,
this
.
disposables
);
const
onKeyDown
=
chain
(
this
.
view
.
onKeyDown
)
.
filter
(
e
=>
!
isInputElement
(
e
.
target
as
HTMLElement
))
.
map
(
e
=>
new
StandardKeyboardEvent
(
e
));
onKeyDown
.
filter
(
e
=>
e
.
keyCode
===
KeyCode
.
LeftArrow
).
on
(
this
.
onLeftArrow
,
this
,
this
.
disposables
);
onKeyDown
.
filter
(
e
=>
e
.
keyCode
===
KeyCode
.
RightArrow
).
on
(
this
.
onRightArrow
,
this
,
this
.
disposables
);
onKeyDown
.
filter
(
e
=>
e
.
keyCode
===
KeyCode
.
Space
).
on
(
this
.
onSpace
,
this
,
this
.
disposables
);
}
splice
(
location
:
number
[],
deleteCount
:
number
,
toInsert
:
IIterator
<
ITreeElement
<
T
>>
=
empty
()):
IIterator
<
ITreeElement
<
T
>>
{
...
...
@@ -161,6 +176,57 @@ export class Tree<T> implements IDisposable {
private
onMouseClick
(
e
:
IListMouseEvent
<
ITreeNode
<
T
>>
):
void
{
const
node
=
e
.
element
;
const
location
=
getLocation
(
node
);
this
.
model
.
toggleCollapsed
(
location
);
}
private
onLeftArrow
(
e
:
StandardKeyboardEvent
):
void
{
e
.
preventDefault
();
e
.
stopPropagation
();
const
nodes
=
this
.
view
.
getFocusedElements
();
if
(
nodes
.
length
===
0
)
{
return
;
}
const
node
=
nodes
[
0
];
const
location
=
getLocation
(
node
);
const
didCollapse
=
this
.
model
.
setCollapsed
(
location
,
true
);
if
(
!
didCollapse
)
{
console
.
log
(
'
should focus parent
'
);
// this.view.setFocus([]);
}
}
private
onRightArrow
(
e
:
StandardKeyboardEvent
):
void
{
e
.
preventDefault
();
e
.
stopPropagation
();
const
nodes
=
this
.
view
.
getFocusedElements
();
if
(
nodes
.
length
===
0
)
{
return
;
}
const
node
=
nodes
[
0
];
const
location
=
getLocation
(
node
);
this
.
model
.
setCollapsed
(
location
,
false
);
}
private
onSpace
(
e
:
StandardKeyboardEvent
):
void
{
e
.
preventDefault
();
e
.
stopPropagation
();
const
nodes
=
this
.
view
.
getFocusedElements
();
if
(
nodes
.
length
===
0
)
{
return
;
}
const
node
=
nodes
[
0
];
const
location
=
getLocation
(
node
);
this
.
model
.
toggleCollapsed
(
location
);
}
...
...
src/vs/base/browser/ui/tree/treeModel.ts
浏览文件 @
0db33932
...
...
@@ -120,15 +120,15 @@ export class TreeModel<T> {
return
map
(
iter
(
deletedNodes
),
treeNodeToElement
);
}
setCollapsed
(
location
:
number
[],
collapsed
:
boolean
):
void
{
this
.
_setCollapsed
(
location
,
collapsed
);
setCollapsed
(
location
:
number
[],
collapsed
:
boolean
):
boolean
{
return
this
.
_setCollapsed
(
location
,
collapsed
);
}
toggleCollapsed
(
location
:
number
[]):
void
{
this
.
_setCollapsed
(
location
);
}
private
_setCollapsed
(
location
:
number
[],
collapsed
?:
boolean
|
undefined
):
void
{
private
_setCollapsed
(
location
:
number
[],
collapsed
?:
boolean
|
undefined
):
boolean
{
const
{
node
,
listIndex
,
visible
}
=
this
.
findNode
(
location
);
if
(
typeof
collapsed
===
'
undefined
'
)
{
...
...
@@ -136,7 +136,7 @@ export class TreeModel<T> {
}
if
(
node
.
collapsed
===
collapsed
)
{
return
;
return
false
;
}
node
.
collapsed
=
collapsed
;
...
...
@@ -165,6 +165,8 @@ export class TreeModel<T> {
this
.
_onDidChangeCollapseState
.
fire
(
node
);
}
return
true
;
}
isCollapsed
(
location
:
number
[]):
boolean
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录