Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dom): fix animation not work for same animation id #4143

Merged
merged 2 commits into from
Dec 4, 2024
Merged

fix(dom): fix animation not work for same animation id #4143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca5478
fix(dom): fix animation not work for same animation id
zealotchen0 Dec 3, 2024
13b7031
feat(dom): add same animation id demo
zealotchen0 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dom/include/dom/animation/animation_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ class AnimationManager
void ParseAnimation(const std::shared_ptr<DomNode>& node);
void FetchAnimationsFromObject(const std::string& prop,
const std::shared_ptr<HippyValue>& value,
std::unordered_map<uint32_t, std::string>& result);
std::unordered_map<uint32_t, std::set<std::string>>& result);
void FetchAnimationsFromArray(HippyValue& value,
std::unordered_map<uint32_t, std::string>& result);
std::unordered_map<uint32_t, std::set<std::string>>& result);
void UpdateCubicBezierAnimation(double current,
uint32_t related_animation_id,
std::unordered_map<uint32_t, std::shared_ptr<DomNode>>& update_node_map);
Expand All @@ -140,7 +140,7 @@ class AnimationManager
* the key of this map is dom node id and the value are all animation properties of the node
* the key of props' map is animation id and value is ths name of prop.
*/
std::unordered_map<uint32_t, std::unordered_map<uint32_t, std::string>> node_animation_props_map_;
std::unordered_map<uint32_t, std::unordered_map<uint32_t, std::set<std::string>>> node_animation_props_map_;
uint64_t listener_id_;
};
} // namespace dom
Expand Down
40 changes: 28 additions & 12 deletions dom/src/dom/animation/animation_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void AnimationManager::ParseAnimation(const std::shared_ptr<DomNode>& node) {
auto use_animation_it = dom_ext_map_->find(kUseAnimation);
if (use_animation_it != dom_ext_map_->end()) {
auto style_map_ = node->GetStyleMap();
std::unordered_map<uint32_t, std::string> animation_prop_map;
std::unordered_map<uint32_t, std::set<std::string>> animation_prop_map;
for (auto& style: *style_map_) {
if (style.second->IsObject()) {
FetchAnimationsFromObject(style.first, style.second, animation_prop_map);
Expand All @@ -103,20 +103,26 @@ void AnimationManager::ParseAnimation(const std::shared_ptr<DomNode>& node) {
auto& orig_animation_prop_map = node_animation_props_it->second;
for (auto& pair: animation_prop_map) {
auto animation_id = pair.first;
auto prop = pair.second;
if (orig_animation_prop_map[animation_id] == prop) {
auto props = pair.second;
if (orig_animation_prop_map[animation_id] == props) {
auto animation = GetAnimation(animation_id);
if (animation == nullptr) continue;
node->EmplaceStyleMap(prop, HippyValue(animation->GetCurrentValue()));
for (auto prop: props) {
node->EmplaceStyleMap(prop, HippyValue(animation->GetCurrentValue()));
}
} else {
orig_animation_prop_map[animation_id] = animation_prop_map[animation_id];
EmplaceNodeProp(node, pair.second, animation_id);
for (auto prop: pair.second) {
EmplaceNodeProp(node, prop, animation_id);
}
}
}
} else {
node_animation_props_map_.insert({node_id, animation_prop_map});
for (const auto& pair: animation_prop_map) {
EmplaceNodeProp(node, pair.second, pair.first);
for (auto prop: pair.second) {
EmplaceNodeProp(node, prop, pair.first);
}
}
}
}
Expand All @@ -128,7 +134,7 @@ void AnimationManager::ParseAnimation(const std::shared_ptr<DomNode>& node) {
void AnimationManager::FetchAnimationsFromObject(
const std::string& prop,
const std::shared_ptr<HippyValue>& value,
std::unordered_map<uint32_t, std::string>& result) {
std::unordered_map<uint32_t, std::set<std::string>>& result) {
if (value->IsObject()) {
footstone::value::HippyValue::HippyValueObjectType obj;
if (value->ToObject(obj)) {
Expand All @@ -138,7 +144,14 @@ void AnimationManager::FetchAnimationsFromObject(
if (id.IsNumber()) {
double animation_id;
if (id.ToDouble(animation_id)) {
result.insert({static_cast<uint32_t>(animation_id), prop});
auto it = result.find(static_cast<uint32_t>(animation_id));
if (it != result.end()) {
it->second.insert(prop);
} else {
std::set<std::string> props;
props.insert(prop);
result.insert({static_cast<uint32_t>(animation_id), props});
}
}
}
} else {
Expand All @@ -154,7 +167,7 @@ void AnimationManager::FetchAnimationsFromObject(
}

void AnimationManager::FetchAnimationsFromArray(HippyValue& value,
std::unordered_map<uint32_t, std::string>& result) {
std::unordered_map<uint32_t, std::set<std::string>>& result) {
if (value.IsArray()) {
footstone::value::HippyValue::HippyValueArrayType array;
if (value.ToArray(array)) {
Expand Down Expand Up @@ -330,9 +343,12 @@ void AnimationManager::UpdateCubicBezierAnimation(double current,
diff_value = *(dom_node->GetDiffStyle());
}
HippyValue prop_value(current);
dom_node->EmplaceStyleMapAndGetDiff(prop_it->second, prop_value, diff_value);
FOOTSTONE_DLOG(INFO) << "animation related_animation_id = " << related_animation_id
<< "node id = " << dom_node->GetId() << ", key = " << prop_it->second << ", value = " << prop_value;
for (auto prop: prop_it->second) {
dom_node->EmplaceStyleMapAndGetDiff(prop, prop_value, diff_value);
FOOTSTONE_DLOG(INFO) << "animation related_animation_id = " << related_animation_id
<< "node id = " << dom_node->GetId() << ", key = " << prop << ", value = " << prop_value;
}


dom_node->SetDiffStyle(std::make_shared<
std::unordered_map<std::string, std::shared_ptr<HippyValue>>>(std::move(diff_value)));
Expand Down
3 changes: 2 additions & 1 deletion driver/js/examples/hippy-react-demo/src/modules/Animation/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,8 @@ export default class AnimationExample extends React.Component {
}}
style={[styles.square, {
transform: [{
scale: this.scaleAnimationSet,
scaleX: this.scaleAnimationSet,
scaleY: this.scaleAnimationSet,
}],
}]}
/>
Expand Down
Loading