Skip to content

Commit

Permalink
Include native module for DOM APIs by default in all apps using the n…
Browse files Browse the repository at this point in the history
…ew architecture (facebook#43653)

Summary:
Pull Request resolved: facebook#43653

Changelog: [internal]

This will allow us to clean up some code in `UIManager` (using methods in the native module instead) and prepare to use the DOM APIs in OSS behind a feature flag.

This doesn't enable the DOM APIs in OSS, only the native module.

Differential Revision: D55365252
  • Loading branch information
rubennorte authored and facebook-github-bot committed Mar 27, 2024
1 parent 028998e commit edda7e6
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 1 deletion.
5 changes: 5 additions & 0 deletions packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#else
#import <ReactCommon/RCTJscInstance.h>
#endif
#import <react/nativemodule/dom/NativeDOM.h>
#import <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
#import <react/nativemodule/microtasks/NativeMicrotasks.h>

Expand Down Expand Up @@ -219,6 +220,10 @@ - (Class)getModuleClassFromName:(const char *)name
return std::make_shared<facebook::react::NativeMicrotasks>(jsInvoker);
}

if (name == facebook::react::NativeDOM::kModuleName) {
return std::make_shared<facebook::react::NativeDOM>(jsInvoker);
}

return nullptr;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Pod::Spec.new do |s|
s.dependency "React-CoreModules"
s.dependency "React-nativeconfig"
s.dependency "ReactCodegen"
s.dependency "React-domnativemodule"
s.dependency "React-featureflagsnativemodule"
s.dependency "React-microtasksnativemodule"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ add_react_common_subdir(react/utils)
add_react_common_subdir(react/bridging)
add_react_common_subdir(react/renderer/mapbuffer)
add_react_common_subdir(react/nativemodule/core)
add_react_common_subdir(react/nativemodule/dom)
add_react_common_subdir(react/nativemodule/featureflags)
add_react_common_subdir(react/nativemodule/microtasks)
add_react_common_subdir(jserrorhandler)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ target_link_libraries(react_newarchdefaults
react_nativemodule_core
react_codegen_rncore
react_cxxreactpackage
react_nativemodule_dom
react_nativemodule_featureflags
react_nativemodule_microtasks
jsi)
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <algorithm>

#include <react/nativemodule/dom/NativeDOM.h>
#include <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
#include <react/nativemodule/microtasks/NativeMicrotasks.h>
#include <rncore.h>
Expand Down Expand Up @@ -83,6 +84,10 @@ std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
return std::make_shared<NativeMicrotasks>(jsInvoker);
}

if (name == NativeDOM::kModuleName) {
return std::make_shared<NativeDOM>(jsInvoker);
}

return nullptr;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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.

cmake_minimum_required(VERSION 3.13)
set(CMAKE_VERBOSE_MAKEFILE on)

add_compile_options(
-fexceptions
-frtti
-std=c++20
-Wall
-Wpedantic
-DLOG_TAG=\"ReactNative\")

file(GLOB react_nativemodule_dom_SRC CONFIGURE_DEPENDS *.cpp)
add_library(react_nativemodule_dom SHARED ${react_nativemodule_dom_SRC})

target_include_directories(react_nativemodule_dom PUBLIC ${REACT_COMMON_DIR})

target_link_libraries(react_nativemodule_dom
rrc_root
react_render_dom
react_render_uimanager
react_codegen_rncore
reactnative)
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <react/renderer/components/root/RootShadowNode.h>
#include <react/renderer/dom/DOM.h>
#include <react/renderer/uimanager/PointerEventsProcessor.h>
#include <react/renderer/uimanager/UIManager.h>
#include <react/renderer/uimanager/UIManagerBinding.h>

#ifdef RN_DISABLE_OSS_PLUGIN_HEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# 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.

require "json"

package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
version = package['version']

source = { :git => 'https://github.com/facebook/react-native.git' }
if version == '1000.0.0'
# This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
else
source[:tag] = "v#{version}"
end

header_search_paths = []

if ENV['USE_FRAMEWORKS']
header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the domnativemodule to access its own files
end

Pod::Spec.new do |s|
s.name = "React-domnativemodule"
s.version = version
s.summary = "React Native DOM native module"
s.homepage = "https://reactnative.dev/"
s.license = package["license"]
s.author = "Meta Platforms, Inc. and its affiliates"
s.platforms = min_supported_versions
s.source = source
s.source_files = "*.{cpp,h}"
s.header_dir = "react/nativemodule/dom"
s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
"HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS']
s.module_name = "React_domnativemodule"
s.header_mappings_dir = "../.."
end

install_modules_dependencies(s)

s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-Fabric/uimanager"
s.dependency "React-Fabric/dom"
s.dependency "React-Fabric/components/root"
end
1 change: 1 addition & 0 deletions packages/react-native/scripts/react_native_pods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ def use_react_native! (
pod 'React-featureflags', :path => "#{prefix}/ReactCommon/react/featureflags"
pod 'React-featureflagsnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/featureflags"
pod 'React-microtasksnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/microtasks"
pod 'React-domnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/dom"
pod 'React-Mapbuffer', :path => "#{prefix}/ReactCommon"
pod 'React-jserrorhandler', :path => "#{prefix}/ReactCommon/jserrorhandler"
pod 'React-nativeconfig', :path => "#{prefix}/ReactCommon"
Expand Down

0 comments on commit edda7e6

Please sign in to comment.