Skip to content

[iOS] Fabric: Fixes Modal present splash when animation type is none #41853

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

Closed
zhongwuzw wants to merge 4 commits into from
Closed

[iOS] Fabric: Fixes Modal present splash when animation type is none #41853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
383d77f
[iOS] Fabric: Fixes Modal present splash when animation type is none
zhongwuzw Dec 8, 2023
a6e5702
Change to C function
zhongwuzw Mar 4, 2024
7d771e7
Merge commit '43d69ee26cbf4d4cc9b64aafbcdc32f3df0f27f9' into features…
zhongwuzw Jun 18, 2024
228d33b
Merge commit '12b64b78247f2db929c6d421262bdec1f6402e0b' into features…
zhongwuzw Jul 9, 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
1 change: 1 addition & 0 deletions packages/react-native/React/React-RCTFabric.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Pod::Spec.new do |s|
add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
"react/renderer/textlayoutmanager/platform/ios",
"react/renderer/components/textinput/platform/ios",
"react/renderer/components/modal/platform/ios",
]);

add_dependency(s, "React-nativeconfig")
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ Pod::Spec.new do |s|
header_search_path = header_search_path + [
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/modal/platform/ios\"",
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
]
end
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/React-FabricImage.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ if ENV['USE_FRAMEWORKS']
"\"$(PODS_TARGET_SRCROOT)\"",
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/modal/platform/ios\"",
# "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCodegen/ReactCodegen.framework/Headers\"",
]
end
Expand Down
15 changes: 14 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
#include <folly/dynamic.h>
#endif

#if defined(__APPLE__) && TARGET_OS_IOS
#include "ModalHostViewUtils.h"
#endif
Comment on lines 17 to 19
Copy link
Copy Markdown
Contributor

@cipolleschi cipolleschi Mar 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we can find a way to avoid this.

Copy link
Copy Markdown
Contributor Author

@zhongwuzw zhongwuzw Apr 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cipolleschi Emm, perhaps we should not share a common ModalHostViewState and instead have separate ModalHostViewStates for different platforms?


namespace facebook::react {

/*
Expand All @@ -23,7 +27,16 @@ class ModalHostViewState final {
public:
using Shared = std::shared_ptr<const ModalHostViewState>;

ModalHostViewState(){};
#if defined(__APPLE__) && TARGET_OS_IOS
static Size getScreenSize() {
auto screenSize = RCTModalHostViewScreenSize();
return {screenSize.width, screenSize.height};
}
ModalHostViewState() : screenSize(getScreenSize()) {
#else
ModalHostViewState(){
#endif
};
ModalHostViewState(Size screenSize_) : screenSize(screenSize_){};

#ifdef ANDROID
Expand Down
23 changes: 23 additions & 0 deletions ...nderer/components/modal/platform/ios/react/renderer/components/modal/ModalHostViewUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (c) Meta Platforms, Inc. and 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

#ifdef __cplusplus
extern "C" {
#endif

typedef struct {
CGFloat width;
CGFloat height;
} RCTSize;

RCTSize RCTModalHostViewScreenSize(void);

#ifdef __cplusplus
}
#endif
21 changes: 21 additions & 0 deletions ...derer/components/modal/platform/ios/react/renderer/components/modal/ModalHostViewUtils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#import "ModalHostViewUtils.h"
#import <Foundation/Foundation.h>
#import <React/RCTUtils.h>

extern "C" {

RCTSize RCTModalHostViewScreenSize(void)
{
CGSize screenSize = RCTScreenSize();

return {screenSize.width, screenSize.height};
}

} // namespace facebook::react