Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
3e093936
E
engine
项目概览
weixin_43355755
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
3e093936
编写于
6月 07, 2021
作者:
C
chunhtai
提交者:
GitHub
6月 07, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes handleNavigationMessage in order (#26596)
上级
38ec57cc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
96 addition
and
25 deletion
+96
-25
lib/web_ui/lib/src/engine/window.dart
lib/web_ui/lib/src/engine/window.dart
+45
-25
lib/web_ui/test/window_test.dart
lib/web_ui/test/window_test.dart
+51
-0
未找到文件。
lib/web_ui/lib/src/engine/window.dart
浏览文件 @
3e093936
...
...
@@ -4,6 +4,8 @@
part of
engine
;
typedef
_HandleMessageCallBack
=
Future
<
bool
>
Function
();
/// When set to true, all platform messages will be printed to the console.
const
bool
/*!*/
_debugPrintPlatformMessages
=
false
;
...
...
@@ -112,32 +114,50 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
_customUrlStrategy
=
null
;
}
Future
<
bool
>
handleNavigationMessage
(
ByteData
?
data
)
async
{
final
MethodCall
decoded
=
JSONMethodCodec
().
decodeMethodCall
(
data
);
final
Map
<
String
,
dynamic
>?
arguments
=
decoded
.
arguments
;
switch
(
decoded
.
method
)
{
case
'selectMultiEntryHistory'
:
await
_useMultiEntryBrowserHistory
();
return
true
;
case
'selectSingleEntryHistory'
:
await
_useSingleEntryBrowserHistory
();
return
true
;
// the following cases assert that arguments are not null
case
'routeUpdated'
:
// deprecated
assert
(
arguments
!=
null
);
await
_useSingleEntryBrowserHistory
();
browserHistory
.
setRouteName
(
arguments
![
'routeName'
]);
return
true
;
case
'routeInformationUpdated'
:
assert
(
arguments
!=
null
);
browserHistory
.
setRouteName
(
arguments
![
'location'
],
state:
arguments
[
'state'
],
replace:
arguments
[
'replace'
]
??
false
,
);
return
true
;
Future
<
void
>
_endOfTheLine
=
Future
<
void
>.
value
(
null
);
Future
<
bool
>
_waitInTheLine
(
_HandleMessageCallBack
callback
)
async
{
final
Future
<
void
>
currentPosition
=
_endOfTheLine
;
final
Completer
<
void
>
completer
=
Completer
<
void
>();
_endOfTheLine
=
completer
.
future
;
await
currentPosition
;
bool
result
=
false
;
try
{
result
=
await
callback
();
}
finally
{
completer
.
complete
();
}
return
false
;
return
result
;
}
Future
<
bool
>
handleNavigationMessage
(
ByteData
?
data
)
async
{
return
_waitInTheLine
(()
async
{
final
MethodCall
decoded
=
JSONMethodCodec
().
decodeMethodCall
(
data
);
final
Map
<
String
,
dynamic
>?
arguments
=
decoded
.
arguments
;
switch
(
decoded
.
method
)
{
case
'selectMultiEntryHistory'
:
await
_useMultiEntryBrowserHistory
();
return
true
;
case
'selectSingleEntryHistory'
:
await
_useSingleEntryBrowserHistory
();
return
true
;
// the following cases assert that arguments are not null
case
'routeUpdated'
:
// deprecated
assert
(
arguments
!=
null
);
await
_useSingleEntryBrowserHistory
();
browserHistory
.
setRouteName
(
arguments
![
'routeName'
]);
return
true
;
case
'routeInformationUpdated'
:
assert
(
arguments
!=
null
);
browserHistory
.
setRouteName
(
arguments
![
'location'
],
state:
arguments
[
'state'
],
replace:
arguments
[
'replace'
]
??
false
,
);
return
true
;
}
return
false
;
});
}
@override
...
...
lib/web_ui/test/window_test.dart
浏览文件 @
3e093936
...
...
@@ -133,6 +133,57 @@ void testMain() {
},
throwsAssertionError
);
});
test
(
'handleNavigationMessage execute request in order.'
,
()
async
{
// Start with multi entries.
await
window
.
debugInitializeHistory
(
TestUrlStrategy
.
fromEntry
(
TestHistoryEntry
(
'initial state'
,
null
,
'/initial'
),
),
useSingle:
false
);
expect
(
window
.
browserHistory
,
isA
<
MultiEntriesBrowserHistory
>());
final
List
<
String
>
executionOrder
=
<
String
>[];
window
.
handleNavigationMessage
(
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'selectSingleEntryHistory'
,
null
,
))
).
then
<
void
>((
bool
data
)
{
executionOrder
.
add
(
'1'
);
});
window
.
handleNavigationMessage
(
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'selectMultiEntryHistory'
,
null
,
))
).
then
<
void
>((
bool
data
)
{
executionOrder
.
add
(
'2'
);
});
window
.
handleNavigationMessage
(
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'selectSingleEntryHistory'
,
null
,
))
).
then
<
void
>((
bool
data
)
{
executionOrder
.
add
(
'3'
);
});
await
window
.
handleNavigationMessage
(
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'routeInformationUpdated'
,
<
String
,
dynamic
>{
'location'
:
'/baz'
,
'state'
:
null
,
},
// boom
))
).
then
<
void
>((
bool
data
)
{
executionOrder
.
add
(
'4'
);
});
// The routeInformationUpdated should finish after the browser history
// has been set to single entry.
expect
(
executionOrder
.
length
,
4
);
expect
(
executionOrder
[
0
],
'1'
);
expect
(
executionOrder
[
1
],
'2'
);
expect
(
executionOrder
[
2
],
'3'
);
expect
(
executionOrder
[
3
],
'4'
);
});
test
(
'should not throw when using nav1 and nav2 together'
,
()
async
{
await
window
.
debugInitializeHistory
(
TestUrlStrategy
.
fromEntry
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录