Skip to content

sync from internal#6

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.

Sign up for GitHub

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
Onti Vals (ontzic) merged 1 commit into from
Mar 7, 2019
Merged

sync from internal #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 164 additions & 0 deletions .ado/publish.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
try {
console.log(`Running command: ${command}`);
return execSync(command, {
stdio: "inherit"
});
} catch (err) {
process.exitCode = 1;
console.log(`Failure running: ${command}`);
throw err;
}
}

function doPublish() {
const publishBranchName = process.env.publishBranchName;

const tempPublishBranch = `publish-${Date.now()}`;

const pkgJsonPath = path.resolve(__dirname, "../package.json");
let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

let releaseVersion = pkgJson.version;

const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
if (versionGroups) {
releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
} else {
if (releaseVersion.indexOf("-") === -1) {
releaseVersion = releaseVersion + "-microsoft.0";
} else {
console.log("Invalid version to publish");
exit(1);
}
}

pkgJson.version = releaseVersion;
fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
console.log(`Updating package.json to version ${releaseVersion}`);

exec(`git checkout -b ${tempPublishBranch}`);

exec(`git add ${pkgJsonPath}`);
exec(`git commit -m "Applying package update to ${releaseVersion}`);
exec(`git tag v${releaseVersion}`);
exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
exec(`git push origin tag v${releaseVersion}`);

// -------- Generating Android Artifacts with JavaDoc
exec("gradlew installArchives");

// undo uncommenting javadoc setting
exec("git checkout ReactAndroid/gradle.properties");

// Configure npm to publish to internal feed
const npmrcPath = path.resolve(__dirname, "../.npmrc");
const npmrcContents = `registry=https:${
process.env.publishnpmfeed
}/registry/\nalways-auth=true`;
console.log(`Creating ${npmrcPath} for publishing:`);
console.log(npmrcContents);
fs.writeFileSync(npmrcPath, npmrcContents);

exec(`npm publish`);
exec(`del ${npmrcPath}`);

// Push tar to GitHub releases
exec(`npm pack`);

const npmTarPath = path.resolve(
__dirname,
`../react-native-${releaseVersion}.tgz`
);
const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
const authHeader =
"Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
const userAgent = "Microsoft-React-Native-Release-Agent";

let uploadReleaseAssetUrl = "";
exec("npm install request@^2.69.0 --no-save");

const request = require("request");

const uploadTarBallToRelease = function() {
request.post(
{
url: uploadReleaseAssetUrl,
headers: {
"User-Agent": userAgent,
Authorization: authHeader,
"Content-Type": "application/octet-stream"
},
formData: {
file: fs.createReadStream(npmTarPath)
}
},
function(err, res, body) {
if (err) {
console.error(err);
process.exitCode = 1;
throw err;
}

var formattedResponse = JSON.parse(body);

if (formattedResponse.errors) {
process.exitCode = 1;
console.error(formattedResponse.errors);
throw formattedResponse.errors;
}

exec(`del ${npmTarPath}`);
exec(`git checkout ${publishBranchName}`);
exec(`git pull origin ${publishBranchName}`);
exec(`git merge ${tempPublishBranch} --no-edit`);
exec(
`git push origin HEAD:${publishBranchName} --follow-tags --verbose`
);
exec(`git branch -d ${tempPublishBranch}`);
exec(`git push origin --delete -d ${tempPublishBranch}`);
}
);
};

const createReleaseRequestBody = {
tag_name: `v${releaseVersion}`,
target_commitish: tempPublishBranch,
name: `v${releaseVersion}`,
body: `v${releaseVersion}`,
draft: false,
prerelease: true
};
console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

request.post(
{
url: "https://api.github.com/repos/Microsoft/react-native/releases",
headers: {
"User-Agent": userAgent,
Authorization: authHeader
},
json: true,
body: createReleaseRequestBody
},
function(err, res, body) {
if (err) {
console.log(err);
throw new Error("Error fetching release id.");
}

console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
uploadTarBallToRelease();
}
);
}

doPublish();
84 changes: 84 additions & 0 deletions .ado/publish.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
- job: RNGithubPublish
displayName: React-Native GitHub Publish
pool:
name: OE Standard Pool
demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
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: NuGetCommand@2
displayName: NuGet restore
inputs:
command: restore
restoreSolution: ReactAndroid/packages.config
feedsToUse: config
#vstsFeed: # Required when feedsToUse == Select
#includeNuGetOrg: true # Required when feedsToUse == Select
nugetConfigPath: ReactAndroid/NuGet.Config
#externalFeedCredentials: # Optional
#noCache: false
#disableParallelProcessing: false
restoreDirectory: packages/
verbosityRestore: Detailed # Options: quiet, normal, detailed
#packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
#nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
#publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
#publishPackageMetadata: true # Optional
#allowPackageConflicts: # Optional
#publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
#verbosityPush: 'Detailed' # Options: quiet, normal, detailed
#packagesToPack: '**/*.csproj' # Required when command == Pack
#configuration: '$(BuildConfiguration)' # Optional
#packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
#versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
#includeReferencedProjects: false # Optional
#versionEnvVar: # Required when versioningScheme == ByEnvVar
#majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
#minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
#patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
#packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
#includeSymbols: false # Optional
#toolPackage: # Optional
#buildProperties: # Optional
#basePath: # Optional
#verbosityPack: 'Detailed' # Options: quiet, normal, detailed
#arguments: # Required when command == Custom

- task: CmdLine@1
displayName: 'npm auth'
inputs:
filename: npm
arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

- task: CmdLine@2
displayName: Do Publish
inputs:
script: node .ado/publish.js

- task: CmdLine@1
displayName: 'npm unauth'
inputs:
filename: npm
arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'

16 changes: 15 additions & 1 deletion CHANGELOG.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
"name": "@microsoft/react-native",
"name": "react-native",
"entries": [
{
"version": "0.0.2",
"tag": "react-native_v0.0.2",
"date": "Wed, 06 Mar 2019 05:43:46 GMT",
"comments": {
"patch": [
{
"comment": "Rename microsoft react-native",
"author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
"commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
}
]
}
},
{
"version": "0.3.9",
"tag": "@microsoft/react-native_v0.3.9",
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down
12 changes: 12 additions & 0 deletions Libraries/Components/TextInput/TextInputState.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
UIManager.AndroidTextInput.Commands.focusTextInput,
null,
);
} else if (Platform.OS === 'win32') {
UIManager.dispatchViewManagerCommand(
textFieldID,
UIManager.RCTView.Commands.focus,
null,
);
}
}
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
UIManager.AndroidTextInput.Commands.blurTextInput,
null,
);
} else if (Platform.OS === 'win32') {
UIManager.dispatchViewManagerCommand(
textFieldID,
UIManager.RCTView.Commands.blur,
null,
);
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions Libraries/Components/Touchable/TouchableBounce.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
accessibilityRole={this.props.accessibilityRole}
accessibilityStates={this.props.accessibilityStates}
onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
nativeID={this.props.nativeID}
testID={this.props.testID}
hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
onResponderMove={this.touchableHandleResponderMove}
onResponderRelease={this.touchableHandleResponderRelease}
onResponderTerminate={this.touchableHandleResponderTerminate}
tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
onClick={this.touchableHandlePress} // TODO(android ISS)
onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
10 changes: 6 additions & 4 deletions Libraries/Components/Touchable/TouchableHighlight.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
accessibilityRole={this.props.accessibilityRole}
accessibilityStates={this.props.accessibilityStates}
onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
style={StyleSheet.compose(
this.props.style,
this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
onResponderMove={this.touchableHandleResponderMove}
onResponderRelease={this.touchableHandleResponderRelease}
onResponderTerminate={this.touchableHandleResponderTerminate}
tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
onClick={this.touchableHandlePress} // TODO(android ISS)
onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
onMouseLeave={this.props.onMouseLeave}
onDragEnter={this.props.onDragEnter}
onDragLeave={this.props.onDragLeave}
onDrop={this.props.onDrop}
draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
nativeID={this.props.nativeID}
testID={this.props.testID}>
{React.cloneElement(child, {
Expand Down
2 changes: 2 additions & 0 deletions Libraries/Components/Touchable/TouchableOpacity.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
style={[this.props.style, {opacity: this.state.anim}]}
nativeID={this.props.nativeID}
testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
onResponderMove={this.touchableHandleResponderMove}
onResponderRelease={this.touchableHandleResponderRelease}
onResponderTerminate={this.touchableHandleResponderTerminate}
tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
onClick={this.touchableHandlePress} // TODO(android ISS)
onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
sync from internal by acoates-ms · Pull Request #6 · microsoft/react-native-macos · GitHub
Skip to content
sync from internal#6

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.

 Sign up for GitHub

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

Onti Vals (ontzic)
merged 1 commit into

from

Mar 7, 2019
 Merged


sync from internal
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


164 changes: 164 additions & 0 deletions
.ado/publish.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
 try {
 console.log(`Running command: ${command}`);
 return execSync(command, {
 stdio: "inherit"
 });
 } catch (err) {
 process.exitCode = 1;
 console.log(`Failure running: ${command}`);
 throw err;
 }
}

function doPublish() {
 const publishBranchName = process.env.publishBranchName;

 const tempPublishBranch = `publish-${Date.now()}`;

 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

 let releaseVersion = pkgJson.version;

 const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
 if (versionGroups) {
 releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
 } else {
 if (releaseVersion.indexOf("-") === -1) {
 releaseVersion = releaseVersion + "-microsoft.0";
 } else {
 console.log("Invalid version to publish");
 exit(1);
 }
 }

 pkgJson.version = releaseVersion;
 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
 console.log(`Updating package.json to version ${releaseVersion}`);

 exec(`git checkout -b ${tempPublishBranch}`);

 exec(`git add ${pkgJsonPath}`);
 exec(`git commit -m "Applying package update to ${releaseVersion}`);
 exec(`git tag v${releaseVersion}`);
 exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
 exec(`git push origin tag v${releaseVersion}`);

 // -------- Generating Android Artifacts with JavaDoc
 exec("gradlew installArchives");

 // undo uncommenting javadoc setting
 exec("git checkout ReactAndroid/gradle.properties");

 // Configure npm to publish to internal feed
 const npmrcPath = path.resolve(__dirname, "../.npmrc");
 const npmrcContents = `registry=https:${
 process.env.publishnpmfeed
 }/registry/\nalways-auth=true`;
 console.log(`Creating ${npmrcPath} for publishing:`);
 console.log(npmrcContents);
 fs.writeFileSync(npmrcPath, npmrcContents);

 exec(`npm publish`);
 exec(`del ${npmrcPath}`);

 // Push tar to GitHub releases
 exec(`npm pack`);

 const npmTarPath = path.resolve(
 __dirname,
 `../react-native-${releaseVersion}.tgz`
 );
 const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
 const authHeader =
 "Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
 const userAgent = "Microsoft-React-Native-Release-Agent";

 let uploadReleaseAssetUrl = "";
 exec("npm install request@^2.69.0 --no-save");

 const request = require("request");

 const uploadTarBallToRelease = function() {
 request.post(
 {
 url: uploadReleaseAssetUrl,
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader,
 "Content-Type": "application/octet-stream"
 },
 formData: {
 file: fs.createReadStream(npmTarPath)
 }
 },
 function(err, res, body) {
 if (err) {
 console.error(err);
 process.exitCode = 1;
 throw err;
 }

 var formattedResponse = JSON.parse(body);

 if (formattedResponse.errors) {
 process.exitCode = 1;
 console.error(formattedResponse.errors);
 throw formattedResponse.errors;
 }

 exec(`del ${npmTarPath}`);
 exec(`git checkout ${publishBranchName}`);
 exec(`git pull origin ${publishBranchName}`);
 exec(`git merge ${tempPublishBranch} --no-edit`);
 exec(
 `git push origin HEAD:${publishBranchName} --follow-tags --verbose`
 );
 exec(`git branch -d ${tempPublishBranch}`);
 exec(`git push origin --delete -d ${tempPublishBranch}`);
 }
 );
 };

 const createReleaseRequestBody = {
 tag_name: `v${releaseVersion}`,
 target_commitish: tempPublishBranch,
 name: `v${releaseVersion}`,
 body: `v${releaseVersion}`,
 draft: false,
 prerelease: true
 };
 console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

 request.post(
 {
 url: "https://api.github.com/repos/Microsoft/react-native/releases",
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader
 },
 json: true,
 body: createReleaseRequestBody
 },
 function(err, res, body) {
 if (err) {
 console.log(err);
 throw new Error("Error fetching release id.");
 }

 console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
 uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
 uploadTarBallToRelease();
 }
 );
}

doPublish();

84 changes: 84 additions & 0 deletions
.ado/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
 - job: RNGithubPublish
 displayName: React-Native GitHub Publish
 pool:
 name: OE Standard Pool
 demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
 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: NuGetCommand@2
 displayName: NuGet restore
 inputs:
 command: restore
 restoreSolution: ReactAndroid/packages.config
 feedsToUse: config
 #vstsFeed: # Required when feedsToUse == Select
 #includeNuGetOrg: true # Required when feedsToUse == Select
 nugetConfigPath: ReactAndroid/NuGet.Config
 #externalFeedCredentials: # Optional
 #noCache: false
 #disableParallelProcessing: false
 restoreDirectory: packages/
 verbosityRestore: Detailed # Options: quiet, normal, detailed
 #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
 #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
 #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
 #publishPackageMetadata: true # Optional
 #allowPackageConflicts: # Optional
 #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
 #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
 #packagesToPack: '**/*.csproj' # Required when command == Pack
 #configuration: '$(BuildConfiguration)' # Optional
 #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
 #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
 #includeReferencedProjects: false # Optional
 #versionEnvVar: # Required when versioningScheme == ByEnvVar
 #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
 #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
 #includeSymbols: false # Optional
 #toolPackage: # Optional
 #buildProperties: # Optional
 #basePath: # Optional
 #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
 #arguments: # Required when command == Custom

 - task: CmdLine@1
 displayName: 'npm auth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

 - task: CmdLine@2
 displayName: Do Publish
 inputs:
 script: node .ado/publish.js

 - task: CmdLine@1
 displayName: 'npm unauth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'


16 changes: 15 additions & 1 deletion
CHANGELOG.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
 "name": "@microsoft/react-native",
 "name": "react-native",
 "entries": [
 {
 "version": "0.0.2",
 "tag": "react-native_v0.0.2",
 "date": "Wed, 06 Mar 2019 05:43:46 GMT",
 "comments": {
 "patch": [
 {
 "comment": "Rename microsoft react-native",
 "author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
 "commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
 }
 ]
 }
 },
 {
 "version": "0.3.9",
 "tag": "@microsoft/react-native_v0.3.9",
Expand Down

11 changes: 9 additions & 2 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down

12 changes: 12 additions & 0 deletions
Libraries/Components/TextInput/TextInputState.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.focusTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.focus,
 null,
 );
 }
 }
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.blurTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.blur,
 null,
 );
 }
 }
}
Expand Down

4 changes: 4 additions & 0 deletions
Libraries/Components/Touchable/TouchableBounce.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}
 hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down

10 changes: 6 additions & 4 deletions
Libraries/Components/Touchable/TouchableHighlight.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={StyleSheet.compose(
 this.props.style,
 this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
 onMouseLeave={this.props.onMouseLeave}
 onDragEnter={this.props.onDragEnter}
 onDragLeave={this.props.onDragLeave}
 onDrop={this.props.onDrop}
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}>
 {React.cloneElement(child, {
Expand Down

2 changes: 2 additions & 0 deletions
Libraries/Components/Touchable/TouchableOpacity.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={[this.props.style, {opacity: this.state.anim}]}
 nativeID={this.props.nativeID}
 testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sync from internal by acoates-ms · Pull Request #6 · microsoft/react-native-macos · GitHub
Skip to content
sync from internal#6

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.

 Sign up for GitHub

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

Onti Vals (ontzic)
merged 1 commit into

from

Mar 7, 2019
 Merged


sync from internal
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


164 changes: 164 additions & 0 deletions
.ado/publish.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
 try {
 console.log(`Running command: ${command}`);
 return execSync(command, {
 stdio: "inherit"
 });
 } catch (err) {
 process.exitCode = 1;
 console.log(`Failure running: ${command}`);
 throw err;
 }
}

function doPublish() {
 const publishBranchName = process.env.publishBranchName;

 const tempPublishBranch = `publish-${Date.now()}`;

 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

 let releaseVersion = pkgJson.version;

 const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
 if (versionGroups) {
 releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
 } else {
 if (releaseVersion.indexOf("-") === -1) {
 releaseVersion = releaseVersion + "-microsoft.0";
 } else {
 console.log("Invalid version to publish");
 exit(1);
 }
 }

 pkgJson.version = releaseVersion;
 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
 console.log(`Updating package.json to version ${releaseVersion}`);

 exec(`git checkout -b ${tempPublishBranch}`);

 exec(`git add ${pkgJsonPath}`);
 exec(`git commit -m "Applying package update to ${releaseVersion}`);
 exec(`git tag v${releaseVersion}`);
 exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
 exec(`git push origin tag v${releaseVersion}`);

 // -------- Generating Android Artifacts with JavaDoc
 exec("gradlew installArchives");

 // undo uncommenting javadoc setting
 exec("git checkout ReactAndroid/gradle.properties");

 // Configure npm to publish to internal feed
 const npmrcPath = path.resolve(__dirname, "../.npmrc");
 const npmrcContents = `registry=https:${
 process.env.publishnpmfeed
 }/registry/\nalways-auth=true`;
 console.log(`Creating ${npmrcPath} for publishing:`);
 console.log(npmrcContents);
 fs.writeFileSync(npmrcPath, npmrcContents);

 exec(`npm publish`);
 exec(`del ${npmrcPath}`);

 // Push tar to GitHub releases
 exec(`npm pack`);

 const npmTarPath = path.resolve(
 __dirname,
 `../react-native-${releaseVersion}.tgz`
 );
 const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
 const authHeader =
 "Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
 const userAgent = "Microsoft-React-Native-Release-Agent";

 let uploadReleaseAssetUrl = "";
 exec("npm install request@^2.69.0 --no-save");

 const request = require("request");

 const uploadTarBallToRelease = function() {
 request.post(
 {
 url: uploadReleaseAssetUrl,
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader,
 "Content-Type": "application/octet-stream"
 },
 formData: {
 file: fs.createReadStream(npmTarPath)
 }
 },
 function(err, res, body) {
 if (err) {
 console.error(err);
 process.exitCode = 1;
 throw err;
 }

 var formattedResponse = JSON.parse(body);

 if (formattedResponse.errors) {
 process.exitCode = 1;
 console.error(formattedResponse.errors);
 throw formattedResponse.errors;
 }

 exec(`del ${npmTarPath}`);
 exec(`git checkout ${publishBranchName}`);
 exec(`git pull origin ${publishBranchName}`);
 exec(`git merge ${tempPublishBranch} --no-edit`);
 exec(
 `git push origin HEAD:${publishBranchName} --follow-tags --verbose`
 );
 exec(`git branch -d ${tempPublishBranch}`);
 exec(`git push origin --delete -d ${tempPublishBranch}`);
 }
 );
 };

 const createReleaseRequestBody = {
 tag_name: `v${releaseVersion}`,
 target_commitish: tempPublishBranch,
 name: `v${releaseVersion}`,
 body: `v${releaseVersion}`,
 draft: false,
 prerelease: true
 };
 console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

 request.post(
 {
 url: "https://api.github.com/repos/Microsoft/react-native/releases",
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader
 },
 json: true,
 body: createReleaseRequestBody
 },
 function(err, res, body) {
 if (err) {
 console.log(err);
 throw new Error("Error fetching release id.");
 }

 console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
 uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
 uploadTarBallToRelease();
 }
 );
}

doPublish();

84 changes: 84 additions & 0 deletions
.ado/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
 - job: RNGithubPublish
 displayName: React-Native GitHub Publish
 pool:
 name: OE Standard Pool
 demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
 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: NuGetCommand@2
 displayName: NuGet restore
 inputs:
 command: restore
 restoreSolution: ReactAndroid/packages.config
 feedsToUse: config
 #vstsFeed: # Required when feedsToUse == Select
 #includeNuGetOrg: true # Required when feedsToUse == Select
 nugetConfigPath: ReactAndroid/NuGet.Config
 #externalFeedCredentials: # Optional
 #noCache: false
 #disableParallelProcessing: false
 restoreDirectory: packages/
 verbosityRestore: Detailed # Options: quiet, normal, detailed
 #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
 #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
 #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
 #publishPackageMetadata: true # Optional
 #allowPackageConflicts: # Optional
 #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
 #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
 #packagesToPack: '**/*.csproj' # Required when command == Pack
 #configuration: '$(BuildConfiguration)' # Optional
 #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
 #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
 #includeReferencedProjects: false # Optional
 #versionEnvVar: # Required when versioningScheme == ByEnvVar
 #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
 #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
 #includeSymbols: false # Optional
 #toolPackage: # Optional
 #buildProperties: # Optional
 #basePath: # Optional
 #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
 #arguments: # Required when command == Custom

 - task: CmdLine@1
 displayName: 'npm auth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

 - task: CmdLine@2
 displayName: Do Publish
 inputs:
 script: node .ado/publish.js

 - task: CmdLine@1
 displayName: 'npm unauth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'


16 changes: 15 additions & 1 deletion
CHANGELOG.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
 "name": "@microsoft/react-native",
 "name": "react-native",
 "entries": [
 {
 "version": "0.0.2",
 "tag": "react-native_v0.0.2",
 "date": "Wed, 06 Mar 2019 05:43:46 GMT",
 "comments": {
 "patch": [
 {
 "comment": "Rename microsoft react-native",
 "author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
 "commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
 }
 ]
 }
 },
 {
 "version": "0.3.9",
 "tag": "@microsoft/react-native_v0.3.9",
Expand Down

11 changes: 9 additions & 2 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down

12 changes: 12 additions & 0 deletions
Libraries/Components/TextInput/TextInputState.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.focusTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.focus,
 null,
 );
 }
 }
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.blurTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.blur,
 null,
 );
 }
 }
}
Expand Down

4 changes: 4 additions & 0 deletions
Libraries/Components/Touchable/TouchableBounce.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}
 hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down

10 changes: 6 additions & 4 deletions
Libraries/Components/Touchable/TouchableHighlight.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={StyleSheet.compose(
 this.props.style,
 this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
 onMouseLeave={this.props.onMouseLeave}
 onDragEnter={this.props.onDragEnter}
 onDragLeave={this.props.onDragLeave}
 onDrop={this.props.onDrop}
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}>
 {React.cloneElement(child, {
Expand Down

2 changes: 2 additions & 0 deletions
Libraries/Components/Touchable/TouchableOpacity.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={[this.props.style, {opacity: this.state.anim}]}
 nativeID={this.props.nativeID}
 testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sync from internal by acoates-ms · Pull Request #6 · microsoft/react-native-macos · GitHub
Skip to content
sync from internal#6

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.

 Sign up for GitHub

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

Onti Vals (ontzic)
merged 1 commit into

from

Mar 7, 2019
 Merged


sync from internal
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


164 changes: 164 additions & 0 deletions
.ado/publish.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
 try {
 console.log(`Running command: ${command}`);
 return execSync(command, {
 stdio: "inherit"
 });
 } catch (err) {
 process.exitCode = 1;
 console.log(`Failure running: ${command}`);
 throw err;
 }
}

function doPublish() {
 const publishBranchName = process.env.publishBranchName;

 const tempPublishBranch = `publish-${Date.now()}`;

 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

 let releaseVersion = pkgJson.version;

 const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
 if (versionGroups) {
 releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
 } else {
 if (releaseVersion.indexOf("-") === -1) {
 releaseVersion = releaseVersion + "-microsoft.0";
 } else {
 console.log("Invalid version to publish");
 exit(1);
 }
 }

 pkgJson.version = releaseVersion;
 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
 console.log(`Updating package.json to version ${releaseVersion}`);

 exec(`git checkout -b ${tempPublishBranch}`);

 exec(`git add ${pkgJsonPath}`);
 exec(`git commit -m "Applying package update to ${releaseVersion}`);
 exec(`git tag v${releaseVersion}`);
 exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
 exec(`git push origin tag v${releaseVersion}`);

 // -------- Generating Android Artifacts with JavaDoc
 exec("gradlew installArchives");

 // undo uncommenting javadoc setting
 exec("git checkout ReactAndroid/gradle.properties");

 // Configure npm to publish to internal feed
 const npmrcPath = path.resolve(__dirname, "../.npmrc");
 const npmrcContents = `registry=https:${
 process.env.publishnpmfeed
 }/registry/\nalways-auth=true`;
 console.log(`Creating ${npmrcPath} for publishing:`);
 console.log(npmrcContents);
 fs.writeFileSync(npmrcPath, npmrcContents);

 exec(`npm publish`);
 exec(`del ${npmrcPath}`);

 // Push tar to GitHub releases
 exec(`npm pack`);

 const npmTarPath = path.resolve(
 __dirname,
 `../react-native-${releaseVersion}.tgz`
 );
 const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
 const authHeader =
 "Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
 const userAgent = "Microsoft-React-Native-Release-Agent";

 let uploadReleaseAssetUrl = "";
 exec("npm install request@^2.69.0 --no-save");

 const request = require("request");

 const uploadTarBallToRelease = function() {
 request.post(
 {
 url: uploadReleaseAssetUrl,
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader,
 "Content-Type": "application/octet-stream"
 },
 formData: {
 file: fs.createReadStream(npmTarPath)
 }
 },
 function(err, res, body) {
 if (err) {
 console.error(err);
 process.exitCode = 1;
 throw err;
 }

 var formattedResponse = JSON.parse(body);

 if (formattedResponse.errors) {
 process.exitCode = 1;
 console.error(formattedResponse.errors);
 throw formattedResponse.errors;
 }

 exec(`del ${npmTarPath}`);
 exec(`git checkout ${publishBranchName}`);
 exec(`git pull origin ${publishBranchName}`);
 exec(`git merge ${tempPublishBranch} --no-edit`);
 exec(
 `git push origin HEAD:${publishBranchName} --follow-tags --verbose`
 );
 exec(`git branch -d ${tempPublishBranch}`);
 exec(`git push origin --delete -d ${tempPublishBranch}`);
 }
 );
 };

 const createReleaseRequestBody = {
 tag_name: `v${releaseVersion}`,
 target_commitish: tempPublishBranch,
 name: `v${releaseVersion}`,
 body: `v${releaseVersion}`,
 draft: false,
 prerelease: true
 };
 console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

 request.post(
 {
 url: "https://api.github.com/repos/Microsoft/react-native/releases",
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader
 },
 json: true,
 body: createReleaseRequestBody
 },
 function(err, res, body) {
 if (err) {
 console.log(err);
 throw new Error("Error fetching release id.");
 }

 console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
 uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
 uploadTarBallToRelease();
 }
 );
}

doPublish();

84 changes: 84 additions & 0 deletions
.ado/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
 - job: RNGithubPublish
 displayName: React-Native GitHub Publish
 pool:
 name: OE Standard Pool
 demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
 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: NuGetCommand@2
 displayName: NuGet restore
 inputs:
 command: restore
 restoreSolution: ReactAndroid/packages.config
 feedsToUse: config
 #vstsFeed: # Required when feedsToUse == Select
 #includeNuGetOrg: true # Required when feedsToUse == Select
 nugetConfigPath: ReactAndroid/NuGet.Config
 #externalFeedCredentials: # Optional
 #noCache: false
 #disableParallelProcessing: false
 restoreDirectory: packages/
 verbosityRestore: Detailed # Options: quiet, normal, detailed
 #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
 #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
 #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
 #publishPackageMetadata: true # Optional
 #allowPackageConflicts: # Optional
 #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
 #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
 #packagesToPack: '**/*.csproj' # Required when command == Pack
 #configuration: '$(BuildConfiguration)' # Optional
 #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
 #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
 #includeReferencedProjects: false # Optional
 #versionEnvVar: # Required when versioningScheme == ByEnvVar
 #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
 #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
 #includeSymbols: false # Optional
 #toolPackage: # Optional
 #buildProperties: # Optional
 #basePath: # Optional
 #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
 #arguments: # Required when command == Custom

 - task: CmdLine@1
 displayName: 'npm auth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

 - task: CmdLine@2
 displayName: Do Publish
 inputs:
 script: node .ado/publish.js

 - task: CmdLine@1
 displayName: 'npm unauth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'


16 changes: 15 additions & 1 deletion
CHANGELOG.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
 "name": "@microsoft/react-native",
 "name": "react-native",
 "entries": [
 {
 "version": "0.0.2",
 "tag": "react-native_v0.0.2",
 "date": "Wed, 06 Mar 2019 05:43:46 GMT",
 "comments": {
 "patch": [
 {
 "comment": "Rename microsoft react-native",
 "author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
 "commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
 }
 ]
 }
 },
 {
 "version": "0.3.9",
 "tag": "@microsoft/react-native_v0.3.9",
Expand Down

11 changes: 9 additions & 2 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down

12 changes: 12 additions & 0 deletions
Libraries/Components/TextInput/TextInputState.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.focusTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.focus,
 null,
 );
 }
 }
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.blurTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.blur,
 null,
 );
 }
 }
}
Expand Down

4 changes: 4 additions & 0 deletions
Libraries/Components/Touchable/TouchableBounce.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}
 hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down

10 changes: 6 additions & 4 deletions
Libraries/Components/Touchable/TouchableHighlight.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={StyleSheet.compose(
 this.props.style,
 this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
 onMouseLeave={this.props.onMouseLeave}
 onDragEnter={this.props.onDragEnter}
 onDragLeave={this.props.onDragLeave}
 onDrop={this.props.onDrop}
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}>
 {React.cloneElement(child, {
Expand Down

2 changes: 2 additions & 0 deletions
Libraries/Components/Touchable/TouchableOpacity.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={[this.props.style, {opacity: this.state.anim}]}
 nativeID={this.props.nativeID}
 testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
sync from internal by acoates-ms · Pull Request #6 · microsoft/react-native-macos · GitHub
Skip to content
sync from internal#6

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.

 Sign up for GitHub

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

Onti Vals (ontzic)
merged 1 commit into

from

Mar 7, 2019
 Merged


sync from internal
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


164 changes: 164 additions & 0 deletions
.ado/publish.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
 try {
 console.log(`Running command: ${command}`);
 return execSync(command, {
 stdio: "inherit"
 });
 } catch (err) {
 process.exitCode = 1;
 console.log(`Failure running: ${command}`);
 throw err;
 }
}

function doPublish() {
 const publishBranchName = process.env.publishBranchName;

 const tempPublishBranch = `publish-${Date.now()}`;

 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

 let releaseVersion = pkgJson.version;

 const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
 if (versionGroups) {
 releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
 } else {
 if (releaseVersion.indexOf("-") === -1) {
 releaseVersion = releaseVersion + "-microsoft.0";
 } else {
 console.log("Invalid version to publish");
 exit(1);
 }
 }

 pkgJson.version = releaseVersion;
 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
 console.log(`Updating package.json to version ${releaseVersion}`);

 exec(`git checkout -b ${tempPublishBranch}`);

 exec(`git add ${pkgJsonPath}`);
 exec(`git commit -m "Applying package update to ${releaseVersion}`);
 exec(`git tag v${releaseVersion}`);
 exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
 exec(`git push origin tag v${releaseVersion}`);

 // -------- Generating Android Artifacts with JavaDoc
 exec("gradlew installArchives");

 // undo uncommenting javadoc setting
 exec("git checkout ReactAndroid/gradle.properties");

 // Configure npm to publish to internal feed
 const npmrcPath = path.resolve(__dirname, "../.npmrc");
 const npmrcContents = `registry=https:${
 process.env.publishnpmfeed
 }/registry/\nalways-auth=true`;
 console.log(`Creating ${npmrcPath} for publishing:`);
 console.log(npmrcContents);
 fs.writeFileSync(npmrcPath, npmrcContents);

 exec(`npm publish`);
 exec(`del ${npmrcPath}`);

 // Push tar to GitHub releases
 exec(`npm pack`);

 const npmTarPath = path.resolve(
 __dirname,
 `../react-native-${releaseVersion}.tgz`
 );
 const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
 const authHeader =
 "Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
 const userAgent = "Microsoft-React-Native-Release-Agent";

 let uploadReleaseAssetUrl = "";
 exec("npm install request@^2.69.0 --no-save");

 const request = require("request");

 const uploadTarBallToRelease = function() {
 request.post(
 {
 url: uploadReleaseAssetUrl,
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader,
 "Content-Type": "application/octet-stream"
 },
 formData: {
 file: fs.createReadStream(npmTarPath)
 }
 },
 function(err, res, body) {
 if (err) {
 console.error(err);
 process.exitCode = 1;
 throw err;
 }

 var formattedResponse = JSON.parse(body);

 if (formattedResponse.errors) {
 process.exitCode = 1;
 console.error(formattedResponse.errors);
 throw formattedResponse.errors;
 }

 exec(`del ${npmTarPath}`);
 exec(`git checkout ${publishBranchName}`);
 exec(`git pull origin ${publishBranchName}`);
 exec(`git merge ${tempPublishBranch} --no-edit`);
 exec(
 `git push origin HEAD:${publishBranchName} --follow-tags --verbose`
 );
 exec(`git branch -d ${tempPublishBranch}`);
 exec(`git push origin --delete -d ${tempPublishBranch}`);
 }
 );
 };

 const createReleaseRequestBody = {
 tag_name: `v${releaseVersion}`,
 target_commitish: tempPublishBranch,
 name: `v${releaseVersion}`,
 body: `v${releaseVersion}`,
 draft: false,
 prerelease: true
 };
 console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

 request.post(
 {
 url: "https://api.github.com/repos/Microsoft/react-native/releases",
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader
 },
 json: true,
 body: createReleaseRequestBody
 },
 function(err, res, body) {
 if (err) {
 console.log(err);
 throw new Error("Error fetching release id.");
 }

 console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
 uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
 uploadTarBallToRelease();
 }
 );
}

doPublish();

84 changes: 84 additions & 0 deletions
.ado/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
 - job: RNGithubPublish
 displayName: React-Native GitHub Publish
 pool:
 name: OE Standard Pool
 demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
 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: NuGetCommand@2
 displayName: NuGet restore
 inputs:
 command: restore
 restoreSolution: ReactAndroid/packages.config
 feedsToUse: config
 #vstsFeed: # Required when feedsToUse == Select
 #includeNuGetOrg: true # Required when feedsToUse == Select
 nugetConfigPath: ReactAndroid/NuGet.Config
 #externalFeedCredentials: # Optional
 #noCache: false
 #disableParallelProcessing: false
 restoreDirectory: packages/
 verbosityRestore: Detailed # Options: quiet, normal, detailed
 #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
 #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
 #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
 #publishPackageMetadata: true # Optional
 #allowPackageConflicts: # Optional
 #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
 #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
 #packagesToPack: '**/*.csproj' # Required when command == Pack
 #configuration: '$(BuildConfiguration)' # Optional
 #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
 #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
 #includeReferencedProjects: false # Optional
 #versionEnvVar: # Required when versioningScheme == ByEnvVar
 #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
 #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
 #includeSymbols: false # Optional
 #toolPackage: # Optional
 #buildProperties: # Optional
 #basePath: # Optional
 #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
 #arguments: # Required when command == Custom

 - task: CmdLine@1
 displayName: 'npm auth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

 - task: CmdLine@2
 displayName: Do Publish
 inputs:
 script: node .ado/publish.js

 - task: CmdLine@1
 displayName: 'npm unauth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'


16 changes: 15 additions & 1 deletion
CHANGELOG.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
 "name": "@microsoft/react-native",
 "name": "react-native",
 "entries": [
 {
 "version": "0.0.2",
 "tag": "react-native_v0.0.2",
 "date": "Wed, 06 Mar 2019 05:43:46 GMT",
 "comments": {
 "patch": [
 {
 "comment": "Rename microsoft react-native",
 "author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
 "commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
 }
 ]
 }
 },
 {
 "version": "0.3.9",
 "tag": "@microsoft/react-native_v0.3.9",
Expand Down

11 changes: 9 additions & 2 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down

12 changes: 12 additions & 0 deletions
Libraries/Components/TextInput/TextInputState.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.focusTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.focus,
 null,
 );
 }
 }
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.blurTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.blur,
 null,
 );
 }
 }
}
Expand Down

4 changes: 4 additions & 0 deletions
Libraries/Components/Touchable/TouchableBounce.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}
 hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down

10 changes: 6 additions & 4 deletions
Libraries/Components/Touchable/TouchableHighlight.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={StyleSheet.compose(
 this.props.style,
 this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
 onMouseLeave={this.props.onMouseLeave}
 onDragEnter={this.props.onDragEnter}
 onDragLeave={this.props.onDragLeave}
 onDrop={this.props.onDrop}
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}>
 {React.cloneElement(child, {
Expand Down

2 changes: 2 additions & 0 deletions
Libraries/Components/Touchable/TouchableOpacity.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={[this.props.style, {opacity: this.state.anim}]}
 nativeID={this.props.nativeID}
 testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sync from internal by acoates-ms · Pull Request #6 · microsoft/react-native-macos · GitHub
Skip to content
sync from internal#6

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.

 Sign up for GitHub

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

Onti Vals (ontzic)
merged 1 commit into

from

Mar 7, 2019
 Merged


sync from internal
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


164 changes: 164 additions & 0 deletions
.ado/publish.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
 try {
 console.log(`Running command: ${command}`);
 return execSync(command, {
 stdio: "inherit"
 });
 } catch (err) {
 process.exitCode = 1;
 console.log(`Failure running: ${command}`);
 throw err;
 }
}

function doPublish() {
 const publishBranchName = process.env.publishBranchName;

 const tempPublishBranch = `publish-${Date.now()}`;

 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

 let releaseVersion = pkgJson.version;

 const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
 if (versionGroups) {
 releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
 } else {
 if (releaseVersion.indexOf("-") === -1) {
 releaseVersion = releaseVersion + "-microsoft.0";
 } else {
 console.log("Invalid version to publish");
 exit(1);
 }
 }

 pkgJson.version = releaseVersion;
 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
 console.log(`Updating package.json to version ${releaseVersion}`);

 exec(`git checkout -b ${tempPublishBranch}`);

 exec(`git add ${pkgJsonPath}`);
 exec(`git commit -m "Applying package update to ${releaseVersion}`);
 exec(`git tag v${releaseVersion}`);
 exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
 exec(`git push origin tag v${releaseVersion}`);

 // -------- Generating Android Artifacts with JavaDoc
 exec("gradlew installArchives");

 // undo uncommenting javadoc setting
 exec("git checkout ReactAndroid/gradle.properties");

 // Configure npm to publish to internal feed
 const npmrcPath = path.resolve(__dirname, "../.npmrc");
 const npmrcContents = `registry=https:${
 process.env.publishnpmfeed
 }/registry/\nalways-auth=true`;
 console.log(`Creating ${npmrcPath} for publishing:`);
 console.log(npmrcContents);
 fs.writeFileSync(npmrcPath, npmrcContents);

 exec(`npm publish`);
 exec(`del ${npmrcPath}`);

 // Push tar to GitHub releases
 exec(`npm pack`);

 const npmTarPath = path.resolve(
 __dirname,
 `../react-native-${releaseVersion}.tgz`
 );
 const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
 const authHeader =
 "Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
 const userAgent = "Microsoft-React-Native-Release-Agent";

 let uploadReleaseAssetUrl = "";
 exec("npm install request@^2.69.0 --no-save");

 const request = require("request");

 const uploadTarBallToRelease = function() {
 request.post(
 {
 url: uploadReleaseAssetUrl,
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader,
 "Content-Type": "application/octet-stream"
 },
 formData: {
 file: fs.createReadStream(npmTarPath)
 }
 },
 function(err, res, body) {
 if (err) {
 console.error(err);
 process.exitCode = 1;
 throw err;
 }

 var formattedResponse = JSON.parse(body);

 if (formattedResponse.errors) {
 process.exitCode = 1;
 console.error(formattedResponse.errors);
 throw formattedResponse.errors;
 }

 exec(`del ${npmTarPath}`);
 exec(`git checkout ${publishBranchName}`);
 exec(`git pull origin ${publishBranchName}`);
 exec(`git merge ${tempPublishBranch} --no-edit`);
 exec(
 `git push origin HEAD:${publishBranchName} --follow-tags --verbose`
 );
 exec(`git branch -d ${tempPublishBranch}`);
 exec(`git push origin --delete -d ${tempPublishBranch}`);
 }
 );
 };

 const createReleaseRequestBody = {
 tag_name: `v${releaseVersion}`,
 target_commitish: tempPublishBranch,
 name: `v${releaseVersion}`,
 body: `v${releaseVersion}`,
 draft: false,
 prerelease: true
 };
 console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

 request.post(
 {
 url: "https://api.github.com/repos/Microsoft/react-native/releases",
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader
 },
 json: true,
 body: createReleaseRequestBody
 },
 function(err, res, body) {
 if (err) {
 console.log(err);
 throw new Error("Error fetching release id.");
 }

 console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
 uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
 uploadTarBallToRelease();
 }
 );
}

doPublish();

84 changes: 84 additions & 0 deletions
.ado/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
 - job: RNGithubPublish
 displayName: React-Native GitHub Publish
 pool:
 name: OE Standard Pool
 demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
 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: NuGetCommand@2
 displayName: NuGet restore
 inputs:
 command: restore
 restoreSolution: ReactAndroid/packages.config
 feedsToUse: config
 #vstsFeed: # Required when feedsToUse == Select
 #includeNuGetOrg: true # Required when feedsToUse == Select
 nugetConfigPath: ReactAndroid/NuGet.Config
 #externalFeedCredentials: # Optional
 #noCache: false
 #disableParallelProcessing: false
 restoreDirectory: packages/
 verbosityRestore: Detailed # Options: quiet, normal, detailed
 #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
 #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
 #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
 #publishPackageMetadata: true # Optional
 #allowPackageConflicts: # Optional
 #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
 #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
 #packagesToPack: '**/*.csproj' # Required when command == Pack
 #configuration: '$(BuildConfiguration)' # Optional
 #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
 #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
 #includeReferencedProjects: false # Optional
 #versionEnvVar: # Required when versioningScheme == ByEnvVar
 #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
 #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
 #includeSymbols: false # Optional
 #toolPackage: # Optional
 #buildProperties: # Optional
 #basePath: # Optional
 #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
 #arguments: # Required when command == Custom

 - task: CmdLine@1
 displayName: 'npm auth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

 - task: CmdLine@2
 displayName: Do Publish
 inputs:
 script: node .ado/publish.js

 - task: CmdLine@1
 displayName: 'npm unauth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'


16 changes: 15 additions & 1 deletion
CHANGELOG.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
 "name": "@microsoft/react-native",
 "name": "react-native",
 "entries": [
 {
 "version": "0.0.2",
 "tag": "react-native_v0.0.2",
 "date": "Wed, 06 Mar 2019 05:43:46 GMT",
 "comments": {
 "patch": [
 {
 "comment": "Rename microsoft react-native",
 "author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
 "commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
 }
 ]
 }
 },
 {
 "version": "0.3.9",
 "tag": "@microsoft/react-native_v0.3.9",
Expand Down

11 changes: 9 additions & 2 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down

12 changes: 12 additions & 0 deletions
Libraries/Components/TextInput/TextInputState.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.focusTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.focus,
 null,
 );
 }
 }
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.blurTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.blur,
 null,
 );
 }
 }
}
Expand Down

4 changes: 4 additions & 0 deletions
Libraries/Components/Touchable/TouchableBounce.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}
 hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down

10 changes: 6 additions & 4 deletions
Libraries/Components/Touchable/TouchableHighlight.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={StyleSheet.compose(
 this.props.style,
 this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
 onMouseLeave={this.props.onMouseLeave}
 onDragEnter={this.props.onDragEnter}
 onDragLeave={this.props.onDragLeave}
 onDrop={this.props.onDrop}
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}>
 {React.cloneElement(child, {
Expand Down

2 changes: 2 additions & 0 deletions
Libraries/Components/Touchable/TouchableOpacity.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={[this.props.style, {opacity: this.state.anim}]}
 nativeID={this.props.nativeID}
 testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sync from internal by acoates-ms · Pull Request #6 · microsoft/react-native-macos · GitHub
Skip to content
sync from internal#6

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.

 Sign up for GitHub

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

Onti Vals (ontzic)
merged 1 commit into

from

Mar 7, 2019
 Merged


sync from internal
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


164 changes: 164 additions & 0 deletions
.ado/publish.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
 try {
 console.log(`Running command: ${command}`);
 return execSync(command, {
 stdio: "inherit"
 });
 } catch (err) {
 process.exitCode = 1;
 console.log(`Failure running: ${command}`);
 throw err;
 }
}

function doPublish() {
 const publishBranchName = process.env.publishBranchName;

 const tempPublishBranch = `publish-${Date.now()}`;

 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

 let releaseVersion = pkgJson.version;

 const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
 if (versionGroups) {
 releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
 } else {
 if (releaseVersion.indexOf("-") === -1) {
 releaseVersion = releaseVersion + "-microsoft.0";
 } else {
 console.log("Invalid version to publish");
 exit(1);
 }
 }

 pkgJson.version = releaseVersion;
 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
 console.log(`Updating package.json to version ${releaseVersion}`);

 exec(`git checkout -b ${tempPublishBranch}`);

 exec(`git add ${pkgJsonPath}`);
 exec(`git commit -m "Applying package update to ${releaseVersion}`);
 exec(`git tag v${releaseVersion}`);
 exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
 exec(`git push origin tag v${releaseVersion}`);

 // -------- Generating Android Artifacts with JavaDoc
 exec("gradlew installArchives");

 // undo uncommenting javadoc setting
 exec("git checkout ReactAndroid/gradle.properties");

 // Configure npm to publish to internal feed
 const npmrcPath = path.resolve(__dirname, "../.npmrc");
 const npmrcContents = `registry=https:${
 process.env.publishnpmfeed
 }/registry/\nalways-auth=true`;
 console.log(`Creating ${npmrcPath} for publishing:`);
 console.log(npmrcContents);
 fs.writeFileSync(npmrcPath, npmrcContents);

 exec(`npm publish`);
 exec(`del ${npmrcPath}`);

 // Push tar to GitHub releases
 exec(`npm pack`);

 const npmTarPath = path.resolve(
 __dirname,
 `../react-native-${releaseVersion}.tgz`
 );
 const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
 const authHeader =
 "Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
 const userAgent = "Microsoft-React-Native-Release-Agent";

 let uploadReleaseAssetUrl = "";
 exec("npm install request@^2.69.0 --no-save");

 const request = require("request");

 const uploadTarBallToRelease = function() {
 request.post(
 {
 url: uploadReleaseAssetUrl,
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader,
 "Content-Type": "application/octet-stream"
 },
 formData: {
 file: fs.createReadStream(npmTarPath)
 }
 },
 function(err, res, body) {
 if (err) {
 console.error(err);
 process.exitCode = 1;
 throw err;
 }

 var formattedResponse = JSON.parse(body);

 if (formattedResponse.errors) {
 process.exitCode = 1;
 console.error(formattedResponse.errors);
 throw formattedResponse.errors;
 }

 exec(`del ${npmTarPath}`);
 exec(`git checkout ${publishBranchName}`);
 exec(`git pull origin ${publishBranchName}`);
 exec(`git merge ${tempPublishBranch} --no-edit`);
 exec(
 `git push origin HEAD:${publishBranchName} --follow-tags --verbose`
 );
 exec(`git branch -d ${tempPublishBranch}`);
 exec(`git push origin --delete -d ${tempPublishBranch}`);
 }
 );
 };

 const createReleaseRequestBody = {
 tag_name: `v${releaseVersion}`,
 target_commitish: tempPublishBranch,
 name: `v${releaseVersion}`,
 body: `v${releaseVersion}`,
 draft: false,
 prerelease: true
 };
 console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

 request.post(
 {
 url: "https://api.github.com/repos/Microsoft/react-native/releases",
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader
 },
 json: true,
 body: createReleaseRequestBody
 },
 function(err, res, body) {
 if (err) {
 console.log(err);
 throw new Error("Error fetching release id.");
 }

 console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
 uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
 uploadTarBallToRelease();
 }
 );
}

doPublish();

84 changes: 84 additions & 0 deletions
.ado/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
 - job: RNGithubPublish
 displayName: React-Native GitHub Publish
 pool:
 name: OE Standard Pool
 demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
 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: NuGetCommand@2
 displayName: NuGet restore
 inputs:
 command: restore
 restoreSolution: ReactAndroid/packages.config
 feedsToUse: config
 #vstsFeed: # Required when feedsToUse == Select
 #includeNuGetOrg: true # Required when feedsToUse == Select
 nugetConfigPath: ReactAndroid/NuGet.Config
 #externalFeedCredentials: # Optional
 #noCache: false
 #disableParallelProcessing: false
 restoreDirectory: packages/
 verbosityRestore: Detailed # Options: quiet, normal, detailed
 #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
 #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
 #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
 #publishPackageMetadata: true # Optional
 #allowPackageConflicts: # Optional
 #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
 #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
 #packagesToPack: '**/*.csproj' # Required when command == Pack
 #configuration: '$(BuildConfiguration)' # Optional
 #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
 #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
 #includeReferencedProjects: false # Optional
 #versionEnvVar: # Required when versioningScheme == ByEnvVar
 #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
 #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
 #includeSymbols: false # Optional
 #toolPackage: # Optional
 #buildProperties: # Optional
 #basePath: # Optional
 #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
 #arguments: # Required when command == Custom

 - task: CmdLine@1
 displayName: 'npm auth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

 - task: CmdLine@2
 displayName: Do Publish
 inputs:
 script: node .ado/publish.js

 - task: CmdLine@1
 displayName: 'npm unauth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'


16 changes: 15 additions & 1 deletion
CHANGELOG.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
 "name": "@microsoft/react-native",
 "name": "react-native",
 "entries": [
 {
 "version": "0.0.2",
 "tag": "react-native_v0.0.2",
 "date": "Wed, 06 Mar 2019 05:43:46 GMT",
 "comments": {
 "patch": [
 {
 "comment": "Rename microsoft react-native",
 "author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
 "commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
 }
 ]
 }
 },
 {
 "version": "0.3.9",
 "tag": "@microsoft/react-native_v0.3.9",
Expand Down

11 changes: 9 additions & 2 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down

12 changes: 12 additions & 0 deletions
Libraries/Components/TextInput/TextInputState.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.focusTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.focus,
 null,
 );
 }
 }
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.blurTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.blur,
 null,
 );
 }
 }
}
Expand Down

4 changes: 4 additions & 0 deletions
Libraries/Components/Touchable/TouchableBounce.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}
 hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down

10 changes: 6 additions & 4 deletions
Libraries/Components/Touchable/TouchableHighlight.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={StyleSheet.compose(
 this.props.style,
 this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
 onMouseLeave={this.props.onMouseLeave}
 onDragEnter={this.props.onDragEnter}
 onDragLeave={this.props.onDragLeave}
 onDrop={this.props.onDrop}
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}>
 {React.cloneElement(child, {
Expand Down

2 changes: 2 additions & 0 deletions
Libraries/Components/Touchable/TouchableOpacity.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={[this.props.style, {opacity: this.state.anim}]}
 nativeID={this.props.nativeID}
 testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
sync from internal by acoates-ms · Pull Request #6 · microsoft/react-native-macos · GitHub
Skip to content
sync from internal#6

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.

 Sign up for GitHub

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

Onti Vals (ontzic)
merged 1 commit into

from

Mar 7, 2019
 Merged


sync from internal
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


164 changes: 164 additions & 0 deletions
.ado/publish.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
// Used to publish this fork of react-native
// Publish it as an attached tar asset to the GitHub release for general consumption, since we can't publish this to the npmjs npm feed

const fs = require("fs");
const path = require("path");
const execSync = require("child_process").execSync;

function exec(command) {
 try {
 console.log(`Running command: ${command}`);
 return execSync(command, {
 stdio: "inherit"
 });
 } catch (err) {
 process.exitCode = 1;
 console.log(`Failure running: ${command}`);
 throw err;
 }
}

function doPublish() {
 const publishBranchName = process.env.publishBranchName;

 const tempPublishBranch = `publish-${Date.now()}`;

 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));

 let releaseVersion = pkgJson.version;

 const versionGroups = /(.*-microsoft\.)([0-9]*)/.exec(releaseVersion);
 if (versionGroups) {
 releaseVersion = versionGroups[1] + (parseInt(versionGroups[2]) + 1);
 } else {
 if (releaseVersion.indexOf("-") === -1) {
 releaseVersion = releaseVersion + "-microsoft.0";
 } else {
 console.log("Invalid version to publish");
 exit(1);
 }
 }

 pkgJson.version = releaseVersion;
 fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
 console.log(`Updating package.json to version ${releaseVersion}`);

 exec(`git checkout -b ${tempPublishBranch}`);

 exec(`git add ${pkgJsonPath}`);
 exec(`git commit -m "Applying package update to ${releaseVersion}`);
 exec(`git tag v${releaseVersion}`);
 exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);
 exec(`git push origin tag v${releaseVersion}`);

 // -------- Generating Android Artifacts with JavaDoc
 exec("gradlew installArchives");

 // undo uncommenting javadoc setting
 exec("git checkout ReactAndroid/gradle.properties");

 // Configure npm to publish to internal feed
 const npmrcPath = path.resolve(__dirname, "../.npmrc");
 const npmrcContents = `registry=https:${
 process.env.publishnpmfeed
 }/registry/\nalways-auth=true`;
 console.log(`Creating ${npmrcPath} for publishing:`);
 console.log(npmrcContents);
 fs.writeFileSync(npmrcPath, npmrcContents);

 exec(`npm publish`);
 exec(`del ${npmrcPath}`);

 // Push tar to GitHub releases
 exec(`npm pack`);

 const npmTarPath = path.resolve(
 __dirname,
 `../react-native-${releaseVersion}.tgz`
 );
 const assetUpdateUrl = `https://uploads.github.com/repos/Microsoft/react-native/releases/{id}/assets?name=react-native-${releaseVersion}.tgz`;
 const authHeader =
 "Basic " + new Buffer(":" + process.env.githubToken).toString("base64");
 const userAgent = "Microsoft-React-Native-Release-Agent";

 let uploadReleaseAssetUrl = "";
 exec("npm install request@^2.69.0 --no-save");

 const request = require("request");

 const uploadTarBallToRelease = function() {
 request.post(
 {
 url: uploadReleaseAssetUrl,
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader,
 "Content-Type": "application/octet-stream"
 },
 formData: {
 file: fs.createReadStream(npmTarPath)
 }
 },
 function(err, res, body) {
 if (err) {
 console.error(err);
 process.exitCode = 1;
 throw err;
 }

 var formattedResponse = JSON.parse(body);

 if (formattedResponse.errors) {
 process.exitCode = 1;
 console.error(formattedResponse.errors);
 throw formattedResponse.errors;
 }

 exec(`del ${npmTarPath}`);
 exec(`git checkout ${publishBranchName}`);
 exec(`git pull origin ${publishBranchName}`);
 exec(`git merge ${tempPublishBranch} --no-edit`);
 exec(
 `git push origin HEAD:${publishBranchName} --follow-tags --verbose`
 );
 exec(`git branch -d ${tempPublishBranch}`);
 exec(`git push origin --delete -d ${tempPublishBranch}`);
 }
 );
 };

 const createReleaseRequestBody = {
 tag_name: `v${releaseVersion}`,
 target_commitish: tempPublishBranch,
 name: `v${releaseVersion}`,
 body: `v${releaseVersion}`,
 draft: false,
 prerelease: true
 };
 console.log('createReleaseRequestBody: ' + JSON.stringify(createReleaseRequestBody, null, 2));

 request.post(
 {
 url: "https://api.github.com/repos/Microsoft/react-native/releases",
 headers: {
 "User-Agent": userAgent,
 Authorization: authHeader
 },
 json: true,
 body: createReleaseRequestBody
 },
 function(err, res, body) {
 if (err) {
 console.log(err);
 throw new Error("Error fetching release id.");
 }

 console.log("Created GitHub Release: " + JSON.stringify(body, null, 2));
 uploadReleaseAssetUrl = assetUpdateUrl.replace(/{id}/, body.id);
 uploadTarBallToRelease();
 }
 );
}

doPublish();

84 changes: 84 additions & 0 deletions
.ado/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
# This file defines the Android PR build steps used during the CI loop
name: $(Date:yyyyMMdd).$(Rev:.r)

trigger: none # will disable CI builds entirely

pr:
- master

jobs:
 - job: RNGithubPublish
 displayName: React-Native GitHub Publish
 pool:
 name: OE Standard Pool
 demands: ['Agent.OS -equals Windows_NT', 'ANDROID_NDK', 'OnPrem -equals False']
 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: NuGetCommand@2
 displayName: NuGet restore
 inputs:
 command: restore
 restoreSolution: ReactAndroid/packages.config
 feedsToUse: config
 #vstsFeed: # Required when feedsToUse == Select
 #includeNuGetOrg: true # Required when feedsToUse == Select
 nugetConfigPath: ReactAndroid/NuGet.Config
 #externalFeedCredentials: # Optional
 #noCache: false
 #disableParallelProcessing: false
 restoreDirectory: packages/
 verbosityRestore: Detailed # Options: quiet, normal, detailed
 #packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' # Required when command == Push
 #nuGetFeedType: 'internal' # Required when command == Push# Options: internal, external
 #publishVstsFeed: # Required when command == Push && NuGetFeedType == Internal
 #publishPackageMetadata: true # Optional
 #allowPackageConflicts: # Optional
 #publishFeedCredentials: # Required when command == Push && NuGetFeedType == External
 #verbosityPush: 'Detailed' # Options: quiet, normal, detailed
 #packagesToPack: '**/*.csproj' # Required when command == Pack
 #configuration: '$(BuildConfiguration)' # Optional
 #packDestination: '$(Build.ArtifactStagingDirectory)' # Optional
 #versioningScheme: 'off' # Options: off, byPrereleaseNumber, byEnvVar, byBuildNumber
 #includeReferencedProjects: false # Optional
 #versionEnvVar: # Required when versioningScheme == ByEnvVar
 #majorVersion: '1' # Required when versioningScheme == ByPrereleaseNumber
 #minorVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #patchVersion: '0' # Required when versioningScheme == ByPrereleaseNumber
 #packTimezone: 'utc' # Required when versioningScheme == ByPrereleaseNumber# Options: utc, local
 #includeSymbols: false # Optional
 #toolPackage: # Optional
 #buildProperties: # Optional
 #basePath: # Optional
 #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
 #arguments: # Required when command == Custom

 - task: CmdLine@1
 displayName: 'npm auth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken $(npmTokenOffice)'

 - task: CmdLine@2
 displayName: Do Publish
 inputs:
 script: node .ado/publish.js

 - task: CmdLine@1
 displayName: 'npm unauth'
 inputs:
 filename: npm
 arguments: 'config set $(publishnpmfeed)/registry/:_authToken XXXXX'


16 changes: 15 additions & 1 deletion
CHANGELOG.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
{
 "name": "@microsoft/react-native",
 "name": "react-native",
 "entries": [
 {
 "version": "0.0.2",
 "tag": "react-native_v0.0.2",
 "date": "Wed, 06 Mar 2019 05:43:46 GMT",
 "comments": {
 "patch": [
 {
 "comment": "Rename microsoft react-native",
 "author": "Andrew Coates (REDMOND) <acoates@microsoft.com>",
 "commit": "0c0c2e0fa8762dda21b96ec3031a90450a45607f"
 }
 ]
 }
 },
 {
 "version": "0.3.9",
 "tag": "@microsoft/react-native_v0.3.9",
Expand Down

11 changes: 9 additions & 2 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/react-native
# Change Log - react-native

This log was last generated on Tue, 05 Mar 2019 20:54:55 GMT and should not be manually modified.
This log was last generated on Wed, 06 Mar 2019 05:43:46 GMT and should not be manually modified.

## 0.0.2
Wed, 06 Mar 2019 05:43:46 GMT

### Patches

- Rename microsoft react-native

## 0.3.9
Tue, 05 Mar 2019 20:54:55 GMT
Expand Down

12 changes: 12 additions & 0 deletions
Libraries/Components/TextInput/TextInputState.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,12 @@ function focusTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.focusTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.focus,
 null,
 );
 }
 }
}
Expand All@@ -65,6 +71,12 @@ function blurTextInput(textFieldID: ?number) {
 UIManager.AndroidTextInput.Commands.blurTextInput,
 null,
 );
 } else if (Platform.OS === 'win32') {
 UIManager.dispatchViewManagerCommand(
 textFieldID,
 UIManager.RCTView.Commands.blur,
 null,
 );
 }
 }
}
Expand Down

4 changes: 4 additions & 0 deletions
Libraries/Components/Touchable/TouchableBounce.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,9 @@ const TouchableBounce = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}
 hitSlop={this.props.hitSlop}
Expand All@@ -175,6 +178,7 @@ const TouchableBounce = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined && !this.props.disabled} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down

10 changes: 6 additions & 4 deletions
Libraries/Components/Touchable/TouchableHighlight.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,8 +352,9 @@ const TouchableHighlight = ((createReactClass({
 accessibilityRole={this.props.accessibilityRole}
 accessibilityStates={this.props.accessibilityStates}
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS/win ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={StyleSheet.compose(
 this.props.style,
 this.state.extraUnderlayStyle,
Expand All@@ -371,14 +372,15 @@ const TouchableHighlight = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS/win ISS#2323203)
 onMouseLeave={this.props.onMouseLeave}
 onDragEnter={this.props.onDragEnter}
 onDragLeave={this.props.onDragLeave}
 onDrop={this.props.onDrop}
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS ISS#2323203)
 draggedTypes={this.props.draggedTypes} // ]TODO(macOS/win ISS#2323203)
 nativeID={this.props.nativeID}
 testID={this.props.testID}>
 {React.cloneElement(child, {
Expand Down

2 changes: 2 additions & 0 deletions
Libraries/Components/Touchable/TouchableOpacity.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,6 +262,7 @@ const TouchableOpacity = ((createReactClass({
 onAccessibilityTap={this.props.onAccessibilityTap} // TODO(OSS Candidate ISS#2710739)
 acceptsKeyboardFocus={(this.props.acceptsKeyboardFocus === undefined || this.props.acceptsKeyboardFocus) && !this.props.disabled} // TODO(macOS ISS#2323203)
 enableFocusRing={(this.props.enableFocusRing === undefined || this.props.enableFocusRing) && !this.props.disabled} // TODO(macOS ISS#2323203)
 tabIndex={this.props.tabIndex} // TODO(win ISS#2323203)
 style={[this.props.style, {opacity: this.state.anim}]}
 nativeID={this.props.nativeID}
 testID={this.props.testID}
Expand All@@ -278,6 +279,7 @@ const TouchableOpacity = ((createReactClass({
 onResponderMove={this.touchableHandleResponderMove}
 onResponderRelease={this.touchableHandleResponderRelease}
 onResponderTerminate={this.touchableHandleResponderTerminate}
 tooltip={this.props.tooltip} // TODO(macOS/win ISS#2323203)
 clickable={this.props.clickable !== false && this.props.onPress !== undefined} // TODO(android ISS)
 onClick={this.touchableHandlePress} // TODO(android ISS)
 onMouseEnter={this.props.onMouseEnter} // [TODO(macOS ISS#2323203)
Expand Down
Loading