-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix two crashes from NativeAnimatedExamples (#3400)
* merge in basic slider * Fix two issues: 1) you cannot animated 2 subchannels of the same property with different animations. to fix this we animated yet another property set for translation and scale owned by the props nodes and use one animation to animate all of the subchannels for the uiElement. 2) Reference parameter names which started with a multi digit number are unsupported so i added an n to the start of each name, which was previously just the node's tag. * Change files * yarn format * Fix an issue with spring animations that did not start from 0, causing them to double count the start value. * respond to feedback. * yarn format
- Loading branch information
1 parent
04e07f7
commit 4d9e944
Showing
17 changed files
with
225 additions
and
14 deletions.
There are no files selected for viewing
8 changes: 8 additions & 0 deletions
8
change/react-native-windows-2019-10-11-13-21-33-ChainedAnimationsCrash.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "type": "prerelease", | ||
| "comment": "Fix two issues: 1) you cannot animated 2 subchannels of the same property with different animations. to fix this we animated yet another property set for translation and scale owned by the props nodes and use one animation to animate all of the subchannels for the uiElement. 2) Reference parameter names which started with a multi digit number are unsupported so i added an n to the start of each name, which was previously just the node's tag.", | ||
| "packageName": "react-native-windows", | ||
| "email": "stpete@microsoft.com", | ||
| "commit": "62049fdbd667fc71ae09b09f074446d8593d826d", | ||
| "date": "2019-10-11T20:21:32.900Z" | ||
| } |
8 changes: 8 additions & 0 deletions
8
change/react-native-windows-extended-2019-10-11-13-21-33-ChainedAnimationsCrash.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "type": "patch", | ||
| "comment": "Fix two issues: 1) you cannot animated 2 subchannels of the same property with different animations. to fix this we animated yet another property set for translation and scale owned by the props nodes and use one animation to animate all of the subchannels for the uiElement. 2) Reference parameter names which started with a multi digit number are unsupported so i added an n to the start of each name, which was previously just the node's tag.", | ||
| "packageName": "react-native-windows-extended", | ||
| "email": "stpete@microsoft.com", | ||
| "commit": "62049fdbd667fc71ae09b09f074446d8593d826d", | ||
| "date": "2019-10-11T20:21:24.946Z" | ||
| } |
8 changes: 8 additions & 0 deletions
8
change/rnpm-plugin-windows-2019-10-11-13-21-33-ChainedAnimationsCrash.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "type": "patch", | ||
| "comment": "Fix two issues: 1) you cannot animated 2 subchannels of the same property with different animations. to fix this we animated yet another property set for translation and scale owned by the props nodes and use one animation to animate all of the subchannels for the uiElement. 2) Reference parameter names which started with a multi digit number are unsupported so i added an n to the start of each name, which was previously just the node's tag.", | ||
| "packageName": "rnpm-plugin-windows", | ||
| "email": "stpete@microsoft.com", | ||
| "commit": "62049fdbd667fc71ae09b09f074446d8593d826d", | ||
| "date": "2019-10-11T20:20:58.182Z" | ||
| } |
8 changes: 8 additions & 0 deletions
8
change/rnpm-plugin-wpf-2019-10-11-13-21-33-ChainedAnimationsCrash.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "type": "none", | ||
| "comment": "Fix two issues: 1) you cannot animated 2 subchannels of the same property with different animations. to fix this we animated yet another property set for translation and scale owned by the props nodes and use one animation to animate all of the subchannels for the uiElement. 2) Reference parameter names which started with a multi digit number are unsupported so i added an n to the start of each name, which was previously just the node's tag.", | ||
| "packageName": "rnpm-plugin-wpf", | ||
| "email": "stpete@microsoft.com", | ||
| "commit": "62049fdbd667fc71ae09b09f074446d8593d826d", | ||
| "date": "2019-10-11T20:21:05.364Z" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| #include "pch.h" | ||
|
|
||
| #include <Views/ShadowNodeBase.h> | ||
| #include "SliderViewManager.h" | ||
|
|
||
| #include <Utils/ValueUtils.h> | ||
|
|
||
| #include <IReactInstance.h> | ||
|
|
||
| #include <winrt/Windows.UI.Xaml.Controls.Primitives.h> | ||
|
|
||
| namespace winrt { | ||
| using ToggleButton = Windows::UI::Xaml::Controls::Primitives::ToggleButton; | ||
| } | ||
|
|
||
| namespace react { | ||
| namespace uwp { | ||
|
|
||
| class SliderShadowNode : public ShadowNodeBase { | ||
| using Super = ShadowNodeBase; | ||
|
|
||
| public: | ||
| SliderShadowNode() = default; | ||
| void createView() override; | ||
| void updateProperties(const folly::dynamic &&props) override; | ||
| }; | ||
|
|
||
| void SliderShadowNode::createView() { | ||
| Super::createView(); | ||
| } | ||
|
|
||
| void SliderShadowNode::updateProperties(const folly::dynamic &&props) { | ||
| m_updating = true; | ||
| Super::updateProperties(std::move(props)); | ||
| m_updating = false; | ||
| } | ||
|
|
||
| SliderViewManager::SliderViewManager( | ||
| const std::shared_ptr<IReactInstance> &reactInstance) | ||
| : Super(reactInstance) {} | ||
|
|
||
| const char *SliderViewManager::GetName() const { | ||
| return "RCTSlider"; | ||
| } | ||
|
|
||
| folly::dynamic SliderViewManager::GetNativeProps() const { | ||
| auto props = Super::GetNativeProps(); | ||
|
|
||
| props.update( | ||
| folly::dynamic::object("value", "integer")("disabled", "boolean")); | ||
|
|
||
| return props; | ||
| } | ||
|
|
||
| facebook::react::ShadowNode *SliderViewManager::createShadow() const { | ||
| return new SliderShadowNode(); | ||
| } | ||
|
|
||
| XamlView SliderViewManager::CreateViewCore(int64_t tag) { | ||
| auto slider = winrt::Slider(); | ||
| return slider; | ||
| } | ||
|
|
||
| void SliderViewManager::UpdateProperties( | ||
| ShadowNodeBase *nodeToUpdate, | ||
| const folly::dynamic &reactDiffMap) { | ||
| auto slider = nodeToUpdate->GetView().as<winrt::Slider>(); | ||
| if (slider == nullptr) | ||
| return; | ||
|
|
||
| for (const auto &pair : reactDiffMap.items()) { | ||
| const std::string &propertyName = pair.first.getString(); | ||
| const folly::dynamic &propertyValue = pair.second; | ||
|
|
||
| if (propertyName == "disabled") { | ||
| if (propertyValue.isBool()) | ||
| slider.IsEnabled(!propertyValue.asBool()); | ||
| else if (pair.second.isNull()) | ||
| slider.ClearValue(winrt::Control::IsEnabledProperty()); | ||
| } else if (propertyName == "value") { | ||
| if (propertyValue.isNumber()) | ||
| slider.Value(propertyValue.asDouble()); | ||
| else if (pair.second.isNull()) | ||
| slider.Value(0); | ||
| } | ||
| } | ||
|
|
||
| Super::UpdateProperties(nodeToUpdate, reactDiffMap); | ||
| } | ||
|
|
||
| } // namespace uwp | ||
| } // namespace react |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <Views/ControlViewManager.h> | ||
|
|
||
| namespace react { | ||
| namespace uwp { | ||
|
|
||
| class SliderViewManager : public ControlViewManager { | ||
| using Super = ControlViewManager; | ||
|
|
||
| public: | ||
| SliderViewManager(const std::shared_ptr<IReactInstance> &reactInstance); | ||
|
|
||
| const char *GetName() const override; | ||
| folly::dynamic GetNativeProps() const override; | ||
|
|
||
| facebook::react::ShadowNode *createShadow() const override; | ||
|
|
||
| void UpdateProperties( | ||
| ShadowNodeBase *nodeToUpdate, | ||
| const folly::dynamic &reactDiffMap) override; | ||
|
|
||
| protected: | ||
| XamlView CreateViewCore(int64_t tag) override; | ||
|
|
||
| friend class SliderShadowNode; | ||
| }; | ||
|
|
||
| } // namespace uwp | ||
| } // namespace react |