Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
510d2abf
E
engine
项目概览
qq_34031325
/
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,发现更多精彩内容 >>
未验证
提交
510d2abf
编写于
3月 05, 2021
作者:
M
Mouad Debbar
提交者:
GitHub
3月 05, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[web] Fix url updates when using Router (#24798)
上级
d9fdce4e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
68 addition
and
7 deletion
+68
-7
lib/web_ui/lib/src/engine/window.dart
lib/web_ui/lib/src/engine/window.dart
+23
-7
lib/web_ui/test/window_test.dart
lib/web_ui/test/window_test.dart
+45
-0
未找到文件。
lib/web_ui/lib/src/engine/window.dart
浏览文件 @
510d2abf
...
...
@@ -44,13 +44,17 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
/// button, etc.
@visibleForTesting
BrowserHistory
get
browserHistory
{
return
_browserHistory
??=
MultiEntriesBrowserHistory
(
urlStrategy:
_urlStrategyForInitialization
);
}
UrlStrategy
?
get
_urlStrategyForInitialization
{
final
UrlStrategy
?
urlStrategy
=
_isUrlStrategySet
?
_customUrlStrategy
:
_createDefaultUrlStrategy
();
// Prevent any further customization of URL strategy.
_isUrlStrategySet
=
true
;
return
_browserHistory
??=
MultiEntriesBrowserHistory
(
urlStrategy:
urlStrategy
);
return
urlStrategy
;
}
BrowserHistory
?
_browserHistory
;
...
...
@@ -59,8 +63,14 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
if
(
_browserHistory
is
SingleEntryBrowserHistory
)
{
return
;
}
final
UrlStrategy
?
strategy
=
_browserHistory
?.
urlStrategy
;
await
_browserHistory
?.
tearDown
();
final
UrlStrategy
?
strategy
;
if
(
_browserHistory
==
null
)
{
strategy
=
_urlStrategyForInitialization
;
}
else
{
strategy
=
_browserHistory
?.
urlStrategy
;
await
_browserHistory
?.
tearDown
();
}
_browserHistory
=
SingleEntryBrowserHistory
(
urlStrategy:
strategy
);
}
...
...
@@ -68,8 +78,14 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
if
(
_browserHistory
is
MultiEntriesBrowserHistory
)
{
return
;
}
final
UrlStrategy
?
strategy
=
_browserHistory
?.
urlStrategy
;
await
_browserHistory
?.
tearDown
();
final
UrlStrategy
?
strategy
;
if
(
_browserHistory
==
null
)
{
strategy
=
_urlStrategyForInitialization
;
}
else
{
strategy
=
_browserHistory
?.
urlStrategy
;
await
_browserHistory
?.
tearDown
();
}
_browserHistory
=
MultiEntriesBrowserHistory
(
urlStrategy:
strategy
);
}
...
...
@@ -261,7 +277,7 @@ external set _jsSetUrlStrategy(_JsSetUrlStrategy? newJsSetUrlStrategy);
UrlStrategy
?
_createDefaultUrlStrategy
()
{
return
ui
.
debugEmulateFlutterTesterEnvironment
?
null
?
TestUrlStrategy
.
fromEntry
(
TestHistoryEntry
(
'default'
,
null
,
'/default'
))
:
const
HashUrlStrategy
();
}
...
...
lib/web_ui/test/window_test.dart
浏览文件 @
510d2abf
...
...
@@ -128,6 +128,51 @@ void testMain() {
expect
(
window
.
browserHistory
.
urlStrategy
.
getPath
(),
'/baz'
);
});
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.
Completer
<
void
>
callback
=
Completer
<
void
>();
window
.
sendPlatformMessage
(
'flutter/navigation'
,
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'routeUpdated'
,
<
String
,
dynamic
>{
'routeName'
:
'/bar'
},
)),
(
_
)
{
callback
.
complete
();
},
);
await
callback
.
future
;
expect
(
window
.
browserHistory
is
SingleEntryBrowserHistory
,
true
);
// The url strategy should've been set to the default, and the path
// should've been correctly set to "/bar".
expect
(
window
.
browserHistory
.
urlStrategy
,
isNot
(
isNull
));
expect
(
window
.
browserHistory
.
urlStrategy
.
getPath
(),
'/bar'
);
},
skip:
browserEngine
==
BrowserEngine
.
webkit
);
// https://github.com/flutter/flutter/issues/50836
test
(
'initialize browser history with default url strategy (multiple)'
,
()
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.
Completer
<
void
>
callback
=
Completer
<
void
>();
window
.
sendPlatformMessage
(
'flutter/navigation'
,
JSONMethodCodec
().
encodeMethodCall
(
MethodCall
(
'routeInformationUpdated'
,
<
String
,
dynamic
>{
'location'
:
'/baz'
,
'state'
:
null
,
},
)),
(
_
)
{
callback
.
complete
();
},
);
await
callback
.
future
;
expect
(
window
.
browserHistory
is
MultiEntriesBrowserHistory
,
true
);
// The url strategy should've been set to the default, and the path
// should've been correctly set to "/baz".
expect
(
window
.
browserHistory
.
urlStrategy
,
isNot
(
isNull
));
expect
(
window
.
browserHistory
.
urlStrategy
.
getPath
(),
'/baz'
);
},
skip:
browserEngine
==
BrowserEngine
.
webkit
);
// https://github.com/flutter/flutter/issues/50836
test
(
'can disable location strategy'
,
()
async
{
// Disable URL strategy.
expect
(()
=>
jsSetUrlStrategy
(
null
),
returnsNormally
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录