Skip to content

Commit 4ec16ec

Browse files
kligarskikligarski
committed
rename native components on iOS
1 parent 9bfc35c commit 4ec16ec

68 files changed

Lines changed: 623 additions & 632 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎android/src/main/jni/rnscreens.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
/**
88
* Note this import and that it is not present in autogenerated header file
99
* under android/build/generated/source/codegen/jni/rnscreens.h
10-
*
11-
* It is added here to make our custom symbols visible in autogenerated file with
12-
* code responsible for registering component descriptor providers. See that rncli.cpp,
10+
*
11+
* It is added here to make our custom symbols visible in autogenerated file with
12+
* code responsible for registering component descriptor providers. See that rncli.cpp,
1313
* located under <App>/android/app/build/generated/rncli/src/main/jni/rncli.cpp,
1414
* includes autogenerated rnscreens.h header by default. We change this behaviour
1515
* by appropriate include path configuration so that this header file gets included.
16-
*
16+
*
1717
* See: https://github.com/software-mansion/react-native-screens/pull/1585
1818
*/
1919
#include <react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h>
2020
#include <react/renderer/components/rnscreens/RNSModalScreenComponentDescriptor.h>
2121
#include <react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h>
2222
#include <react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h>
2323
#include <react/renderer/components/rnscreens/RNSFullWindowOverlayComponentDescriptor.h>
24-
#include <react/renderer/components/rnscreens/RNSBottomTabsComponentDescriptor.h>
24+
#include <react/renderer/components/rnscreens/RNSTabsHostComponentDescriptor.h>
2525
#include <react/renderer/components/rnscreens/RNSSafeAreaViewComponentDescriptor.h>
2626

2727
namespace facebook {

‎common/cpp/react/renderer/components/rnscreens/RNSBottomTabsAccessoryShadowNode.cpp‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎common/cpp/react/renderer/components/rnscreens/RNSBottomTabsShadowNode.cpp‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎common/cpp/react/renderer/components/rnscreens/RNSBottomTabsState.cpp‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

common/cpp/react/renderer/components/rnscreens/RNSBottomTabsAccessoryComponentDescriptor.h renamed to common/cpp/react/renderer/components/rnscreens/RNSTabsBottomAccessoryComponentDescriptor.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
#include <react/debug/react_native_assert.h>
44
#include <react/renderer/components/rnscreens/Props.h>
55
#include <react/renderer/core/ConcreteComponentDescriptor.h>
6-
#include "RNSBottomTabsAccessoryShadowNode.h"
6+
#include "RNSTabsBottomAccessoryShadowNode.h"
77

88
namespace facebook::react {
99

10-
class RNSBottomTabsAccessoryComponentDescriptor final
11-
: public ConcreteComponentDescriptor<RNSBottomTabsAccessoryShadowNode> {
10+
class RNSTabsBottomAccessoryComponentDescriptor final
11+
: public ConcreteComponentDescriptor<RNSTabsBottomAccessoryShadowNode> {
1212
public:
1313
using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
1414

1515
void adopt(ShadowNode &shadowNode) const override {
1616
react_native_assert(
17-
dynamic_cast<RNSBottomTabsAccessoryShadowNode *>(&shadowNode));
18-
auto &bottomTabsAccessoryShadowNode =
19-
static_cast<RNSBottomTabsAccessoryShadowNode &>(shadowNode);
17+
dynamic_cast<RNSTabsBottomAccessoryShadowNode *>(&shadowNode));
18+
auto &tabsBottomAccessoryShadowNode =
19+
static_cast<RNSTabsBottomAccessoryShadowNode &>(shadowNode);
2020

2121
auto state = std::static_pointer_cast<
22-
const RNSBottomTabsAccessoryShadowNode::ConcreteState>(
22+
const RNSTabsBottomAccessoryShadowNode::ConcreteState>(
2323
shadowNode.getState());
2424
auto stateData = state->getData();
2525

2626
if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
27-
bottomTabsAccessoryShadowNode.setSize(stateData.frameSize);
27+
tabsBottomAccessoryShadowNode.setSize(stateData.frameSize);
2828
}
2929

3030
ConcreteComponentDescriptor::adopt(shadowNode);

‎common/cpp/react/renderer/components/rnscreens/RNSTabsBottomAccessoryShadowNode.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#include "RNSTabsBottomAccessoryShadowNode.h"
2+
3+
namespace facebook::react {
4+
5+
extern const char RNSTabsBottomAccessoryComponentName[] =
6+
"RNSTabsBottomAccessory";
7+
8+
Point RNSTabsBottomAccessoryShadowNode::getContentOriginOffset(
9+
bool /*includeTransform*/) const {
10+
auto stateData = getStateData();
11+
return stateData.contentOffset;
12+
}
13+
14+
} // namespace facebook::react

common/cpp/react/renderer/components/rnscreens/RNSBottomTabsAccessoryShadowNode.h renamed to common/cpp/react/renderer/components/rnscreens/RNSTabsBottomAccessoryShadowNode.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
#include <react/renderer/components/rnscreens/EventEmitters.h>
55
#include <react/renderer/components/rnscreens/Props.h>
66
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
7-
#include "RNSBottomTabsAccessoryState.h"
7+
#include "RNSTabsBottomAccessoryState.h"
88

99
namespace facebook::react {
1010

11-
JSI_EXPORT extern const char RNSBottomTabsAccessoryComponentName[];
11+
JSI_EXPORT extern const char RNSTabsBottomAccessoryComponentName[];
1212

13-
class JSI_EXPORT RNSBottomTabsAccessoryShadowNode final
13+
class JSI_EXPORT RNSTabsBottomAccessoryShadowNode final
1414
: public ConcreteViewShadowNode<
15-
RNSBottomTabsAccessoryComponentName,
16-
RNSBottomTabsAccessoryProps,
17-
RNSBottomTabsAccessoryEventEmitter,
18-
RNSBottomTabsAccessoryState> {
15+
RNSTabsBottomAccessoryComponentName,
16+
RNSTabsBottomAccessoryProps,
17+
RNSTabsBottomAccessoryEventEmitter,
18+
RNSTabsBottomAccessoryState> {
1919
public:
2020
using ConcreteViewShadowNode::ConcreteViewShadowNode;
2121
using StateData = ConcreteViewShadowNode::ConcreteStateData;

common/cpp/react/renderer/components/rnscreens/RNSBottomTabsAccessoryState.h renamed to common/cpp/react/renderer/components/rnscreens/RNSTabsBottomAccessoryState.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
namespace facebook::react {
77

8-
class JSI_EXPORT RNSBottomTabsAccessoryState final {
8+
class JSI_EXPORT RNSTabsBottomAccessoryState final {
99
public:
10-
using Shared = std::shared_ptr<const RNSBottomTabsAccessoryState>;
10+
using Shared = std::shared_ptr<const RNSTabsBottomAccessoryState>;
1111

12-
RNSBottomTabsAccessoryState() {};
13-
RNSBottomTabsAccessoryState(Size frameSize_, Point contentOffset_)
12+
RNSTabsBottomAccessoryState() {};
13+
RNSTabsBottomAccessoryState(Size frameSize_, Point contentOffset_)
1414
: frameSize(frameSize_), contentOffset(contentOffset_) {};
1515

1616
const Size frameSize{};

common/cpp/react/renderer/components/rnscreens/RNSBottomTabsComponentDescriptor.h renamed to common/cpp/react/renderer/components/rnscreens/RNSTabsHostComponentDescriptor.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
#include <react/debug/react_native_assert.h>
77
#include <react/renderer/components/rnscreens/Props.h>
88
#include <react/renderer/core/ConcreteComponentDescriptor.h>
9-
#include "RNSBottomTabsShadowNode.h"
9+
#include "RNSTabsHostShadowNode.h"
1010

1111
namespace facebook::react {
1212

13-
class RNSBottomTabsComponentDescriptor final
14-
: public ConcreteComponentDescriptor<RNSBottomTabsShadowNode> {
13+
class RNSTabsHostComponentDescriptor final
14+
: public ConcreteComponentDescriptor<RNSTabsHostShadowNode> {
1515
public:
1616
using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
1717

1818
void adopt(ShadowNode &shadowNode) const override {
19-
react_native_assert(dynamic_cast<RNSBottomTabsShadowNode *>(&shadowNode));
19+
react_native_assert(dynamic_cast<RNSTabsHostShadowNode *>(&shadowNode));
2020

2121
ConcreteComponentDescriptor::adopt(shadowNode);
2222
#if !defined(ANDROID)
23-
auto &tabsShadowNode = static_cast<RNSBottomTabsShadowNode &>(shadowNode);
23+
auto &tabsShadowNode = static_cast<RNSTabsHostShadowNode &>(shadowNode);
2424
std::weak_ptr<void> imageLoader =
2525
contextContainer_->at<std::shared_ptr<void>>("RCTImageLoader");
2626
tabsShadowNode.setImageLoader(imageLoader);

‎common/cpp/react/renderer/components/rnscreens/RNSTabsHostShadowNode.cpp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include "RNSTabsHostShadowNode.h"
2+
3+
namespace facebook::react {
4+
5+
extern const char RNSTabsHostComponentName[] = "RNSTabsHost";
6+
7+
#if !defined(ANDROID)
8+
void RNSTabsHostShadowNode::setImageLoader(std::weak_ptr<void> imageLoader) {
9+
getStateDataMutable().setImageLoader(imageLoader);
10+
}
11+
12+
RNSTabsHostShadowNode::StateData &RNSTabsHostShadowNode::getStateDataMutable() {
13+
// We assume that this method is called to mutate the data, so we ensure
14+
// we're unsealed.
15+
ensureUnsealed();
16+
return const_cast<RNSTabsHostShadowNode::StateData &>(getStateData());
17+
}
18+
#endif // !ANDROID
19+
} // namespace facebook::react

0 commit comments

Comments
 (0)