mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Joshua Gross
d1b1e8b80d
Summary:
While I think this was a very marginal bug with no known issues in the wild, incorrect layout values were sometimes being propagated to certain nodes. This would only occur during complex nested (un)flattening operations and may only impact node consistency, specifically with setting the "previous" ShadowView of mutation instructions, specifically REMOVE and DELETE. Even in rigorous testing I had trouble hitting this case and it didn't seem to impact the "next" values in CREATE, INSERT, or UPDATE.
The issue: previously `sliceChildShadowNodeViewPairsV2` assumed that the node it's operating on is a child of a non-flattened view, and the baseline origin is `{0,0}`. You can see when `sliceChildShadowNodeViewPairsRecursivelyV2` is called, a `layoutOffset` is passed in. If we ever got a list of a node that was in a flattened parent by calling `sliceChildShadowNodeViewPairsV2`, we would incorrectly assume that baseline layoutOffset for the node is `0,0`.
Now, we store the layoutOffset in the ShadowViewNodePair and can retrieve it when getting child pairs of a node.
Changelog: [internal]
Reviewed By: sammy-SC
Differential Revision: D27759380
fbshipit-source-id: a89756190a1cb377bcc55ff31799c2afbaecdaa9
146 lines
3.7 KiB
C++
146 lines
3.7 KiB
C++
/*
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <better/small_vector.h>
|
|
#include <folly/Hash.h>
|
|
#include <react/renderer/core/EventEmitter.h>
|
|
#include <react/renderer/core/LayoutMetrics.h>
|
|
#include <react/renderer/core/Props.h>
|
|
#include <react/renderer/core/ReactPrimitives.h>
|
|
#include <react/renderer/core/ShadowNode.h>
|
|
#include <react/renderer/debug/flags.h>
|
|
|
|
namespace facebook {
|
|
namespace react {
|
|
|
|
/*
|
|
* Describes a view that can be mounted.
|
|
* This is exposed to the mounting layer.
|
|
*/
|
|
struct ShadowView final {
|
|
ShadowView() = default;
|
|
ShadowView(ShadowView const &shadowView) = default;
|
|
ShadowView(ShadowView &&shadowView) noexcept = default;
|
|
|
|
/*
|
|
* Constructs a `ShadowView` from given `ShadowNode`.
|
|
*/
|
|
explicit ShadowView(ShadowNode const &shadowNode);
|
|
|
|
ShadowView &operator=(ShadowView const &other) = default;
|
|
ShadowView &operator=(ShadowView &&other) = default;
|
|
|
|
bool operator==(ShadowView const &rhs) const;
|
|
bool operator!=(ShadowView const &rhs) const;
|
|
|
|
ComponentName componentName{};
|
|
ComponentHandle componentHandle{};
|
|
SurfaceId surfaceId{};
|
|
Tag tag{};
|
|
Props::Shared props{};
|
|
EventEmitter::Shared eventEmitter{};
|
|
LayoutMetrics layoutMetrics{EmptyLayoutMetrics};
|
|
State::Shared state{};
|
|
};
|
|
|
|
#if RN_DEBUG_STRING_CONVERTIBLE
|
|
|
|
std::string getDebugName(ShadowView const &object);
|
|
std::vector<DebugStringConvertibleObject> getDebugProps(
|
|
ShadowView const &object,
|
|
DebugStringConvertibleOptions options);
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Describes pair of a `ShadowView` and a `ShadowNode`.
|
|
* This is not exposed to the mounting layer.
|
|
*
|
|
*/
|
|
struct ShadowViewNodePair final {
|
|
using NonOwningList = better::
|
|
small_vector<ShadowViewNodePair *, kShadowNodeChildrenSmallVectorSize>;
|
|
using OwningList = better::
|
|
small_vector<ShadowViewNodePair, kShadowNodeChildrenSmallVectorSize>;
|
|
|
|
ShadowView shadowView;
|
|
ShadowNode const *shadowNode;
|
|
bool flattened{false};
|
|
bool isConcreteView{true};
|
|
Point contextOrigin{0, 0};
|
|
|
|
size_t mountIndex{0};
|
|
|
|
/**
|
|
* This is nullptr unless `inOtherTree` is set to true.
|
|
* We rely on this only for marginal cases. TODO: could we
|
|
* rely on this more heavily to simplify the diffing algorithm
|
|
* overall?
|
|
*/
|
|
ShadowViewNodePair const *otherTreePair{nullptr};
|
|
|
|
/*
|
|
* The stored pointer to `ShadowNode` represents an identity of the pair.
|
|
*/
|
|
bool operator==(const ShadowViewNodePair &rhs) const;
|
|
bool operator!=(const ShadowViewNodePair &rhs) const;
|
|
|
|
bool inOtherTree() const {
|
|
return this->otherTreePair != nullptr;
|
|
}
|
|
};
|
|
|
|
/*
|
|
* Describes pair of a `ShadowView` and a `ShadowNode`.
|
|
* This is not exposed to the mounting layer.
|
|
*
|
|
*/
|
|
struct ShadowViewNodePairLegacy final {
|
|
using OwningList = better::small_vector<
|
|
ShadowViewNodePairLegacy,
|
|
kShadowNodeChildrenSmallVectorSize>;
|
|
|
|
ShadowView shadowView;
|
|
ShadowNode const *shadowNode;
|
|
bool flattened{false};
|
|
bool isConcreteView{true};
|
|
|
|
size_t mountIndex{0};
|
|
|
|
bool inOtherTree{false};
|
|
|
|
/*
|
|
* The stored pointer to `ShadowNode` represents an identity of the pair.
|
|
*/
|
|
bool operator==(const ShadowViewNodePairLegacy &rhs) const;
|
|
bool operator!=(const ShadowViewNodePairLegacy &rhs) const;
|
|
};
|
|
|
|
} // namespace react
|
|
} // namespace facebook
|
|
|
|
namespace std {
|
|
|
|
template <>
|
|
struct hash<facebook::react::ShadowView> {
|
|
size_t operator()(const facebook::react::ShadowView &shadowView) const {
|
|
return folly::hash::hash_combine(
|
|
0,
|
|
shadowView.surfaceId,
|
|
shadowView.componentHandle,
|
|
shadowView.tag,
|
|
shadowView.props,
|
|
shadowView.eventEmitter,
|
|
shadowView.layoutMetrics,
|
|
shadowView.state);
|
|
}
|
|
};
|
|
|
|
} // namespace std
|