Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
76094070
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,发现更多精彩内容 >>
提交
76094070
编写于
1月 17, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tree: focus navigation on type filters
上级
5d10be0b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
7 deletion
+22
-7
src/vs/base/browser/ui/tree/abstractTree.ts
src/vs/base/browser/ui/tree/abstractTree.ts
+22
-7
未找到文件。
src/vs/base/browser/ui/tree/abstractTree.ts
浏览文件 @
76094070
...
...
@@ -8,7 +8,7 @@ import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
import
{
IListOptions
,
List
,
IListStyles
,
mightProducePrintableCharacter
}
from
'
vs/base/browser/ui/list/listWidget
'
;
import
{
IListVirtualDelegate
,
IListRenderer
,
IListMouseEvent
,
IListEvent
,
IListContextMenuEvent
,
IListDragAndDrop
,
IListDragOverReaction
,
IKeyboardNavigationLabelProvider
}
from
'
vs/base/browser/ui/list/list
'
;
import
{
append
,
$
,
toggleClass
,
timeout
}
from
'
vs/base/browser/dom
'
;
import
{
Event
,
Relay
}
from
'
vs/base/common/event
'
;
import
{
Event
,
Relay
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
StandardKeyboardEvent
,
IKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
ITreeModel
,
ITreeNode
,
ITreeRenderer
,
ITreeEvent
,
ITreeMouseEvent
,
ITreeContextMenuEvent
,
ITreeFilter
,
ITreeNavigator
,
ICollapseStateChangeEvent
,
ITreeDragAndDrop
,
TreeDragOverBubble
,
TreeVisibility
,
TreeFilterResult
}
from
'
vs/base/browser/ui/tree/tree
'
;
...
...
@@ -321,7 +321,15 @@ class TypeFilter<T> implements ITreeFilter<T, FuzzyScore> {
class
TypeFilterController
<
T
,
TFilterData
>
implements
IDisposable
{
get
pattern
():
string
{
return
this
.
_pattern
;
}
private
_onDidChangePattern
=
new
Emitter
<
string
>
();
readonly
onDidChangePattern
=
this
.
_onDidChangePattern
.
event
;
private
domNode
:
HTMLElement
;
private
_pattern
=
''
;
private
disposables
:
IDisposable
[]
=
[];
constructor
(
...
...
@@ -356,9 +364,12 @@ class TypeFilterController<T, TFilterData> implements IDisposable {
}
private
onInput
(
pattern
:
string
):
void
{
this
.
_pattern
=
pattern
;
this
.
domNode
.
textContent
=
pattern
;
this
.
filter
.
pattern
=
pattern
;
this
.
tree
.
refilter
();
this
.
_onDidChangePattern
.
fire
(
pattern
);
}
dispose
()
{
...
...
@@ -409,6 +420,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
private
view
:
List
<
ITreeNode
<
T
,
TFilterData
>>
;
private
renderers
:
TreeRenderer
<
T
,
TFilterData
,
any
>
[];
private
focusNavigationFilter
:
((
node
:
ITreeNode
<
T
,
TFilterData
>
)
=>
boolean
)
|
undefined
;
protected
model
:
ITreeModel
<
T
,
TFilterData
,
TRef
>
;
protected
disposables
:
IDisposable
[]
=
[];
...
...
@@ -470,7 +482,10 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
if
(
options
.
keyboardNavigationLabelProvider
)
{
const
typeFilterController
=
new
TypeFilterController
(
this
,
this
.
view
,
filter
as
TypeFilter
<
T
>
,
options
.
keyboardNavigationLabelProvider
);
this
.
focusNavigationFilter
=
node
=>
!
typeFilterController
.
pattern
||
!
FuzzyScore
.
isDefault
(
node
.
filterData
as
any
as
FuzzyScore
);
// TODO@joao
this
.
disposables
.
push
(
typeFilterController
);
typeFilterController
.
onDidChangePattern
(()
=>
this
.
focusNext
(
0
,
true
),
this
,
this
.
disposables
);
}
}
...
...
@@ -594,27 +609,27 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
}
focusNext
(
n
=
1
,
loop
=
false
,
browserEvent
?:
UIEvent
):
void
{
this
.
view
.
focusNext
(
n
,
loop
,
browserEvent
);
this
.
view
.
focusNext
(
n
,
loop
,
browserEvent
,
this
.
focusNavigationFilter
);
}
focusPrevious
(
n
=
1
,
loop
=
false
,
browserEvent
?:
UIEvent
):
void
{
this
.
view
.
focusPrevious
(
n
,
loop
,
browserEvent
);
this
.
view
.
focusPrevious
(
n
,
loop
,
browserEvent
,
this
.
focusNavigationFilter
);
}
focusNextPage
(
browserEvent
?:
UIEvent
):
void
{
this
.
view
.
focusNextPage
(
browserEvent
);
this
.
view
.
focusNextPage
(
browserEvent
,
this
.
focusNavigationFilter
);
}
focusPreviousPage
(
browserEvent
?:
UIEvent
):
void
{
this
.
view
.
focusPreviousPage
(
browserEvent
);
this
.
view
.
focusPreviousPage
(
browserEvent
,
this
.
focusNavigationFilter
);
}
focusLast
(
browserEvent
?:
UIEvent
):
void
{
this
.
view
.
focusLast
(
browserEvent
);
this
.
view
.
focusLast
(
browserEvent
,
this
.
focusNavigationFilter
);
}
focusFirst
(
browserEvent
?:
UIEvent
):
void
{
this
.
view
.
focusFirst
(
browserEvent
);
this
.
view
.
focusFirst
(
browserEvent
,
this
.
focusNavigationFilter
);
}
getFocus
():
T
[]
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录