From f3faedab8bd8f1c90d3c729eb85c9e37cb09c8ca Mon Sep 17 00:00:00 2001 From: myxvisual Date: Tue, 22 May 2018 09:34:54 +0800 Subject: [PATCH] fix: Fixed IS_NODE_ENV support detect electron environment and close #47 --- src/common/electron/IS_ELECTRON_ENV.ts | 4 ++++ src/common/nodeJS/IS_NODE_ENV.ts | 4 +++- src/styles/StyleManager.ts | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/common/electron/IS_ELECTRON_ENV.ts diff --git a/src/common/electron/IS_ELECTRON_ENV.ts b/src/common/electron/IS_ELECTRON_ENV.ts new file mode 100644 index 00000000..f97cdcb1 --- /dev/null +++ b/src/common/electron/IS_ELECTRON_ENV.ts @@ -0,0 +1,4 @@ +const userAgent = navigator.userAgent.toLowerCase(); +const isElectronEnv = userAgent.includes(" electron/"); + +export default isElectronEnv; diff --git a/src/common/nodeJS/IS_NODE_ENV.ts b/src/common/nodeJS/IS_NODE_ENV.ts index 8433db2d..e3978f5b 100644 --- a/src/common/nodeJS/IS_NODE_ENV.ts +++ b/src/common/nodeJS/IS_NODE_ENV.ts @@ -1,3 +1,5 @@ -const IS_NODE_ENV = global && global.process; +import IS_ELECTRON_ENV from "../electron/IS_ELECTRON_ENV"; + +const IS_NODE_ENV = global && global.process && !IS_ELECTRON_ENV; export default IS_NODE_ENV; diff --git a/src/styles/StyleManager.ts b/src/styles/StyleManager.ts index d3ca85a5..68ee57b7 100644 --- a/src/styles/StyleManager.ts +++ b/src/styles/StyleManager.ts @@ -1,6 +1,7 @@ import * as createHash from "murmurhash-js/murmurhash3_gc"; import IS_NODE_ENV from "../common/nodeJS/IS_NODE_ENV"; import isUnitlessNumber from "../common/react/isUnitlessNumber"; +import isElectronEnv from "../common/electron/IS_ELECTRON_ENV"; export const replace2Dashes = (key: string) => key.replace(/[A-Z]/g, $1 => `-${$1.toLowerCase()}`); export const getStyleValue = (key: string, value: string) => ((typeof value === "number" && !(isUnitlessNumber as any)[key]) ? `${value}px` : value);