Merge pull request !245 from obama/d1012
This commit is contained in:
openharmony_ci 2021-10-12 12:15:27 +00:00 committed by Gitee
commit de57b74cdc
2 changed files with 4 additions and 1 deletions

View File

@ -492,7 +492,7 @@ RefPtr<Component> ViewStackProcessor::WrapComponents()
/* orders should not change */
std::string componentNames[] = { "flexItem", "display", "transform", "touch", "pan_guesture", "click_guesture",
"focusable", "box", "shared_transition", "coverage", "mouse" };
"focusable", "coverage", "box", "shared_transition", "mouse" };
for (auto& name : componentNames) {
auto iter = wrappingComponentsMap.find(name);
if (iter != wrappingComponentsMap.end()) {

View File

@ -76,6 +76,9 @@ bool PopupElementV2::IsDeclarative()
void PopupElementV2::OnStateChange(bool isVisible)
{
if (hasShown_ == isVisible) {
return;
}
hasShown_ = isVisible;
if (!onStateChange_) {
return;