Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
5e7236f4
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,发现更多精彩内容 >>
未验证
提交
5e7236f4
编写于
5月 27, 2021
作者:
C
chunhtai
提交者:
GitHub
5月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support history entry replace in multi entries browser history (#26456)
上级
a95a3423
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
86 addition
and
9 deletion
+86
-9
lib/web_ui/lib/src/engine/navigation/history.dart
lib/web_ui/lib/src/engine/navigation/history.dart
+17
-9
lib/web_ui/lib/src/engine/window.dart
lib/web_ui/lib/src/engine/window.dart
+1
-0
lib/web_ui/test/window_test.dart
lib/web_ui/test/window_test.dart
+68
-0
未找到文件。
lib/web_ui/lib/src/engine/navigation/history.dart
浏览文件 @
5e7236f4
...
...
@@ -63,7 +63,7 @@ abstract class BrowserHistory {
Object
?
get
currentState
=>
urlStrategy
?.
getState
();
/// Update the url with the given [routeName] and [state].
void
setRouteName
(
String
?
routeName
,
{
Object
?
state
});
void
setRouteName
(
String
?
routeName
,
{
Object
?
state
,
bool
replace
=
false
});
/// A callback method to handle browser backward or forward buttons.
///
...
...
@@ -131,15 +131,23 @@ class MultiEntriesBrowserHistory extends BrowserHistory {
}
@override
void
setRouteName
(
String
?
routeName
,
{
Object
?
state
})
{
void
setRouteName
(
String
?
routeName
,
{
Object
?
state
,
bool
replace
=
false
})
{
if
(
urlStrategy
!=
null
)
{
assert
(
routeName
!=
null
);
_lastSeenSerialCount
+=
1
;
urlStrategy
!.
pushState
(
_tagWithSerialCount
(
state
,
_lastSeenSerialCount
),
'flutter'
,
routeName
!,
);
if
(
replace
)
{
urlStrategy
!.
replaceState
(
_tagWithSerialCount
(
state
,
_lastSeenSerialCount
),
'flutter'
,
routeName
!,
);
}
else
{
_lastSeenSerialCount
+=
1
;
urlStrategy
!.
pushState
(
_tagWithSerialCount
(
state
,
_lastSeenSerialCount
),
'flutter'
,
routeName
!,
);
}
}
}
...
...
@@ -263,7 +271,7 @@ class SingleEntryBrowserHistory extends BrowserHistory {
}
@override
void
setRouteName
(
String
?
routeName
,
{
Object
?
state
})
{
void
setRouteName
(
String
?
routeName
,
{
Object
?
state
,
bool
replace
=
false
})
{
if
(
urlStrategy
!=
null
)
{
_setupFlutterEntry
(
urlStrategy
!,
replace:
true
,
path:
routeName
);
}
...
...
lib/web_ui/lib/src/engine/window.dart
浏览文件 @
5e7236f4
...
...
@@ -132,6 +132,7 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
browserHistory
.
setRouteName
(
arguments
![
'location'
],
state:
arguments
[
'state'
],
replace:
arguments
[
'replace'
]
??
false
,
);
return
true
;
}
...
...
lib/web_ui/test/window_test.dart
浏览文件 @
5e7236f4
...
...
@@ -16,6 +16,13 @@ import 'matchers.dart';
const
MethodCodec
codec
=
JSONMethodCodec
();
Map
<
String
,
dynamic
>
_tagStateWithSerialCount
(
dynamic
state
,
int
serialCount
)
{
return
<
String
,
dynamic
>
{
'serialCount'
:
serialCount
,
'state'
:
state
,
};
}
void
main
(
)
{
internalBootstrapBrowserTest
(()
=>
testMain
);
}
...
...
@@ -175,6 +182,67 @@ void testMain() {
expect
(
window
.
browserHistory
.
urlStrategy
!.
getPath
(),
'/foo'
);
});
test
(
'can replace in MultiEntriesBrowserHistory'
,
()
async
{
await
window
.
debugInitializeHistory
(
TestUrlStrategy
.
fromEntry
(
TestHistoryEntry
(
'initial state'
,
null
,
'/initial'
),
),
useSingle:
false
);
expect
(
window
.
browserHistory
,
isA
<
MultiEntriesBrowserHistory
>());
Completer
<
void
>
callback
=
Completer
<
void
>();
window
.
sendPlatformMessage
(
'flutter/navigation'
,
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'routeInformationUpdated'
,
<
String
,
dynamic
>{
'location'
:
'/baz'
,
'state'
:
'/state'
,
},
)),
(
_
)
{
callback
.
complete
();
},
);
await
callback
.
future
;
expect
(
window
.
browserHistory
.
urlStrategy
!.
getPath
(),
'/baz'
);
expect
(
window
.
browserHistory
.
urlStrategy
!.
getState
(),
_tagStateWithSerialCount
(
'/state'
,
1
));
callback
=
Completer
<
void
>();
window
.
sendPlatformMessage
(
'flutter/navigation'
,
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'routeInformationUpdated'
,
<
String
,
dynamic
>{
'location'
:
'/baz'
,
'state'
:
'/state1'
,
'replace'
:
true
},
)),
(
_
)
{
callback
.
complete
();
},
);
await
callback
.
future
;
expect
(
window
.
browserHistory
.
urlStrategy
!.
getPath
(),
'/baz'
);
expect
(
window
.
browserHistory
.
urlStrategy
!.
getState
(),
_tagStateWithSerialCount
(
'/state1'
,
1
));
callback
=
Completer
<
void
>();
window
.
sendPlatformMessage
(
'flutter/navigation'
,
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'routeInformationUpdated'
,
<
String
,
dynamic
>{
'location'
:
'/foo'
,
'state'
:
'/foostate1'
,
},
)),
(
_
)
{
callback
.
complete
();
},
);
await
callback
.
future
;
expect
(
window
.
browserHistory
.
urlStrategy
!.
getPath
(),
'/foo'
);
expect
(
window
.
browserHistory
.
urlStrategy
!.
getState
(),
_tagStateWithSerialCount
(
'/foostate1'
,
2
));
await
window
.
browserHistory
.
back
();
expect
(
window
.
browserHistory
.
urlStrategy
!.
getPath
(),
'/baz'
);
expect
(
window
.
browserHistory
.
urlStrategy
!.
getState
(),
_tagStateWithSerialCount
(
'/state1'
,
1
));
});
test
(
'initialize browser history with default url strategy (single)'
,
()
async
{
// On purpose, we don't initialize history on the window. We want to let the
// window to self-initialize when it receives a navigation message.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录