feat: 将组件的 styleIsolation 设为 shared，以支持在高阶组件中设置基础组件的样式

fjc0k · Apr 12, 2019 · a8fda4c · a8fda4c
1 parent e00684f
commit a8fda4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/global.d.ts b/global.d.ts
@@ -9,8 +9,17 @@ declare module '*.scss'
 declare module '*.sass'
 declare module '*.styl'
 
+// @ts-ignore
+declare const process: {
+  env: {
+    TARO_ENV: 'weapp' | 'swan' | 'alipay' | 'h5' | 'rn' | 'tt',
+    [key: string]: any,
+  },
+}
+
 declare namespace wx {
   interface ComponentOptions {
     addGlobalClass?: boolean,
+    styleIsolation?: 'isolated' | 'apply-shared' | 'shared' | 'page-isolated' | 'page-apply-shared' | 'page-shared',
   }
 }
diff --git a/src/components/component.ts b/src/components/component.ts
@@ -42,15 +42,16 @@ const component = <
     Overwrite<PP, ExtraProps>,
     Overwrite<SS, ExtraState>
   > {
-    static options: wx.ComponentOptions = {
-      addGlobalClass: !disableGlobalClass,
+    static options: wx.ComponentOptions = disableGlobalClass ? {} : {
+      addGlobalClass: true,
+      styleIsolation: 'shared',
     }
 
     static defaultProps: P = props
 
     constructor() {
       super(...arguments)
-      if (Taro.getEnv() !== Taro.ENV_TYPE.WEB) {
+      if (process.env.TARO_ENV !== 'h5') {
         this.props = props as any
       }
       this.state = state as any