Skip to content

Commit

Permalink
feat: add visionos support
Browse files Browse the repository at this point in the history
fix: address issues with scale, ScrollView prop

feat: move min_visionos_version_supported to Helpers

feat: implement `visionos_hoverStyle` prop

chore: update README.MD

fix: refactor visionos_hoverStyle to take a string and new arch support

docs: add link to rn-tester's README.md (#5)

chore: change VisionOS to visionOS (#13)

chore: use `min_supported_versions` for third-party-podspecs (#18)

chore: remove not necessary ifs TARGET_OS_VISION, minimise code diff (#22)

feat: add visionos support

# Conflicts:
#	README.md
#	packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
#	packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
#	packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
#	packages/react-native/Libraries/Text/Text/RCTTextView.mm
#	packages/react-native/React-Core.podspec
#	packages/react-native/React/CoreModules/RCTStatusBarManager.mm
#	packages/react-native/React/CoreModules/React-CoreModules.podspec
#	packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
#	packages/react-native/React/Views/RCTWrapperViewController.m
#	packages/react-native/scripts/cocoapods/helpers.rb
#	packages/rn-tester/Gemfile
#	packages/rn-tester/RNTester/AppDelegate.mm
#	packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
  • Loading branch information
okwasniewski committed Jan 31, 2024
1 parent cd7eb69 commit 8e24fae
Show file tree
Hide file tree
Showing 55 changed files with 1,081 additions and 197 deletions.
143 changes: 8 additions & 135 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,147 +1,20 @@
<h1 align="center">
<a href="https://reactnative.dev/">
React Native
React Native Vision OS
</a>
</h1>

<p align="center">
<strong>Learn once, write anywhere:</strong><br>
Build mobile apps with React.
Build spatial apps with React.
</p>

<p align="center">
<a href="https://github.com/facebook/react-native/blob/HEAD/LICENSE">
<img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="React Native is released under the MIT license." />
</a>
<a href="https://circleci.com/gh/facebook/react-native">
<img src="https://circleci.com/gh/facebook/react-native.svg?style=shield" alt="Current CircleCI build status." />
</a>
<a href="https://www.npmjs.org/package/react-native">
<img src="https://img.shields.io/npm/v/react-native?color=brightgreen&label=npm%20package" alt="Current npm package version." />
</a>
<a href="https://reactnative.dev/docs/contributing">
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome!" />
</a>
<a href="https://twitter.com/intent/follow?screen_name=reactnative">
<img src="https://img.shields.io/twitter/follow/reactnative.svg?label=Follow%20@reactnative" alt="Follow @reactnative" />
</a>
</p>

<h3 align="center">
<a href="https://reactnative.dev/docs/getting-started">Getting Started</a>
<span> · </span>
<a href="https://reactnative.dev/docs/tutorial">Learn the Basics</a>
<span> · </span>
<a href="https://reactnative.dev/showcase">Showcase</a>
<span> · </span>
<a href="https://reactnative.dev/docs/contributing">Contribute</a>
<span> · </span>
<a href="https://reactnative.dev/help">Community</a>
<span> · </span>
<a href="https://github.com/facebook/react-native/blob/HEAD/.github/SUPPORT.md">Support</a>
</h3>

React Native brings [**React**'s][r] declarative UI framework to iOS and Android. With React Native, you use native UI controls and have full access to the native platform.

- **Declarative.** React makes it painless to create interactive UIs. Declarative views make your code more predictable and easier to debug.
- **Component-Based.** Build encapsulated components that manage their state, then compose them to make complex UIs.
- **Developer Velocity.** See local changes in seconds. Changes to JavaScript code can be live reloaded without rebuilding the native app.
- **Portability.** Reuse code across iOS, Android, and [other platforms][p].

React Native is developed and supported by many companies and individual core contributors. Find out more in our [ecosystem overview][e].

[r]: https://react.dev/
[p]: https://reactnative.dev/docs/out-of-tree-platforms
[e]: https://github.com/facebook/react-native/blob/HEAD/ECOSYSTEM.md

## Contents

- [Requirements](#-requirements)
- [Building your first React Native app](#-building-your-first-react-native-app)
- [Documentation](#-documentation)
- [Upgrading](#-upgrading)
- [How to Contribute](#-how-to-contribute)
- [Code of Conduct](#code-of-conduct)
- [License](#-license)


## 📋 Requirements

React Native apps may target iOS 13.4 and Android 5.0 (API 21) or newer. You may use Windows, macOS, or Linux as your development operating system, though building and running iOS apps is limited to macOS. Tools like [Expo](https://expo.dev) can be used to work around this.

## 🎉 Building your first React Native app

Follow the [Getting Started guide](https://reactnative.dev/docs/getting-started). The recommended way to install React Native depends on your project. Here you can find short guides for the most common scenarios:

- [Trying out React Native][hello-world]
- [Creating a New Application][new-app]
- [Adding React Native to an Existing Application][existing]

[hello-world]: https://snack.expo.dev/@samples/hello-world
[new-app]: https://reactnative.dev/docs/getting-started
[existing]: https://reactnative.dev/docs/integration-with-existing-apps

## 📖 Documentation

The full documentation for React Native can be found on our [website][docs].

The React Native documentation discusses components, APIs, and topics that are specific to React Native. For further documentation on the React API that is shared between React Native and React DOM, refer to the [React documentation][r-docs].

The source for the React Native documentation and website is hosted on a separate repo, [**@facebook/react-native-website**][repo-website].

[docs]: https://reactnative.dev/docs/getting-started
[r-docs]: https://react.dev/learn
[repo-website]: https://github.com/facebook/react-native-website

## 🚀 Upgrading

Upgrading to new versions of React Native may give you access to more APIs, views, developer tools, and other goodies. See the [Upgrading Guide][u] for instructions.

React Native releases are discussed [in this discussion repo](https://github.com/reactwg/react-native-releases/discussions).

[u]: https://reactnative.dev/docs/upgrading
[repo-releases]: https://github.com/react-native-community/react-native-releases

## 👏 How to Contribute

The main purpose of this repository is to continue evolving React Native core. We want to make contributing to this project as easy and transparent as possible, and we are grateful to the community for contributing bug fixes and improvements. Read below to learn how you can take part in improving React Native.

### [Code of Conduct][code]

Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
Please read the [full text][code] so that you can understand what actions will and will not be tolerated.

[code]: https://code.fb.com/codeofconduct/

### [Contributing Guide][contribute]

Read our [**Contributing Guide**][contribute] to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to React Native.

[contribute]: https://reactnative.dev/docs/contributing

### [Open Source Roadmap][roadmap]

You can learn more about our vision for React Native in the [**Roadmap**][roadmap].

[roadmap]: https://github.com/facebook/react-native/wiki/Roadmap

### Good First Issues

We have a list of [good first issues][gfi] that contain bugs which have a relatively limited scope. This is a great place to get started, gain experience, and get familiar with our contribution process.

[gfi]: https://github.com/facebook/react-native/labels/good%20first%20issue

### Discussions

Larger discussions and proposals are discussed in [**@react-native-community/discussions-and-proposals**][repo-meta].

[repo-meta]: https://github.com/react-native-community/discussions-and-proposals

## 📄 License
React Native Vision OS allows you to write visionOS with full support for platform SDK. This is a full fork of the main repository with changes needed to support visionOS.

React Native is MIT licensed, as found in the [LICENSE][l] file.
This project is still at an early stage of development and is not ready for production use.

React Native documentation is Creative Commons licensed, as found in the [LICENSE-docs][ld] file.
## Contributing

[l]: https://github.com/facebook/react-native/blob/main/LICENSE
[ld]: https://github.com/facebook/react-native/blob/main/LICENSE-docs
1. Download latest Xcode beta [here](https://developer.apple.com/xcode/).
2. Install visionOS Simulator runtime.
3. Follow the same steps as for running iOS defined in [packages/rn-tester/README.md](./packages/rn-tester/README.md)
27 changes: 27 additions & 0 deletions packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#import <React/RCTSurfacePresenterBridgeAdapter.h>
#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
#import "RCTAppSetupUtils.h"
#import <React/RCTUtils.h>
#import "RCTLegacyInteropComponents.h"

#if RCT_NEW_ARCH_ENABLED
Expand Down Expand Up @@ -49,6 +50,21 @@ @interface RCTAppDelegate () <

#endif

#if TARGET_OS_VISION
@interface GlassViewController : UIViewController

@end

@implementation GlassViewController

- (UIContainerBackgroundStyle)preferredContainerBackgroundStyle {
return UIContainerBackgroundStyleGlass;
}

@end
#endif


static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabricEnabled)
{
#ifdef RCT_NEW_ARCH_ENABLED
Expand Down Expand Up @@ -136,7 +152,14 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

rootView = [self createRootViewWithBridge:self.bridge moduleName:self.moduleName initProps:initProps];
}

[self customizeRootView:(RCTRootView *)rootView];
#if TARGET_OS_VISION
self.window = [[UIWindow alloc] initWithFrame:RCTForegroundWindow().bounds];
#else
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
#endif

UIViewController *rootViewController = [self createRootViewController];
[self setRootView:rootView toRootViewController:rootViewController];
self.window.rootViewController = rootViewController;
Expand Down Expand Up @@ -180,7 +203,11 @@ - (UIView *)createRootViewWithBridge:(RCTBridge *)bridge

- (UIViewController *)createRootViewController
{
#if TARGET_OS_VISION
return [GlassViewController new];
#else
return [UIViewController new];
#endif
}

- (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type {
AccessibilityState,
AccessibilityValue,
} from '../View/ViewAccessibility';
import type {HoverEffect} from '../View/ViewPropTypes';

import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
import usePressability from '../../Pressability/usePressability';
Expand All @@ -32,12 +33,18 @@ import useAndroidRippleForView, {
import * as React from 'react';
import {useImperativeHandle, useMemo, useRef, useState} from 'react';

const defaultHoverEffect: HoverEffect = 'highlight';

type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;

export type StateCallbackType = $ReadOnly<{|
pressed: boolean,
|}>;

type VisionOSProps = $ReadOnly<{|
visionos_hoverEffect?: ?HoverEffect,
|}>;

type Props = $ReadOnly<{|
/**
* Accessibility.
Expand Down Expand Up @@ -193,6 +200,10 @@ type Props = $ReadOnly<{|
* https://github.com/facebook/react-native/issues/34424
*/
'aria-label'?: ?string,
/**
* Props needed for visionOS.
*/
...VisionOSProps,
|}>;

/**
Expand Down Expand Up @@ -232,6 +243,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
style,
testOnly_pressed,
unstable_pressDelay,
visionos_hoverEffect = defaultHoverEffect,
...restProps
} = props;

Expand Down Expand Up @@ -341,7 +353,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
{...eventHandlers}
ref={mergedRef}
style={typeof style === 'function' ? style({pressed}) : style}
collapsable={false}>
collapsable={false}
visionos_hoverEffect={visionos_hoverEffect}>
{typeof children === 'function' ? children({pressed}) : children}
{__DEV__ ? <PressabilityDebugView color="red" hitSlop={hitSlop} /> : null}
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

import type {ColorValue} from '../../StyleSheet/StyleSheet';
import type {HoverEffect} from '../View/ViewPropTypes';
import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';

import View from '../../Components/View/View';
Expand All @@ -32,10 +33,15 @@ type IOSProps = $ReadOnly<{|
hasTVPreferredFocus?: ?boolean,
|}>;

type VisionOSProps = $ReadOnly<{|
hoverEffect?: ?HoverEffect,
|}>;

type Props = $ReadOnly<{|
...React.ElementConfig<TouchableWithoutFeedback>,
...AndroidProps,
...IOSProps,
...VisionOSProps,

activeOpacity?: ?number,
underlayColor?: ?ColorValue,
Expand Down Expand Up @@ -341,6 +347,7 @@ class TouchableHighlight extends React.Component<Props, State> {
nextFocusLeft={this.props.nextFocusLeft}
nextFocusRight={this.props.nextFocusRight}
nextFocusUp={this.props.nextFocusUp}
visionos_hoverEffect={this.props.hoverEffect}
focusable={
this.props.focusable !== false && this.props.onPress !== undefined
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type * as React from 'react';
import {Constructor} from '../../../types/private/Utilities';
import {TimerMixin} from '../../../types/private/TimerMixin';
import {NativeMethods} from '../../../types/public/ReactNativeTypes';
import {TVParallaxProperties} from '../View/ViewPropTypes';
import {HoverEffect, TVParallaxProperties} from '../View/ViewPropTypes';
import {TouchableMixin} from './Touchable';
import {TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback';

Expand Down Expand Up @@ -86,6 +86,11 @@ export interface TouchableOpacityProps
* @platform android
*/
tvParallaxProperties?: TVParallaxProperties | undefined;

/**
* Hover style to apply to the view. Only supported on visionOS.
*/
visionos_hoverEffect?: HoverEffect | undefined;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
import type {HoverEffect} from '../View/ViewPropTypes';
import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';

import Animated from '../../Animated/Animated';
Expand All @@ -21,6 +22,8 @@ import flattenStyle from '../../StyleSheet/flattenStyle';
import Platform from '../../Utilities/Platform';
import * as React from 'react';

const defaultHoverEffect: HoverEffect = 'highlight';

type TVProps = $ReadOnly<{|
hasTVPreferredFocus?: ?boolean,
nextFocusDown?: ?number,
Expand All @@ -30,9 +33,14 @@ type TVProps = $ReadOnly<{|
nextFocusUp?: ?number,
|}>;

type VisionOSProps = $ReadOnly<{|
visionos_hoverEffect?: ?HoverEffect,
|}>;

type Props = $ReadOnly<{|
...React.ElementConfig<TouchableWithoutFeedback>,
...TVProps,
...VisionOSProps,

activeOpacity?: ?number,
style?: ?ViewStyleProp,
Expand Down Expand Up @@ -130,6 +138,10 @@ type State = $ReadOnly<{|
*
*/
class TouchableOpacity extends React.Component<Props, State> {
static defaultProps: {|visionos_hoverEffect: HoverEffect|} = {
visionos_hoverEffect: defaultHoverEffect,
};

state: State = {
anim: new Animated.Value(this._getChildStyleOpacityWithDefault()),
pressability: new Pressability(this._createPressabilityConfig()),
Expand Down Expand Up @@ -286,6 +298,7 @@ class TouchableOpacity extends React.Component<Props, State> {
nextFocusUp={this.props.nextFocusUp}
hasTVPreferredFocus={this.props.hasTVPreferredFocus}
hitSlop={this.props.hitSlop}
visionos_hoverEffect={this.props.visionos_hoverEffect}
focusable={
this.props.focusable !== false && this.props.onPress !== undefined
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {LayoutChangeEvent, PointerEvents} from '../../Types/CoreEventTypes';
import {Touchable} from '../Touchable/Touchable';
import {AccessibilityProps} from './ViewAccessibility';

export type HoverEffect = 'lift' | 'highlight';

export type TVParallaxProperties = {
/**
* If true, parallax effects are enabled. Defaults to true.
Expand Down Expand Up @@ -122,6 +124,10 @@ export interface ViewPropsIOS extends TVViewPropsIOS {
* Test and measure when using this property.
*/
shouldRasterizeIOS?: boolean | undefined;
/**
* Hover style to apply to the view. Only supported on visionOS.
*/
visionos_hoverEffect?: HoverEffect | undefined;
}

export interface ViewPropsAndroid {
Expand Down
Loading

0 comments on commit 8e24fae

Please sign in to comment.