Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/samples/NativeModule…
Browse files Browse the repository at this point in the history
…Sample/cppwinrt/react-devtools-core-4.28.4
  • Loading branch information
marlenecota authored Jan 10, 2024
2 parents b981012 + badc498 commit 7136656
Show file tree
Hide file tree
Showing 256 changed files with 15,199 additions and 13,886 deletions.
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Remember to call `react-native init` from the place you want your project direct

<!-- 1. For the next version (i.e. in docs/getting-started.md) use "nightly" -->
<!-- 2. For the latest stable version in versioned_docs use "latest" -->
<!-- 3. For older stable versions use the stable tag name, i.e. "0.72-stable" -->
<!-- 3. For older stable versions use the stable tag name, i.e. "0.73-stable" -->

<!-- See https://www.npmjs.com/package/react-native?activeTab=versions for the RN version tags. -->

Expand Down
6 changes: 3 additions & 3 deletions docs/hermes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ To learn more about what it is and how to use it, check out the [React Native](h

## Hermes on Windows:

Hermes is experimentally supported on Windows, generally providing better performance characteristics than the default Chakra engine.
Hermes is supported on Windows, generally providing better performance characteristics than the default Chakra engine.

### Enabling Hermes for new projects

Pass the `--useHermes` flag to `react-native-windows-init` when creating a new project. This will set up your project to use the Hermes engine and to generate bundles as Hermes bytecode instead of JavaScript.
Hermes is enabled by default for React Native Windows project.

### Using Hermes in an existing project

Expand All @@ -30,7 +30,7 @@ Set the `UseHermes` property to `true` in the `ExperimentalFeatures.props` file

### Disabling Hermes

Set the `UseHermes` property to `false` in the `ExperimentalFeatures.props` file in your project's `windows` directory:
To revert back to using Chakra, set the `UseHermes` property to `false` in the `ExperimentalFeatures.props` file in your project's `windows` directory:

```xml
<PropertyGroup Label="Microsoft.ReactNative Experimental Features">
Expand Down
16 changes: 16 additions & 0 deletions docs/native-api/AccessibilityStateCheckedValue-api-windows.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
id: AccessibilityStateCheckedValue
title: AccessibilityStateCheckedValue
---

Kind: `enum`

| Name | Value | Description |
|--|--|--|
|`Unchecked` | 0x0 | |
|`Checked` | 0x1 | |
|`Mixed` | 0x2 | |


## Referenced by
- [`DynamicAutomationProperties`](DynamicAutomationProperties)
8 changes: 3 additions & 5 deletions docs/native-api/AccessibilityStates-api-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Kind: `enum`
|`Selected` | 0x0 | |
|`Disabled` | 0x1 | |
|`Checked` | 0x2 | |
|`Unchecked` | 0x3 | |
|`Busy` | 0x4 | |
|`Expanded` | 0x5 | |
|`Collapsed` | 0x6 | |
|`CountStates` | 0x7 | |
|`Busy` | 0x3 | |
|`Expanded` | 0x4 | |
|`CountStates` | 0x5 | |
30 changes: 2 additions & 28 deletions docs/native-api/DynamicAutomationProperties-api-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ Kind: `class`
### AccessibilityStateCheckedProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `AccessibilityStateCheckedProperty`

### AccessibilityStateCollapsedProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `AccessibilityStateCollapsedProperty`

### AccessibilityStateDisabledProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `AccessibilityStateDisabledProperty`

Expand All @@ -38,9 +35,6 @@ Kind: `class`
### AccessibilityStateSelectedProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `AccessibilityStateSelectedProperty`

### AccessibilityStateUncheckedProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `AccessibilityStateUncheckedProperty`

### AccessibilityValueMaxProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `AccessibilityValueMaxProperty`

Expand Down Expand Up @@ -82,12 +76,7 @@ Kind: `class`


### GetAccessibilityStateChecked
`static` bool **`GetAccessibilityStateChecked`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element)



### GetAccessibilityStateCollapsed
`static` bool **`GetAccessibilityStateCollapsed`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element)
`static` [`AccessibilityStateCheckedValue`](AccessibilityStateCheckedValue) **`GetAccessibilityStateChecked`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element)



Expand All @@ -106,11 +95,6 @@ Kind: `class`



### GetAccessibilityStateUnchecked
`static` bool **`GetAccessibilityStateUnchecked`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element)



### GetAccessibilityValueMax
`static` double **`GetAccessibilityValueMax`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element)

Expand Down Expand Up @@ -157,12 +141,7 @@ Kind: `class`


### SetAccessibilityStateChecked
`static` void **`SetAccessibilityStateChecked`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element, bool value)



### SetAccessibilityStateCollapsed
`static` void **`SetAccessibilityStateCollapsed`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element, bool value)
`static` void **`SetAccessibilityStateChecked`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element, [`AccessibilityStateCheckedValue`](AccessibilityStateCheckedValue) value)



Expand All @@ -181,11 +160,6 @@ Kind: `class`



### SetAccessibilityStateUnchecked
`static` void **`SetAccessibilityStateUnchecked`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element, bool value)



### SetAccessibilityValueMax
`static` void **`SetAccessibilityValueMax`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element, double value)

Expand Down
2 changes: 1 addition & 1 deletion docs/native-api/IRedBoxHandler-api-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MyRedBoxHandler : IRedBoxHandler
}

public void ShowNewError(IRedBoxErrorInfo info, RedBoxErrorType type) {
// Dont report non-fatal errors (optional)
// Do not report non-fatal errors (optional)
if (type != RedBoxErrorType.JavaScriptSoft)
ReportErrorToMyErrorReportingSystem(info, type);

Expand Down
12 changes: 10 additions & 2 deletions docs/native-api/QuirkSettings-api-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ By default `react-native-windows` will handle various back events and forward th




### SetMapWindowDeactivatedToAppStateInactive
`static` void **`SetMapWindowDeactivatedToAppStateInactive`**([`ReactInstanceSettings`](ReactInstanceSettings) settings, bool value)

Expand Down Expand Up @@ -65,14 +64,23 @@ When running multiple windows from a single UI thread, focusing a native view ca



### SetUseRuntimeScheduler
`static` void **`SetUseRuntimeScheduler`**([`ReactInstanceSettings`](ReactInstanceSettings) settings, bool value)

> **EXPERIMENTAL**
By default `react-native-windows` will use the new RuntimeScheduler.Setting this to false will revert the behavior to previous scheduling logic.



### SetUseWebFlexBasisBehavior
`static` void **`SetUseWebFlexBasisBehavior`**([`ReactInstanceSettings`](ReactInstanceSettings) settings, bool value)

> **EXPERIMENTAL**
**Default value**: `false`

There is a chance that cached flex basis values can cause text truncation in some re-layout scenarios. Enabling [Yoga](https://github.com/facebook/yoga)'s experimental web flex basis behavior fixes this issue, however using it may result in perfomance regressions due to additional layout passes.
There is a chance that cached flex basis values can cause text truncation in some re-layout scenarios. Enabling [Yoga](https://github.com/facebook/yoga)'s experimental web flex basis behavior fixes this issue, however using it may result in performance regressions due to additional layout passes.



Expand Down
7 changes: 7 additions & 0 deletions docs/native-api/ReactPointerEventArgs-api-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ Kind: `class`
Event arguments wrapper for [`IViewManagerWithPointerEvents`](IViewManagerWithPointerEvents).

## Properties
### AllowUncaptured
bool `AllowUncaptured`

> **EXPERIMENTAL**
Gets or sets a flag that allows the ReactRootView to handle pointer events even when it does not capture the pointer. This is particularly useful for view managers that seek to capture the pointer to handle move events for a gesture (e.g., dragging), but conditionally may allow the ReactRootView to emit events (e.g., if the [`PointerEventKind.End`](PointerEventKind) event is received before a drag threshold is hit.

### Args
`readonly` [`PointerRoutedEventArgs`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Input.PointerRoutedEventArgs) `Args`

Expand Down
27 changes: 1 addition & 26 deletions docs/native-api/ViewPanel-api-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,17 @@ title: ViewPanel

Kind: `class`

Extends: [`Panel`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Controls.Panel)
Extends: [`Grid`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Controls.Grid)



## Properties
### BorderBrush
[`Brush`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Media.Brush) `BorderBrush`

### BorderBrushProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `BorderBrushProperty`

### BorderThickness
[`Thickness`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Thickness) `BorderThickness`

### BorderThicknessProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `BorderThicknessProperty`

### ClipChildren
bool `ClipChildren`

### ClipChildrenProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `ClipChildrenProperty`

### CornerRadius
[`CornerRadius`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.CornerRadius) `CornerRadius`

### CornerRadiusProperty
`static` `readonly` [`DependencyProperty`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.DependencyProperty) `CornerRadiusProperty`

Expand Down Expand Up @@ -60,21 +45,11 @@ void **`Clear`**()



### FinalizeProperties
void **`FinalizeProperties`**()



### GetLeft
`static` double **`GetLeft`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element)



### GetOuterBorder
[`Border`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Controls.Border) **`GetOuterBorder`**()



### GetTop
`static` double **`GetTop`**([`UIElement`](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.UIElement) element)

Expand Down
1 change: 1 addition & 0 deletions docs/native-api/index-api-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ sidebar_label: Full reference

## Enums
- [`AccessibilityRoles`](AccessibilityRoles)
- [`AccessibilityStateCheckedValue`](AccessibilityStateCheckedValue)
- [`AccessibilityStates`](AccessibilityStates)
- [`AccessibilityValue`](AccessibilityValue)
- [`BackNavigationHandlerKind`](BackNavigationHandlerKind)
Expand Down
2 changes: 1 addition & 1 deletion docs/rnm-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ For information around how to set up:
Remember to call `react-native init` from the place you want your project directory to live. Be sure to use the same minor version between React Native and React Native macOS. We'll use `^0.71.0`

```
npx react-native@latest init <projectName> --template "react-native@^0.71.0"
npx react-native@latest init <projectName> --version 0.71.0
```

### Navigate into this newly created directory
Expand Down
6 changes: 3 additions & 3 deletions samples-old/TodosFeed/TodosFeed/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6093,9 +6093,9 @@ rc@^1.2.7:
strip-json-comments "~2.0.1"

react-devtools-core@^4.0.6:
version "4.16.0"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.16.0.tgz#c640ab15b98d077bc47f10f84fc8ed3633f537bd"
integrity sha512-fqyVbp+wVVey6O4uVBk5s3J/vTiPludp7lulr6a8asTBm7DIA0vLBbjmAOLCnOlkWcgdy4mjsqOgNCbu8uICWw==
version "4.28.4"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.28.4.tgz#fb8183eada77093f4c2f9830e664bf22255abe27"
integrity sha512-IUZKLv3CimeM07G3vX4H4loxVpByrzq3HvfTX7v9migalwvLs9ZY5D3S3pKR33U+GguYfBBdMMZyToFhsSE/iQ==
dependencies:
shell-quote "^1.6.1"
ws "^7"
Expand Down
6 changes: 3 additions & 3 deletions samples-old/rssreader/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5321,9 +5321,9 @@ range-parser@~1.2.1:
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==

react-devtools-core@^4.0.6:
version "4.7.0"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.7.0.tgz#71e89087352abe60c160dfb60a7fa700f612af7a"
integrity sha512-6w/e0nkV0gogUnfz+9Q3yiMtYYol9T+oD27UIf4XWmula1KvSTTkQ9DnzLOqSSch8d1YzNWbTxguuNJMof58ww==
version "4.28.4"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.28.4.tgz#fb8183eada77093f4c2f9830e664bf22255abe27"
integrity sha512-IUZKLv3CimeM07G3vX4H4loxVpByrzq3HvfTX7v9migalwvLs9ZY5D3S3pKR33U+GguYfBBdMMZyToFhsSE/iQ==
dependencies:
shell-quote "^1.6.1"
ws "^7"
Expand Down
6 changes: 3 additions & 3 deletions samples/AppServiceDemo/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6688,9 +6688,9 @@ range-parser@~1.2.1:
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==

react-devtools-core@^4.26.1:
version "4.27.4"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.27.4.tgz#987f678a0e6658fd6f8fa0b8b2be191cf6984b68"
integrity sha512-dvZjrAJjahd6NNl7dDwEk5TyHsWJxDpYL7VnD9jdEr98EEEsVhw9G8JDX54Nrb3XIIOBlJDpjo3AuBuychX9zg==
version "4.28.4"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.28.4.tgz#fb8183eada77093f4c2f9830e664bf22255abe27"
integrity sha512-IUZKLv3CimeM07G3vX4H4loxVpByrzq3HvfTX7v9migalwvLs9ZY5D3S3pKR33U+GguYfBBdMMZyToFhsSE/iQ==
dependencies:
shell-quote "^1.6.1"
ws "^7"
Expand Down
2 changes: 1 addition & 1 deletion samples/Calculator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This sample showcases the usage of React Native for Windows to build a simple calculator. It includes implementations in C# and C++/WinRT.

It currently targets React Native Windows 0.72.
It currently targets React Native Windows 0.73.

### Setup
First, make sure you've met the [React Native Windows System Requirements](https://microsoft.github.io/react-native-windows/docs/rnw-dependencies).
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion samples/Calculator/cppwinrt/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem 'cocoapods', '~> 1.12'
gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
2 changes: 1 addition & 1 deletion samples/Calculator/cppwinrt/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ See [../README.md](../README.md) for details of this sample.

See [../csharp/](../csharp/) for a C# version of this sample.

It currently targets React Native Windows 0.72.
It currently targets React Native Windows 0.73.

### Setup
See [../README.md#Setup](../README.md#Setup).
Expand Down
2 changes: 1 addition & 1 deletion samples/Calculator/cppwinrt/__tests__/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'react-native';
import React from 'react';
import App from '../App';

// Note: import explicitly to use the types shiped with jest.
// Note: import explicitly to use the types shipped with jest.
import {it} from '@jest/globals';

// Note: test renderer must be required after react-native.
Expand Down
12 changes: 4 additions & 8 deletions samples/Calculator/cppwinrt/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "com.android.application"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "com.facebook.react"

/**
Expand Down Expand Up @@ -70,8 +71,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'

android {
ndkVersion rootProject.ext.ndkVersion

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdk rootProject.ext.compileSdkVersion

namespace "com.calculator"
defaultConfig {
Expand Down Expand Up @@ -106,13 +107,8 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
implementation("com.facebook.react:flipper-integration")

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.squareup.okhttp3', module:'okhttp'
}

debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application
android:usesCleartextTraffic="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
</application>
tools:ignore="GoogleAppIndexingWarning"/>
</manifest>
Loading

0 comments on commit 7136656

Please sign in to comment.