forked from facebook/react-native
-
Notifications
You must be signed in to change notification settings - Fork 149
feat(fabric): Add macOS host platform to ReactCommon #2690
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.
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
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5a6a4df
add host platform headers
Saadnajmi 19aa285
Add focus props
Saadnajmi a58b406
Add macOS props and events
Saadnajmi 9669157
fix casting issue
Saadnajmi 1a0b81a
uint8_t --> std::size_t
Saadnajmi 0f76473
PR feedback
Saadnajmi 7ca8960
remove comment
Saadnajmi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
...enderer/components/view/platform/macos/react/renderer/components/view/HostPlatformTouch.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
/* | ||
* 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 <react/renderer/components/view/BaseTouch.h> | ||
|
||
namespace facebook::react { | ||
using HostPlatformTouch = BaseTouch; | ||
} // namespace facebook::react |
24 changes: 24 additions & 0 deletions
24
...nents/view/platform/macos/react/renderer/components/view/HostPlatformViewEventEmitter.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/* | ||
* 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] | ||
|
||
#include <react/renderer/components/view/HostPlatformViewEventEmitter.h> | ||
|
||
namespace facebook::react { | ||
|
||
#pragma mark - Focus Events | ||
|
||
void HostPlatformViewEventEmitter::onFocus() const { | ||
dispatchEvent("focus"); | ||
} | ||
|
||
void HostPlatformViewEventEmitter::onBlur() const { | ||
dispatchEvent("blur"); | ||
} | ||
|
||
} // namespace facebook::react |
26 changes: 26 additions & 0 deletions
26
...ponents/view/platform/macos/react/renderer/components/view/HostPlatformViewEventEmitter.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/* | ||
* 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 <react/renderer/components/view/BaseViewEventEmitter.h> | ||
|
||
namespace facebook::react { | ||
|
||
class HostPlatformViewEventEmitter : public BaseViewEventEmitter { | ||
public: | ||
using BaseViewEventEmitter::BaseViewEventEmitter; | ||
|
||
#pragma mark - Focus Events | ||
|
||
void onFocus() const; | ||
void onBlur() const; | ||
}; | ||
|
||
} // namespace facebook::react |
86 changes: 86 additions & 0 deletions
86
...r/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
#include "HostPlatformViewProps.h" | ||
|
||
#include <algorithm> | ||
|
||
#include <react/featureflags/ReactNativeFeatureFlags.h> | ||
#include <react/renderer/components/view/conversions.h> | ||
#include <react/renderer/components/view/propsConversions.h> | ||
#include <react/renderer/core/graphicsConversions.h> | ||
#include <react/renderer/core/propsConversions.h> | ||
|
||
namespace facebook::react { | ||
|
||
HostPlatformViewProps::HostPlatformViewProps( | ||
const PropsParserContext& context, | ||
const HostPlatformViewProps& sourceProps, | ||
const RawProps& rawProps) | ||
: BaseViewProps(context, sourceProps, rawProps), | ||
macOSViewEvents( | ||
ReactNativeFeatureFlags::enableCppPropsIteratorSetter() | ||
? sourceProps.macOSViewEvents | ||
: convertRawProp( | ||
context, | ||
rawProps, | ||
sourceProps.macOSViewEvents, | ||
{})), | ||
focusable( | ||
ReactNativeFeatureFlags::enableCppPropsIteratorSetter() | ||
? sourceProps.focusable | ||
: convertRawProp( | ||
context, | ||
rawProps, | ||
"focusable", | ||
sourceProps.focusable, | ||
{})), | ||
enableFocusRing( | ||
ReactNativeFeatureFlags::enableCppPropsIteratorSetter() | ||
? sourceProps.enableFocusRing | ||
: convertRawProp( | ||
context, | ||
rawProps, | ||
"enableFocusRing", | ||
sourceProps.enableFocusRing, | ||
{})) {} | ||
|
||
#define MACOS_VIEW_EVENT_CASE(eventType) \ | ||
case CONSTEXPR_RAW_PROPS_KEY_HASH("on" #eventType): { \ | ||
const auto offset = MacOSViewEvents::Offset::eventType; \ | ||
MacOSViewEvents defaultViewEvents{}; \ | ||
bool res = defaultViewEvents[offset]; \ | ||
if (value.hasValue()) { \ | ||
fromRawValue(context, value, res); \ | ||
} \ | ||
macOSViewEvents[offset] = res; \ | ||
return; \ | ||
} | ||
|
||
void HostPlatformViewProps::setProp( | ||
const PropsParserContext& context, | ||
RawPropsPropNameHash hash, | ||
const char* propName, | ||
const RawValue& value) { | ||
// All Props structs setProp methods must always, unconditionally, | ||
// call all super::setProp methods, since multiple structs may | ||
// reuse the same values. | ||
BaseViewProps::setProp(context, hash, propName, value); | ||
|
||
static auto defaults = HostPlatformViewProps{}; | ||
|
||
switch (hash) { | ||
RAW_SET_PROP_SWITCH_CASE_BASIC(focusable); | ||
RAW_SET_PROP_SWITCH_CASE_BASIC(enableFocusRing); | ||
MACOS_VIEW_EVENT_CASE(Focus); | ||
MACOS_VIEW_EVENT_CASE(Blur); | ||
|
||
} | ||
} | ||
|
||
|
||
} // namespace facebook::react |
43 changes: 43 additions & 0 deletions
43
...rer/components/view/platform/macos/react/renderer/components/view/HostPlatformViewProps.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* 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 <react/renderer/components/view/BaseViewProps.h> | ||
#include <react/renderer/components/view/primitives.h> | ||
#include <react/renderer/core/Props.h> | ||
#include <react/renderer/core/PropsParserContext.h> | ||
|
||
#include "MacOSViewEvents.h" | ||
|
||
namespace facebook::react { | ||
|
||
class HostPlatformViewProps : public BaseViewProps { | ||
public: | ||
HostPlatformViewProps() = default; | ||
HostPlatformViewProps( | ||
const PropsParserContext& context, | ||
const HostPlatformViewProps& sourceProps, | ||
const RawProps& rawProps); | ||
|
||
void setProp( | ||
const PropsParserContext& context, | ||
RawPropsPropNameHash hash, | ||
const char* propName, | ||
const RawValue& value); | ||
|
||
MacOSViewEvents macOSViewEvents{}; | ||
|
||
#pragma mark - Props | ||
|
||
bool focusable{false}; | ||
bool enableFocusRing{true}; | ||
|
||
}; | ||
} // namespace facebook::react |
23 changes: 23 additions & 0 deletions
23
...ts/view/platform/macos/react/renderer/components/view/HostPlatformViewTraitsInitializer.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
#include <react/renderer/components/view/ViewProps.h> | ||
#include <react/renderer/core/ShadowNodeTraits.h> | ||
|
||
namespace facebook::react::HostPlatformViewTraitsInitializer { | ||
|
||
inline bool formsStackingContext(const ViewProps& props) { | ||
return false; | ||
} | ||
|
||
inline bool formsView(const ViewProps& props) { | ||
return props.focusable; | ||
} | ||
|
||
} // namespace facebook::react::HostPlatformViewTraitsInitializer |
60 changes: 60 additions & 0 deletions
60
.../renderer/components/view/platform/macos/react/renderer/components/view/MacOSViewEvents.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* 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 | ||
|
||
#include <react/renderer/core/PropsParserContext.h> | ||
#include <react/renderer/core/propsConversions.h> | ||
|
||
#include <bitset> | ||
|
||
namespace facebook::react { | ||
|
||
struct MacOSViewEvents { | ||
std::bitset<64> bits{}; | ||
Saadnajmi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
enum class Offset : std::size_t { | ||
// Focus Events | ||
Focus = 0, | ||
Blur = 1, | ||
}; | ||
|
||
constexpr bool operator[](const Offset offset) const { | ||
return bits[static_cast<std::size_t >(offset)]; | ||
} | ||
|
||
std::bitset<64>::reference operator[](const Offset offset) { | ||
return bits[static_cast<std::size_t >(offset)]; | ||
} | ||
}; | ||
|
||
inline static bool operator==(MacOSViewEvents const &lhs, MacOSViewEvents const &rhs) { | ||
return lhs.bits == rhs.bits; | ||
} | ||
|
||
inline static bool operator!=(MacOSViewEvents const &lhs, MacOSViewEvents const &rhs) { | ||
return lhs.bits != rhs.bits; | ||
} | ||
|
||
static inline MacOSViewEvents convertRawProp( | ||
const PropsParserContext &context, | ||
const RawProps &rawProps, | ||
const MacOSViewEvents &sourceValue, | ||
const MacOSViewEvents &defaultValue) { | ||
MacOSViewEvents result{}; | ||
using Offset = MacOSViewEvents::Offset; | ||
|
||
// Focus Events | ||
result[Offset::Focus] = | ||
convertRawProp(context, rawProps, "onFocus", sourceValue[Offset::Focus], defaultValue[Offset::Focus]); | ||
result[Offset::Blur] = | ||
convertRawProp(context, rawProps, "onBlur", sourceValue[Offset::Blur], defaultValue[Offset::Blur]); | ||
|
||
return result; | ||
} | ||
|
||
} // namespace facebook::react |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.