Skip to content

React Native 0.73.0 Support #454

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

Merged
merged 1 commit into from
Dec 1, 2023
Merged

React Native 0.73.0 Support #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions common/cpp/react/renderer/components/safeareacontext/RNCSafeAreaViewComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ namespace react {
class RNCSafeAreaViewComponentDescriptor final
: public ConcreteComponentDescriptor<RNCSafeAreaViewShadowNode> {
using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
void adopt(ShadowNode::Unshared const &shadowNode) const override {
auto concreteShadowNode =
std::static_pointer_cast<RNCSafeAreaViewShadowNode>(shadowNode);

concreteShadowNode->adjustLayoutWithState();
void adopt(ShadowNode& shadowNode) const override {
auto& concreteShadowNode =
static_cast<RNCSafeAreaViewShadowNode&>(shadowNode);
concreteShadowNode.adjustLayoutWithState();

ConcreteComponentDescriptor::adopt(shadowNode);
}
Expand Down
12 changes: 6 additions & 6 deletions common/cpp/react/renderer/components/safeareacontext/RNCSafeAreaViewShadowNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace react {

extern const char RNCSafeAreaViewComponentName[] = "RNCSafeAreaView";

inline YGValue valueFromEdges(YGStyle::Edges edges, YGEdge edge, YGEdge axis) {
inline YGValue valueFromEdges(yoga::Style::Edges edges, YGEdge edge, YGEdge axis) {
YGValue edgeValue = edges[edge];
if (edgeValue.unit != YGUnitUndefined) {
return edgeValue;
Expand Down Expand Up @@ -65,24 +65,24 @@ void RNCSafeAreaViewShadowNode::adjustLayoutWithState() {
valueFromEdges(props.yogaStyle.margin(), YGEdgeRight, YGEdgeHorizontal);
}

top = yogaStyleValueFromFloat(getEdgeValue(
top = yoga::CompactValue::ofMaybe<YGUnitPoint>(getEdgeValue(
edges.top,
stateData.insets.top,
(top.unit == YGUnitPoint ? top.value : 0)));
left = yogaStyleValueFromFloat(getEdgeValue(
left = yoga::CompactValue::ofMaybe<YGUnitPoint>(getEdgeValue(
edges.left,
stateData.insets.left,
(left.unit == YGUnitPoint ? left.value : 0)));
right = yogaStyleValueFromFloat(getEdgeValue(
right = yoga::CompactValue::ofMaybe<YGUnitPoint>(getEdgeValue(
edges.right,
stateData.insets.right,
(right.unit == YGUnitPoint ? right.value : 0)));
bottom = yogaStyleValueFromFloat(getEdgeValue(
bottom = yoga::CompactValue::ofMaybe<YGUnitPoint>(getEdgeValue(
edges.bottom,
stateData.insets.bottom,
(bottom.unit == YGUnitPoint ? bottom.value : 0)));

YGStyle adjustedStyle = getConcreteProps().yogaStyle;
yoga::Style adjustedStyle = getConcreteProps().yogaStyle;
if (props.mode == RNCSafeAreaViewMode::Padding) {
adjustedStyle.padding()[YGEdgeTop] = top;
adjustedStyle.padding()[YGEdgeLeft] = left;
Expand Down