mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-29 12:45:37 +08:00
Show a Toast for HMR
Summary:This is just to try out the experience with HMR if we show toasts (might be annoying). Let's try it out before deciding on merging/closing. Related #5906 Closes https://github.com/facebook/react-native/pull/5947 Differential Revision: D2987132 fb-gh-sync-id: 7bfbb6e1f0363a416805b67eb5674f79ac0881ad shipit-source-id: 7bfbb6e1f0363a416805b67eb5674f79ac0881ad
This commit is contained in:
committed by
Facebook Github Bot 9
parent
8a042f4654
commit
7c2c6a9d3f
@@ -7,19 +7,19 @@
|
|||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
* of patent rights can be found in the PATENTS file in the same directory.
|
||||||
*
|
*
|
||||||
* @providesModule HMRClient
|
* @providesModule HMRClient
|
||||||
|
* @flow
|
||||||
*/
|
*/
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const Platform = require('Platform');
|
const Platform = require('Platform');
|
||||||
const invariant = require('invariant');
|
const invariant = require('invariant');
|
||||||
const processColor = require('processColor');
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HMR Client that receives from the server HMR updates and propagates them
|
* HMR Client that receives from the server HMR updates and propagates them
|
||||||
* runtime to reflects those changes.
|
* runtime to reflects those changes.
|
||||||
*/
|
*/
|
||||||
const HMRClient = {
|
const HMRClient = {
|
||||||
enable(platform, bundleEntry, host, port) {
|
enable(platform: string, bundleEntry: string, host: string, port: number) {
|
||||||
invariant(platform, 'Missing required parameter `platform`');
|
invariant(platform, 'Missing required parameter `platform`');
|
||||||
invariant(bundleEntry, 'Missing required paramenter `bundleEntry`');
|
invariant(bundleEntry, 'Missing required paramenter `bundleEntry`');
|
||||||
invariant(host, 'Missing required paramenter `host`');
|
invariant(host, 'Missing required paramenter `host`');
|
||||||
@@ -54,22 +54,14 @@ Error: ${e.message}`
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
activeWS.onmessage = ({data}) => {
|
activeWS.onmessage = ({data}) => {
|
||||||
let DevLoadingView = require('NativeModules').DevLoadingView;
|
// Moving to top gives errors due to NativeModules not being initialized
|
||||||
if (!DevLoadingView) {
|
const HMRLoadingView = require('HMRLoadingView');
|
||||||
DevLoadingView = {
|
|
||||||
showMessage() {},
|
|
||||||
hide() {},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
|
|
||||||
switch (data.type) {
|
switch (data.type) {
|
||||||
case 'update-start': {
|
case 'update-start': {
|
||||||
DevLoadingView.showMessage(
|
HMRLoadingView.showMessage('Hot Loading...');
|
||||||
'Hot Loading...',
|
|
||||||
processColor('#000000'),
|
|
||||||
processColor('#aaaaaa'),
|
|
||||||
);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'update': {
|
case 'update': {
|
||||||
@@ -117,15 +109,15 @@ Error: ${e.message}`
|
|||||||
injectFunction(code, sourceURLs[i]);
|
injectFunction(code, sourceURLs[i]);
|
||||||
});
|
});
|
||||||
|
|
||||||
DevLoadingView.hide();
|
HMRLoadingView.hide();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'update-done': {
|
case 'update-done': {
|
||||||
DevLoadingView.hide();
|
HMRLoadingView.hide();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'error': {
|
case 'error': {
|
||||||
DevLoadingView.hide();
|
HMRLoadingView.hide();
|
||||||
throw new Error(data.body.type + ' ' + data.body.description);
|
throw new Error(data.body.type + ' ' + data.body.description);
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
|
|||||||
38
Libraries/Utilities/HMRLoadingView.android.js
Normal file
38
Libraries/Utilities/HMRLoadingView.android.js
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2015-present, Facebook, Inc.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the BSD-style license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
* of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
*
|
||||||
|
* @providesModule HMRLoadingView
|
||||||
|
* @flow
|
||||||
|
*/
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
var ToastAndroid = require('ToastAndroid');
|
||||||
|
|
||||||
|
const TOAST_SHORT_DELAY = 2000;
|
||||||
|
|
||||||
|
class HMRLoadingView {
|
||||||
|
static _showing: boolean;
|
||||||
|
|
||||||
|
static showMessage(message: string) {
|
||||||
|
if (HMRLoadingView._showing) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ToastAndroid.show(message, ToastAndroid.SHORT);
|
||||||
|
HMRLoadingView._showing = true;
|
||||||
|
setTimeout(() => {
|
||||||
|
HMRLoadingView._showing = false;
|
||||||
|
}, TOAST_SHORT_DELAY);
|
||||||
|
}
|
||||||
|
|
||||||
|
static hide() {
|
||||||
|
// noop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = HMRLoadingView;
|
||||||
32
Libraries/Utilities/HMRLoadingView.ios.js
Normal file
32
Libraries/Utilities/HMRLoadingView.ios.js
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2015-present, Facebook, Inc.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the BSD-style license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
* of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
*
|
||||||
|
* @providesModule HMRLoadingView
|
||||||
|
* @flow
|
||||||
|
*/
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
const processColor = require('processColor');
|
||||||
|
const { DevLoadingView } = require('NativeModules');
|
||||||
|
|
||||||
|
class HMRLoadingView {
|
||||||
|
static showMessage(message: string) {
|
||||||
|
DevLoadingView.showMessage(
|
||||||
|
message,
|
||||||
|
processColor('#000000'),
|
||||||
|
processColor('#aaaaaa'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static hide() {
|
||||||
|
DevLoadingView.hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = HMRLoadingView;
|
||||||
Reference in New Issue
Block a user