Moving the android specific changes to patch files and reverting them…

.ado/android-pr.yml

@@ -22,10 +22,14 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
+      - template: templates/apple-droid-node-patching.yml
+        parameters:
+          apply_office_patches: true
+
       - task: UseNode@1
         inputs:
           version: '10.x'
-      
+
       # Install NuGet v4.6.4+
       - task: NuGetToolInstaller@1
         inputs:

.ado/apple-pr.yml

@@ -10,11 +10,19 @@ pr:
 jobs:
   - job: JavaScriptRNPR
     displayName: JavaScript React Native PR
+    strategy:
+      matrix:
+        office:
+          apply_office_patches: 'true'
+        public:
+          apply_office_patches: 'false'
     pool:
       vmImage: macOS-10.14
       demands: ['xcode', 'sh', 'npm']
     steps:
       - template: templates/apple-job-javascript.yml
+        parameters:
+            apply_office_patches: $(apply_office_patches)
 
   - job: AppleRNPR
     displayName: Apple React Native PR
@@ -27,6 +35,7 @@ jobs:
           xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 8'
           xcode_actions_debug: 'build test'
           xcode_actions_release: 'build'
+          apply_office_patches: 'false'
         # Microsoft- We don't use tvOS, so don't bother maintaining the infra
         # tvos:
         #   packager_platform: 'ios'
@@ -40,6 +49,23 @@ jobs:
           xcode_destination: 'platform=macOS,arch=x86_64'
           xcode_actions_debug: 'build test'
           xcode_actions_release: 'build'
+          apply_office_patches: 'false'
+        ios-office:
+          packager_platform: 'ios'
+          xcode_sdk: iphonesimulator
+          xcode_scheme: 'RNTester'
+          xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 8'
+          xcode_actions_debug: 'build test'
+          xcode_actions_release: 'build'
+          apply_office_patches: 'true'
+        macos-office:
+          packager_platform: 'macos'
+          xcode_sdk: macosx
+          xcode_scheme: 'RNTester-macOS'
+          xcode_destination: 'platform=macOS,arch=x86_64'
+          xcode_actions_debug: 'build test'
+          xcode_actions_release: 'build'
+          apply_office_patches: 'true'
     pool:
       vmImage: macOS-10.14
       demands: ['xcode', 'sh', 'npm']
@@ -55,3 +81,4 @@ jobs:
           xcode_actions_debug: $(xcode_actions_debug)
           xcode_actions_release: $(xcode_actions_release)
           xcode_destination: $(xcode_destination)
+          apply_office_patches: $(apply_office_patches)

.ado/publish-npmjs.yml

@@ -0,0 +1,50 @@
+# This file defines the build steps to publish a release
+name: $(Date:yyyyMMdd).$(Rev:.r)
+
+trigger: 
+  batch: true
+  branches:
+    include:
+      - master
+      - fabric
+  paths:
+    exclude:
+      - package.json
+
+pr: none
+
+jobs:
+  - job: RNGithubPublish
+    displayName: React-Native GitHub Publish
+    pool:
+      vmImage: vs2017-win2016
+    timeoutInMinutes: 90 # how long to run the job before automatically cancelling
+    cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
+    steps:
+      - checkout: self # self represents the repo where the initial Pipelines YAML file was found
+        clean: true # whether to fetch clean each time
+        # fetchDepth: 2 # the depth of commits to ask Git to fetch
+        lfs: false # whether to download Git-LFS files
+        submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
+        persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
+
+      - task: CmdLine@2
+        displayName: npm install
+        inputs:
+          script: npm install
+
+      - task: CmdLine@2
+        displayName: Bump package version
+        inputs:
+          script: node .ado/bumpFileVersions.js
+
+      - task: CmdLine@2
+        displayName: "Prepare package.json for npm publishing as react-native-macos"
+        inputs:
+          script: node .ado/renamePackageToMac.js
+
+      - task: Npm@1
+        displayName: "Publish react-native-macos to npmjs.org"
+        inputs:
+          command: 'publish'
+          publishEndpoint: 'npmjs'

.ado/publish.yml

@@ -28,6 +28,10 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
+      - template: templates/apple-droid-node-patching.yml
+        parameters:
+          apply_office_patches: true
+
       # Install NuGet v4.6.4+
       - task: NuGetToolInstaller@1
         inputs:
@@ -139,14 +143,3 @@ jobs:
         inputs:
           PathtoPublish: '$(Build.StagingDirectory)\final'
           ArtifactName: 'ReactNative-Final'
-
-      - task: CmdLine@2
-        displayName: "Prepare package.json for npm publishing as react-native-macos"
-        inputs:
-          script: node .ado/renamePackageToMac.js
-
-      - task: Npm@1
-        displayName: "Publish react-native-macos to npmjs.org"
-        inputs:
-          command: 'publish'
-          publishEndpoint: 'npmjs'

.ado/templates/apple-droid-node-patching.yml

@@ -0,0 +1,8 @@
+parameters:
+  apply_office_patches: ''
+
+steps:
+  - task: CmdLine@2
+    displayName: Apply Android specific patches for Office consumption
+    inputs:
+      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) BuildAndThirdPartyFixes DialogModule UIEditText UIScroll UITextFont Accessibility OfficeRNHost SecurityFixes V8Integration AnnotationProcessing --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches-droid-office-grouped --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}

.ado/templates/apple-job-javascript.yml

@@ -1,3 +1,6 @@
+parameters:
+  apply_office_patches: ''
+
 steps:
   - script: 'brew bundle'
     displayName: 'brew bundle'
@@ -7,6 +10,10 @@ steps:
 
   - template: apple-xcode-select.yml
 
+  - template: apple-droid-node-patching.yml
+    parameters:
+      apply_office_patches: $(apply_office_patches)
+
   - script: 'yarn install'
     displayName: 'yarn install'
 

.ado/templates/apple-job-react-native.yml

@@ -6,6 +6,7 @@ parameters:
   xcode_actions_debug: ''
   xcode_actions_release: ''
   xcode_destination: ''
+  apply_office_patches: ''
 
 steps:
   # Clean DerivedData
@@ -22,6 +23,10 @@ steps:
   # Task Group: XCode select proper version
   - template: apple-xcode-select.yml
 
+  - template: apple-droid-node-patching.yml
+    parameters:
+      apply_office_patches: $(apply_office_patches)
+
   - task: CmdLine@2
     displayName: yarn install
     inputs:

.eslintignore

@@ -8,4 +8,5 @@ packages/*/node_modules
 pr-inactivity-bookmarklet.js
 question-bookmarklet.js
 flow/
-bots/node_modules
+bots/node_modules
+android-patches/

.gitignore

@@ -31,6 +31,8 @@ project.xcworkspace/*
 /RNTester/android/app/gradlew
 /RNTester/android/app/gradlew.bat
 /ReactAndroid/build/
+/build_deps/
+/ReactAndroid/packages/
 
 # Buck
 .buckd

.prettierignore

@@ -0,0 +1 @@
+android-patches/

Libraries/Components/TextInput/TextInput.js

@@ -1146,7 +1146,7 @@ const TextInput = createReactClass({
         rejectResponderTermination={true}
         accessible={props.accessible}
         accessibilityLabel={props.accessibilityLabel}
-        accessibilityHint={props.accessibilityHint} // TODO(OSS Candidate ISS#2710739)
+        accessibilityHint={props.accessibilityHint} // TODO(macOS ISS#2323203)
         accessibilityRole={props.accessibilityRole}
         accessibilityStates={props.accessibilityStates}
         nativeID={this.props.nativeID}
@@ -1256,8 +1256,8 @@ const TextInput = createReactClass({
         onPress={this._onPress}
         accessible={this.props.accessible}
         accessibilityLabel={this.props.accessibilityLabel}
-        accessibilityHint={this.props.accessibilityHint} // TODO(OSS Candidate ISS#2710739)
         accessibilityRole={this.props.accessibilityRole}
+        accessibilityHint={this.props.accessibilityHint} // TODO(macOS ISS#2323203)
         accessibilityStates={this.props.accessibilityStates}
         nativeID={this.props.nativeID}
         testID={this.props.testID}>
@@ -1267,15 +1267,6 @@ const TextInput = createReactClass({
   },
 
   _onFocus: function(event: FocusEvent) {
-    // [TODO(android ISS)
-    // Set the focused TextInput field info in TextInputState.
-    // Delaying this to onFocus native event ensures that -
-    // 1. The state is updated only after the native code completes setting focus on the view
-    // 2. In case the focus is moving from one TextInput(A) to another TextInput(B), the state of
-    //    A needs to be updated (blurred) before info about B is updated in TestInputState.
-    TextInputState.setFocusedTextInput(
-      ReactNative.findNodeHandle(this._inputRef),
-    ); // ]TODO(android ISS)
     if (this.props.onFocus) {
       this.props.onFocus(event);
     }
@@ -1371,17 +1362,7 @@ const TextInput = createReactClass({
   _onBlur: function(event: BlurEvent) {
     // This is a hack to fix https://fburl.com/toehyir8
     // @todo(rsnara) Figure out why this is necessary.
-    // this.blur();
-    // [TODO(android ISS) removed: this.blur();
-    // Set the focused TextInput field info in TextInputState.
-    // Delaying this to onBlur native event ensures that -
-    // 1. The state is updated only after the native code completes clearing focus on the view
-    // 2. In case the focus is moving from one TextInput(A) to another TextInput(B), the state of
-    //    A needs to be updated (blurred) before info about B is updated in TestInputState.
-    TextInputState.clearFocusedTextInput(
-      ReactNative.findNodeHandle(this._inputRef),
-    ); // ]TODO(android ISS)
-
+    this.blur();
     if (this.props.onBlur) {
       this.props.onBlur(event);
     }

Libraries/Components/TextInput/TextInputState.js

@@ -36,7 +36,7 @@ function currentlyFocusedField(): ?number {
  */
 function focusTextInput(textFieldID: ?number) {
   if (currentlyFocusedID !== textFieldID && textFieldID !== null) {
-    // TODO(android ISS) removed: currentlyFocusedID = textFieldID;
+    currentlyFocusedID = textFieldID;
     if (
       Platform.OS === 'ios' ||
       Platform.OS === 'macos' /* TODO(macOS ISS#2323203) */
@@ -76,29 +76,6 @@ function blurTextInput(textFieldID: ?number) {
     }
   }
 }
-
-/** [TODO(android ISS)
- * @param {number} TextInputID id of the text field that has received focus
- * Should be called after the view has received focus and fired the onFocus event
- * noop if the focused text field is same
- */
-function setFocusedTextInput(textFieldID: ?number) {
-  if (currentlyFocusedID !== textFieldID && textFieldID !== null) {
-    currentlyFocusedID = textFieldID;
-  }
-}
-
-/**
- * @param {number} TextInputID id of the text field whose focus has to be cleared
- * Should be called after the view has cleared focus and fired the onFocus event
- * noop if the focused text field is not same
- */
-function clearFocusedTextInput(textFieldID: ?number) {
-  if (currentlyFocusedID === textFieldID && textFieldID !== null) {
-    currentlyFocusedID = null;
-  }
-} // ]TODO(android ISS)
-
 function registerInput(textFieldID: number) {
   inputs.add(textFieldID);
 }
@@ -113,8 +90,6 @@ function isTextInput(textFieldID: number) {
 
 module.exports = {
   currentlyFocusedField,
-  setFocusedTextInput, // TODO(android ISS)
-  clearFocusedTextInput, // TODO(android ISS)
   focusTextInput,
   blurTextInput,
   registerInput,

React/CxxBridge/RCTCxxBridge.mm

@@ -596,7 +596,6 @@ - (void)_initializeBridgeLocked:(std::shared_ptr<JSExecutorFactory>)executorFact
     // This is async, but any calls into JS are blocked by the m_syncReady CV in Instance
   _reactInstance->initializeBridge(
       std::make_unique<RCTInstanceCallback>(self),
-      nullptr,  // use default executor delegate // TODO(OSS Candidate ISS#2710739)
       executorFactory,
       _jsMessageThread,
       [self _buildModuleRegistryUnlocked]);