From 1d4cd2e2375ec2596c93a8bf706e3aadc33c2947 Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Thu, 12 Nov 2026 22:02:26 +0000 Subject: [PATCH] fix(fabric): select view platform headers by build destination Adapt the focused platform-dispatch repair from ff90a9b677 for current main. Preserve platform-relative CocoaPods and prebuild headers, remove SwiftPM host-based selection, and guard macOS translation units on other destinations. Related future-merge integration: #3058, #3104, #3105. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 33ea5c72-8bbd-448d-aa21-c9b99dd03c96 --- packages/react-native/Package.swift | 15 +-- .../ReactCommon/React-Fabric.podspec | 6 + .../components/view/HostPlatformTouch.h | 22 ++++ .../view/HostPlatformViewEventEmitter.h | 22 ++++ .../components/view/HostPlatformViewProps.h | 22 ++++ .../view/HostPlatformViewTraitsInitializer.h | 22 ++++ .../react/renderer/components/view/KeyEvent.h | 12 ++ .../renderer/components/view/MouseEvent.h | 12 ++ .../view/HostPlatformViewEventEmitter.cpp | 8 +- .../components/view/HostPlatformViewProps.cpp | 8 ++ .../ios-prebuild/__tests__/setup-test.js | 104 ++++++++++++++++++ .../scripts/ios-prebuild/setup.js | 47 +++++--- 12 files changed, 271 insertions(+), 29 deletions(-) create mode 100644 packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformTouch.h create mode 100644 packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewEventEmitter.h create mode 100644 packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewProps.h create mode 100644 packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewTraitsInitializer.h create mode 100644 packages/react-native/ReactCommon/react/renderer/components/view/KeyEvent.h create mode 100644 packages/react-native/ReactCommon/react/renderer/components/view/MouseEvent.h create mode 100644 packages/react-native/scripts/ios-prebuild/__tests__/setup-test.js diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift index dacb6f8beeef..6d2aa2a8fc4d 100644 --- a/packages/react-native/Package.swift +++ b/packages/react-native/Package.swift @@ -421,15 +421,6 @@ let reactCore = RNTarget( ) /// React-Fabric.podspec -// [macOS -#if os(macOS) -let reactFabricViewPlatformSources = ["components/view/platform/macos"] -let reactFabricViewPlatformExcludes = ["components/view/platform/cxx"] -#else -let reactFabricViewPlatformSources = ["components/view/platform/cxx"] -let reactFabricViewPlatformExcludes = ["components/view/platform/macos"] -#endif -// macOS] let reactFabric = RNTarget( name: .reactFabric, path: "ReactCommon/react/renderer", @@ -440,7 +431,7 @@ let reactFabric = RNTarget( "components/view/tests", "components/view/platform/android", "components/view/platform/windows", - // "components/view/platform/macos", // [macOS] + // [macOS] View dispatch headers select the destination, not the manifest host. "components/scrollview/tests", "components/scrollview/platform/android", "mounting/tests", @@ -465,9 +456,9 @@ let reactFabric = RNTarget( "components/virtualview", "components/virtualviewexperimental", "components/root/tests", - ] + reactFabricViewPlatformExcludes, // [macOS] + ], // [macOS] dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga], - sources: ["animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"] + reactFabricViewPlatformSources // [macOS] + sources: ["animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"] // [macOS] ) let reactFabricInputAccessory = RNTarget( diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index 6ab41bcf4134..d1abd14866cc 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -132,6 +132,12 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}" # [macOS] sss.exclude_files = "react/renderer/components/view/tests", "react/renderer/components/view/platform/android", "react/renderer/components/view/platform/windows" # [macOS] sss.header_dir = "react/renderer/components/view" + # [macOS Keep dispatch headers separate from the platform headers they include. + sss.header_mappings_dir = ENV['USE_FRAMEWORKS'] ? "./" : "react/renderer/components/view" + sss.osx.exclude_files = "react/renderer/components/view/platform/cxx/**/*.h" + sss.ios.exclude_files = "react/renderer/components/view/platform/macos/**/HostPlatform*.h" + sss.visionos.exclude_files = "react/renderer/components/view/platform/macos/**/HostPlatform*.h" + # macOS] end ss.subspec "scrollview" do |sss| diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformTouch.h b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformTouch.h new file mode 100644 index 000000000000..dacb710314b8 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformTouch.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// [macOS] + +#pragma once + +#if defined(__APPLE__) +#include +#endif + +#if defined(__ANDROID__) +#include "platform/android/react/renderer/components/view/HostPlatformTouch.h" +#elif defined(__APPLE__) && TARGET_OS_OSX +#include "platform/macos/react/renderer/components/view/HostPlatformTouch.h" +#else +#include "platform/cxx/react/renderer/components/view/HostPlatformTouch.h" +#endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewEventEmitter.h new file mode 100644 index 000000000000..83ac40eeffae --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewEventEmitter.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// [macOS] + +#pragma once + +#if defined(__APPLE__) +#include +#endif + +#if defined(__ANDROID__) +#include "platform/android/react/renderer/components/view/HostPlatformViewEventEmitter.h" +#elif defined(__APPLE__) && TARGET_OS_OSX +#include "platform/macos/react/renderer/components/view/HostPlatformViewEventEmitter.h" +#else +#include "platform/cxx/react/renderer/components/view/HostPlatformViewEventEmitter.h" +#endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewProps.h new file mode 100644 index 000000000000..9dca34cea540 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewProps.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// [macOS] + +#pragma once + +#if defined(__APPLE__) +#include +#endif + +#if defined(__ANDROID__) +#include "platform/android/react/renderer/components/view/HostPlatformViewProps.h" +#elif defined(__APPLE__) && TARGET_OS_OSX +#include "platform/macos/react/renderer/components/view/HostPlatformViewProps.h" +#else +#include "platform/cxx/react/renderer/components/view/HostPlatformViewProps.h" +#endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewTraitsInitializer.h b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewTraitsInitializer.h new file mode 100644 index 000000000000..321959c54c11 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/view/HostPlatformViewTraitsInitializer.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// [macOS] + +#pragma once + +#if defined(__APPLE__) +#include +#endif + +#if defined(__ANDROID__) +#include "platform/android/react/renderer/components/view/HostPlatformViewTraitsInitializer.h" +#elif defined(__APPLE__) && TARGET_OS_OSX +#include "platform/macos/react/renderer/components/view/HostPlatformViewTraitsInitializer.h" +#else +#include "platform/cxx/react/renderer/components/view/HostPlatformViewTraitsInitializer.h" +#endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/KeyEvent.h b/packages/react-native/ReactCommon/react/renderer/components/view/KeyEvent.h new file mode 100644 index 000000000000..4514fc55c453 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/view/KeyEvent.h @@ -0,0 +1,12 @@ +/* + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// [macOS] + +#pragma once + +#include "platform/macos/react/renderer/components/view/KeyEvent.h" diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/MouseEvent.h b/packages/react-native/ReactCommon/react/renderer/components/view/MouseEvent.h new file mode 100644 index 000000000000..cffdc4bec6bd --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/view/MouseEvent.h @@ -0,0 +1,12 @@ +/* + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// [macOS] + +#pragma once + +#include "platform/macos/react/renderer/components/view/MouseEvent.h" diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewEventEmitter.cpp index 5b8b18d67be7..f0932debb5f7 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewEventEmitter.cpp @@ -5,7 +5,11 @@ * LICENSE file in the root directory of this source tree. */ - // [macOS] +#if defined(__APPLE__) // [macOS +#include +#endif + +#if defined(__APPLE__) && TARGET_OS_OSX #include #include @@ -211,3 +215,5 @@ void HostPlatformViewEventEmitter::onDrop(const DragEvent& dragEvent) const { } } // namespace facebook::react + +#endif // macOS] diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.cpp index 4190d7a57e13..7fb74c5ec1ad 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.cpp @@ -5,6 +5,12 @@ * LICENSE file in the root directory of this source tree. */ +#if defined(__APPLE__) // [macOS +#include +#endif + +#if defined(__APPLE__) && TARGET_OS_OSX + #include "HostPlatformViewProps.h" #include @@ -160,3 +166,5 @@ void HostPlatformViewProps::setProp( } // namespace facebook::react + +#endif // macOS] diff --git a/packages/react-native/scripts/ios-prebuild/__tests__/setup-test.js b/packages/react-native/scripts/ios-prebuild/__tests__/setup-test.js new file mode 100644 index 000000000000..411c08ec0060 --- /dev/null +++ b/packages/react-native/scripts/ios-prebuild/__tests__/setup-test.js @@ -0,0 +1,104 @@ +/** + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + * @noflow + */ + +// [macOS] + +'use strict'; + +jest.mock( + '../../codegen/generate-artifacts-executor/generateFBReactNativeSpecIOS', + () => ({generateFBReactNativeSpecIOS: jest.fn()}), +); +jest.mock('../hermes', () => ({prepareHermesArtifactsAsync: jest.fn()})); +jest.mock('../reactNativeDependencies', () => ({ + prepareReactNativeDependenciesArtifactsAsync: jest.fn(), +})); +jest.mock('../utils', () => ({ + createFolderIfNotExists: jest.fn(), + createLogger: () => jest.fn(), +})); +jest.mock('child_process', () => ({execSync: jest.fn()})); +jest.mock('fs'); + +const {setup} = require('../setup'); +const fs = require('fs'); +const path = require('path'); + +test('stages canonical view headers and both relative platform trees in both namespaces, replacing stale links', async () => { + const root = '/rn'; + const headers = '/build/headers'; + const view = 'ReactCommon/react/renderer/components/view'; + const names = [ + 'HostPlatformViewProps.h', + 'HostPlatformViewTraitsInitializer.h', + ]; + const directories = new Map([ + [path.join(root, view), names], + [path.join(root, view, 'platform/cxx'), ['react/']], + [path.join(root, view, 'platform/macos'), ['react/']], + ]); + for (const platform of ['cxx', 'macos']) { + const base = path.join(root, view, 'platform', platform); + for (const [directory, entries] of [ + ['react', ['renderer/']], + ['react/renderer', ['components/']], + ['react/renderer/components', ['view/']], + ['react/renderer/components/view', names], + ]) { + directories.set(path.join(base, directory), entries); + } + } + const namespaces = [view, 'react/renderer/components/view']; + const linked = new Map( + namespaces.map(namespace => [ + path.join(headers, namespace, names[0]), + 'stale platform header', + ]), + ); + fs.readdirSync.mockImplementation(directory => + (directories.get(directory) ?? []).map(name => ({ + name: name.replace(/\/$/, ''), + isFile: () => !name.endsWith('/'), + isDirectory: () => name.endsWith('/'), + })), + ); + fs.existsSync.mockImplementation(file => linked.has(file)); + fs.linkSync.mockImplementation((source, target) => { + linked.set(target, source); + }); + fs.rmSync.mockImplementation(directory => { + for (const file of linked.keys()) { + if (file.startsWith(directory + path.sep)) { + linked.delete(file); + } + } + }); + + await setup(root, '/build', '1000.0.0', 'Debug'); + + for (const namespace of namespaces) { + for (const name of names) { + expect(linked.get(path.join(headers, namespace, name))).toBe( + path.join(root, view, name), + ); + for (const platform of ['cxx', 'macos']) { + const relative = path.join( + 'platform', + platform, + 'react/renderer/components/view', + name, + ); + expect(linked.get(path.join(headers, namespace, relative))).toBe( + path.join(root, view, relative), + ); + } + } + } +}); diff --git a/packages/react-native/scripts/ios-prebuild/setup.js b/packages/react-native/scripts/ios-prebuild/setup.js index f6a1905c1604..f89c42d2c73d 100644 --- a/packages/react-native/scripts/ios-prebuild/setup.js +++ b/packages/react-native/scripts/ios-prebuild/setup.js @@ -43,7 +43,11 @@ async function setup( * in the source path, it creates a link in the target path with an * underscore prefix. */ - const link = (fromPath /*:string*/, includePath /*:?string*/) => { + const link = ( + fromPath /*:string*/, + includePath /*:?string*/, + preserveStructure /*: boolean */ = false, // [macOS] + ) => { const source = path.resolve(root, fromPath); const target = path.resolve(linksFolder, includePath ?? fromPath); @@ -98,7 +102,15 @@ async function setup( // Create links for subfolders subfolders.forEach(folder => { - link(path.join(fromPath, String(folder)), includePath); + // [macOS + link( + path.join(fromPath, String(folder)), + preserveStructure + ? path.join(includePath ?? fromPath, String(folder)) + : includePath, + preserveStructure, + ); + // macOS] }); }; @@ -187,20 +199,23 @@ async function setup( link('ReactCommon/react/runtime/platform/ios', 'ReactCommon/react/runtime'); link('ReactCommon/jsitooling/react/runtime', 'ReactCommon/react/runtime'); link('ReactCommon/react/renderer/components/legacyviewmanagerinterop'); - link('ReactCommon/react/renderer/components/view'); - link( - 'ReactCommon/react/renderer/components/view/platform/cxx', - 'ReactCommon/react/renderer/components/view', - ); - // [macOS - link macOS-specific view platform headers - link( - 'ReactCommon/react/renderer/components/view/platform/macos', - 'ReactCommon/react/renderer/components/view', - ); - link( - 'ReactCommon/react/renderer/components/view/platform/macos', - 'react/renderer/components/view', - ); + // [macOS Preserve the dispatchers' relative platform includes in both namespaces. + const viewPath = 'ReactCommon/react/renderer/components/view'; + for (const includePath of [viewPath, 'react/renderer/components/view']) { + // Replace stale hard links from the previously flattened platform headers. + fs.rmSync(path.resolve(linksFolder, includePath), { + recursive: true, + force: true, + }); + link(viewPath, includePath); + for (const platform of ['cxx', 'macos']) { + link( + `${viewPath}/platform/${platform}`, + `${includePath}/platform/${platform}`, + true, + ); + } + } // macOS] link('ReactCommon/react/renderer/mounting'); link('ReactCommon/react/renderer/attributedstring');