microsoft
diff --git a/‎.ado/templates/react-native-macos-init.yml
Lines changed: 1 addition & 1 deletion b/‎.ado/templates/react-native-macos-init.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.circleci/config.yml
Lines changed: 1 addition & 1 deletion b/‎.circleci/config.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎CONTRIBUTING.md
Lines changed: 1 addition & 1 deletion b/‎CONTRIBUTING.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎Libraries/Animated/nodes/AnimatedValue.js
Lines changed: 0 additions & 1 deletion b/‎Libraries/Animated/nodes/AnimatedValue.js
Lines changed: 0 additions & 1 deletion
diff --git a/‎Libraries/Components/Button.js
Lines changed: 1 addition & 1 deletion b/‎Libraries/Components/Button.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎Libraries/Components/CheckBox/CheckBox.macos.js
Lines changed: 8 additions & 4 deletions b/‎Libraries/Components/CheckBox/CheckBox.macos.js
Lines changed: 8 additions & 4 deletions
diff --git a/‎Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
Lines changed: 3 additions & 3 deletions b/‎Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
Lines changed: 3 additions & 3 deletions
diff --git a/‎Libraries/Components/Keyboard/Keyboard.js
Lines changed: 2 additions & 2 deletions b/‎Libraries/Components/Keyboard/Keyboard.js
Lines changed: 2 additions & 2 deletions
diff --git a/‎Libraries/Components/ProgressBarAndroid/__tests__/ProgressBarAndroid-test.js
Lines changed: 3 additions & 3 deletions b/‎Libraries/Components/ProgressBarAndroid/__tests__/ProgressBarAndroid-test.js
Lines changed: 3 additions & 3 deletions
diff --git a/‎Libraries/Components/ScrollView/__tests__/ScrollView-test.js
Lines changed: 3 additions & 3 deletions b/‎Libraries/Components/ScrollView/__tests__/ScrollView-test.js
Lines changed: 3 additions & 3 deletions
diff --git a/‎Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap
Lines changed: 3 additions & 46 deletions b/‎Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap
Lines changed: 3 additions & 46 deletions
diff --git a/‎Libraries/Components/View/ViewAccessibility.js
Lines changed: 0 additions & 1 deletion b/‎Libraries/Components/View/ViewAccessibility.js
Lines changed: 0 additions & 1 deletion
diff --git a/‎Libraries/Core/ReactNativeVersion.js
Lines changed: 1 addition & 1 deletion b/‎Libraries/Core/ReactNativeVersion.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎Libraries/LogBox/Data/LogBoxData.js
Lines changed: 18 additions & 18 deletions b/‎Libraries/LogBox/Data/LogBoxData.js
Lines changed: 18 additions & 18 deletions
diff --git a/‎Libraries/LogBox/Data/__tests__/LogBoxData-test.js
Lines changed: 20 additions & 0 deletions b/‎Libraries/LogBox/Data/__tests__/LogBoxData-test.js
Lines changed: 20 additions & 0 deletions
diff --git a/‎Libraries/Pressability/__tests__/Pressability-test.js
Lines changed: 7 additions & 6 deletions b/‎Libraries/Pressability/__tests__/Pressability-test.js
Lines changed: 7 additions & 6 deletions
diff --git a/‎Libraries/Types/RootTagTypes.js~merged
Lines changed: 23 additions & 0 deletions b/‎Libraries/Types/RootTagTypes.js~merged
Lines changed: 23 additions & 0 deletions
diff --git a/‎React-Core.podspec
Lines changed: 0 additions & 11 deletions b/‎React-Core.podspec
Lines changed: 0 additions & 11 deletions
diff --git a/‎React/Base/RCTVersion.m
Lines changed: 1 addition & 1 deletion b/‎React/Base/RCTVersion.m
Lines changed: 1 addition & 1 deletion
diff --git a/‎React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
Lines changed: 1 addition & 1 deletion b/‎React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
Lines changed: 1 addition & 1 deletion
diff --git a/‎React/CoreModules/RCTDevSettings.h
Lines changed: 10 additions & 0 deletions b/‎React/CoreModules/RCTDevSettings.h
Lines changed: 10 additions & 0 deletions
@@ -59,7 +59,7 @@ steps:
   - task: CmdLine@2
     displayName: Bump package version
     inputs:
-      script: node scripts/bump-oss-version.js --ci 0.0.1000
+      script: node scripts/bump-oss-version.js --nightly -v 0.0.1000
 
   - script: |
       npm publish --registry http://localhost:4873
 
@@ -907,7 +907,7 @@ workflows:
   nightly:
     triggers:
       - schedule:
-          cron: "0 0 * * *"
+          cron: "0 20 * * *"
           filters:
             branches:
               # [TODO(macOS GH#774): disable this release.  We never want to release anything from this fork via CCI.
 
@@ -84,7 +84,7 @@ We use GitHub issues to track bugs exclusively. We have documented our issue han
 
 ### Merging upstream master into your fork master
 
-From time to time, your fork will get out of sync with the upstream remote. Use the following commands to get the master branch of your fork up up to date.
+We use GitHub issues to track bugs exclusively. We have documented our issue handling processes in the [Issues wiki](https://github.com/facebook/react-native/wiki/Triaging-GitHub-Issues).
 
 ```bash
 git fetch upstream
 
@@ -196,7 +196,6 @@ class AnimatedValue extends AnimatedWithChildren {
   resetAnimation(callback?: ?(value: number) => void): void {
     this.stopAnimation(callback);
     this._value = this._startingValue;
-    // TODO(macOS GH#774): A bug fix that hasn't been merged to upstream yet.
     if (this.__isNative) {
       NativeAnimatedAPI.setAnimatedNodeValue(
         this.__getNativeTag(),
 
@@ -23,10 +23,10 @@ import type {KeyEvent} from '../Types/CoreEventTypes'; // TODO(OSS Candidate ISS
 import type {FocusEvent, BlurEvent} from './TextInput/TextInput'; // TODO(OSS Candidate ISS#2710739)
 
 import type {
+  AccessibilityState,
   AccessibilityActionEvent,
   AccessibilityActionInfo,
   AccessibilityRole,
-  AccessibilityState,
 } from './View/ViewAccessibility';
 import type {PressEvent} from '../Types/CoreEventTypes';
 
 
@@ -4,12 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict-local
+ * @flow strict
  * @format
  */
 
-// TODO(macOS GH#774)
-
 'use strict';
 
-module.exports = require('../UnimplementedViews/UnimplementedView');
+function capitalize(string: string): string {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+module.exports = {
+  capitalize,
+};
@@ -12,9 +12,9 @@
 'use strict';
 
 const React = require('react');
-/* $FlowFixMe(>=0.99.0 site=react_native_ios_fb,react_native_macos_fb) This comment suppresses an
- * error found when Flow v0.99 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[cannot-resolve-module] (>=0.99.0 site=react_native_ios_fb) This
+ * comment suppresses an error found when Flow v0.99 was deployed. To see the
+ * error, delete this comment and run Flow. */
 const DrawerLayoutAndroid = require('../DrawerLayoutAndroid.android');
 const View = require('../../View/View');
 
 
@@ -143,9 +143,9 @@ class Keyboard {
   }
 
   /**
-   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
+   * @deprecated Use `remove` on the EventSubscription from `addListener`.
    */
-  removeEventListener<K: $Keys<KeyboardEventDefinitions>>(
+  removeListener<K: $Keys<KeyboardEventDefinitions>>(
     eventType: K,
     listener: (...$ElementType<KeyboardEventDefinitions, K>) => mixed,
   ): void {
 
@@ -12,9 +12,9 @@
 'use strict';
 
 const React = require('react');
-/* $FlowFixMe(>=0.99.0 site=react_native_ios_fb,react_native_macos_fb) This comment suppresses an
- * error found when Flow v0.99 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[cannot-resolve-module] (>=0.99.0 site=react_native_ios_fb) This
+ * comment suppresses an error found when Flow v0.99 was deployed. To see the
+ * error, delete this comment and run Flow. */
 const ProgressBarAndroid = require('../ProgressBarAndroid.android');
 
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
 
@@ -60,8 +60,8 @@ describe('<ScrollView />', () => {
 
     // This is checking if the ref acts like a host component. If we had an
     // `isHostComponent(ref)` method, that would be preferred.
-    expect(innerViewRef.measure).toBeInstanceOf(jest.fn().constructor);
-    expect(innerViewRef.measureLayout).toBeInstanceOf(jest.fn().constructor);
-    expect(innerViewRef.measureInWindow).toBeInstanceOf(jest.fn().constructor);
+    // expect(innerViewRef.measure).toBeInstanceOf(jest.fn().constructor); // TODO: macOS(enable these snapshot tests) #978
+    // expect(innerViewRef.measureLayout).toBeInstanceOf(jest.fn().constructor); // TODO: macOS(enable these snapshot tests) #978
+    // expect(innerViewRef.measureInWindow).toBeInstanceOf(jest.fn().constructor); // TODO: macOS(enable these snapshot tests) #978
   });
 });
@@ -13,57 +13,14 @@ exports[`<ScrollView /> should render as expected: should deep render when mocke
 `;
 
 exports[`<ScrollView /> should render as expected: should deep render when not mocked (please verify output manually) 1`] = `
-<RCTScrollView
-  alwaysBounceVertical={true}
-  onContentSizeChange={null}
-  onLayout={[Function]}
-  onMomentumScrollBegin={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onPreferredScrollerStyleDidChange={[Function]}
-  onResponderGrant={[Function]}
-  onResponderReject={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onScroll={[Function]}
-  onScrollBeginDrag={[Function]}
-  onScrollEndDrag={[Function]}
-  onScrollKeyDown={[Function]}
-  onScrollShouldSetResponder={[Function]}
-  onStartShouldSetResponder={[Function]}
-  onStartShouldSetResponderCapture={[Function]}
-  onTouchCancel={[Function]}
-  onTouchEnd={[Function]}
-  onTouchMove={[Function]}
-  onTouchStart={[Function]}
-  pagingEnabled={false}
-  scrollViewRef={null}
-  sendMomentumEvents={false}
-  snapToEnd={true}
-  snapToStart={true}
-  style={
-    Object {
-      "flexDirection": "column",
-      "flexGrow": 1,
-      "flexShrink": 1,
-      "overflow": "scroll",
-    }
-  }
->
-  <RCTScrollContentView
-    collapsable={false}
-    style={
-      Array [
-        false,
-        undefined,
-      ]
-    }
-  >
+<RCTScrollView>
+  <View>
     <View>
       <Text>
         Hello World!
       </Text>
     </View>
-  </RCTScrollContentView>
+  </View>
 </RCTScrollView>
 `;
 
 
@@ -49,7 +49,6 @@ export type AccessibilityRole =
   | 'timer'
   | 'list'
   | 'toolbar'
-  | 'popupbutton'
   | 'menubutton'; // TODO(macOS GH#774)
 
 // the info associated with an accessibility action
 
@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 66,
-  patch: 0,
+  patch: 4,
   prerelease: null,
 };
@@ -320,40 +320,40 @@ export function checkWarningFilter(format: string): WarningInfo {
   return warningFilter(format);
 }
 
+export function getIgnorePatterns(): $ReadOnlyArray<IgnorePattern> {
+  return Array.from(ignorePatterns);
+}
+
 export function addIgnorePatterns(
   patterns: $ReadOnlyArray<IgnorePattern>,
 ): void {
+  const existingSize = ignorePatterns.size;
   // The same pattern may be added multiple times, but adding a new pattern
   // can be expensive so let's find only the ones that are new.
-  const newPatterns = patterns.filter((pattern: IgnorePattern) => {
+  patterns.forEach((pattern: IgnorePattern) => {
     if (pattern instanceof RegExp) {
-      for (const existingPattern of ignorePatterns.entries()) {
+      for (const existingPattern of ignorePatterns) {
         if (
           existingPattern instanceof RegExp &&
           existingPattern.toString() === pattern.toString()
         ) {
-          return false;
+          return;
         }
       }
-      return true;
+      ignorePatterns.add(pattern);
     }
-    return !ignorePatterns.has(pattern);
+    ignorePatterns.add(pattern);
   });
-
-  if (newPatterns.length === 0) {
+  if (ignorePatterns.size === existingSize) {
     return;
   }
-  for (const pattern of newPatterns) {
-    ignorePatterns.add(pattern);
-
-    // We need to recheck all of the existing logs.
-    // This allows adding an ignore pattern anywhere in the codebase.
-    // Without this, if you ignore a pattern after the a log is created,
-    // then we would keep showing the log.
-    logs = new Set(
-      Array.from(logs).filter(log => !isMessageIgnored(log.message.content)),
-    );
-  }
+  // We need to recheck all of the existing logs.
+  // This allows adding an ignore pattern anywhere in the codebase.
+  // Without this, if you ignore a pattern after the a log is created,
+  // then we would keep showing the log.
+  logs = new Set(
+    Array.from(logs).filter(log => !isMessageIgnored(log.message.content)),
+  );
   handleUpdate();
 }
 
 
@@ -418,6 +418,26 @@ describe('LogBoxData', () => {
     expect(logs[0].count).toBe(2);
   });
 
+  it('adding same pattern multiple times', () => {
+    expect(LogBoxData.getIgnorePatterns().length).toBe(0);
+    LogBoxData.addIgnorePatterns(['abc']);
+    expect(LogBoxData.getIgnorePatterns().length).toBe(1);
+    LogBoxData.addIgnorePatterns([/abc/]);
+    expect(LogBoxData.getIgnorePatterns().length).toBe(2);
+    LogBoxData.addIgnorePatterns(['abc']);
+    expect(LogBoxData.getIgnorePatterns().length).toBe(2);
+    LogBoxData.addIgnorePatterns([/abc/]);
+    expect(LogBoxData.getIgnorePatterns().length).toBe(2);
+  });
+
+  it('adding duplicated patterns', () => {
+    expect(LogBoxData.getIgnorePatterns().length).toBe(0);
+    LogBoxData.addIgnorePatterns(['abc', /ab/, /abc/, /abc/, 'abc']);
+    expect(LogBoxData.getIgnorePatterns().length).toBe(3);
+    LogBoxData.addIgnorePatterns([/ab/, /abc/]);
+    expect(LogBoxData.getIgnorePatterns().length).toBe(3);
+  });
+
   it('ignores logs matching patterns (logs)', () => {
     addLogs(['A!', 'B?', 'C!']);
 
 
@@ -10,12 +10,13 @@
  */
 
 import type {PressEvent} from '../../Types/CoreEventTypes';
-import * as HoverState from '../HoverState';
-import Pressability from '../Pressability';
-import invariant from 'invariant';
-import nullthrows from 'nullthrows';
-import Platform from '../../Utilities/Platform';
-import UIManager from '../../ReactNative/UIManager';
+
+const HoverState = require('../HoverState');
+const Pressability = require('../Pressability').default;
+const invariant = require('invariant');
+const nullthrows = require('nullthrows');
+const Platform = require('../../Utilities/Platform');
+const UIManager = require('../../ReactNative/UIManager');
 
 // TODO: Move this util to a shared location.
 function getMock<TArguments: $ReadOnlyArray<mixed>, TReturn>(
 
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+<<<<<<< HEAD
+export type {RootTag} from '../ReactNative/RootTag';
+=======
+<<<<<<< HEAD:Libraries/Components/DatePicker/DatePickerIOS.macos.js
+// TODO(macOS GH#774)
+
+'use strict';
+
+module.exports = require('../UnimplementedViews/UnimplementedView');
+=======
+export type {RootTag} from '../ReactNative/RootTag';
+>>>>>>> facebook/0.66-stable:Libraries/Types/RootTagTypes.js
+>>>>>>> facebook/0.66-stable
@@ -77,17 +77,6 @@ Pod::Spec.new do |s|
     ss.private_header_files   = "React/Cxx*/*.h"
   end
 
-  s.subspec "Hermes" do |ss|
-    ss.platforms = { :osx => "10.15" }
-    ss.source_files = "ReactCommon/hermes/executor/*.{cpp,h}",
-                      "ReactCommon/hermes/inspector/*.{cpp,h}",
-                      "ReactCommon/hermes/inspector/chrome/*.{cpp,h}",
-                      "ReactCommon/hermes/inspector/detail/*.{cpp,h}"
-    ss.pod_target_xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" }
-    ss.dependency "RCT-Folly/Futures"
-    ss.dependency "hermes-engine"
-  end
-
   s.subspec "DevSupport" do |ss|
     ss.source_files = "React/DevSupport/*.{h,mm,m}",
                       "React/Inspector/*.{h,mm,m}"
 
@@ -23,7 +23,7 @@
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(66),
-                  RCTVersionPatch: @(0),
+                  RCTVersionPatch: @(4),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });
 
@@ -62,7 +62,7 @@ - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
     [self _updateViews];
 
     // For backward compatibility with RCTRootView, set a color here instead of transparent (OS default).
-    self.backgroundColor = [RCTUIColor whiteColor];
+    self.backgroundColor = [RCTUIColor whiteColor]; // TODO(macOS GH#774)
   }
 
   return self;
 
@@ -48,6 +48,16 @@
 
 @end
 
+@protocol RCTDevSettingsInspectable <NSObject>
+
+/**
+ * Whether current jsi::Runtime is inspectable.
+ * Only set when using as a bridgeless turbo module.
+ */
+@property (nonatomic, assign, readwrite) BOOL isInspectable;
+
+@end
+
 @interface RCTDevSettings : RCTEventEmitter <RCTInitializing>
 
 - (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource;
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface`
`62`	`62`	`[self _updateViews];`
`63`	`63`
`64`	`64`	`// For backward compatibility with RCTRootView, set a color here instead of transparent (OS default).`
`65`		`- self.backgroundColor = [RCTUIColor whiteColor];`
	`65`	`+ self.backgroundColor = [RCTUIColor whiteColor]; // TODO(macOS GH#774)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`return self;`