From f344342bfb6f69d8b4e95f5928ca853d8356c0d8 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 12 Sep 2018 10:45:01 +0800
Subject: [PATCH] Show Drawer Setting in preview.pro.ant.design, close #2277

---
 .eslintrc.js               |  3 +++
 src/layouts/BasicLayout.js | 17 +++++++++++++----
 src/models/setting.js      |  6 ++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c3bbd9fc..f8d67ff9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,6 +9,9 @@ module.exports = {
     jest: true,
     jasmine: true,
   },
+  globals: {
+    APP_TYPE: true,
+  },
   rules: {
     'react/jsx-filename-extension': [1, { extensions: ['.js'] }],
     'react/jsx-wrap-multilines': 0,
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index 1acfc6a2..3b59e48a 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -201,6 +201,16 @@ class BasicLayout extends React.PureComponent {
     });
   };
 
+  renderSettingDrawer() {
+    // Do show SettingDrawer in production
+    // unless deployed in preview.pro.ant.design as demo
+    const { rendering } = this.state;
+    if ((rendering || process.env.NODE_ENV === 'production') && APP_TYPE !== 'site') {
+      return null;
+    }
+    return <SettingDrawer />;
+  }
+
   render() {
     const {
       navTheme,
@@ -208,7 +218,7 @@ class BasicLayout extends React.PureComponent {
       children,
       location: { pathname },
     } = this.props;
-    const { rendering, isMobile } = this.state;
+    const { isMobile } = this.state;
     const isTop = PropsLayout === 'topmenu';
     const menuData = this.getMenuData();
     const layout = (
@@ -242,6 +252,7 @@ class BasicLayout extends React.PureComponent {
         </Layout>
       </Layout>
     );
+
     return (
       <React.Fragment>
         <DocumentTitle title={this.getPageTitle(pathname)}>
@@ -253,9 +264,7 @@ class BasicLayout extends React.PureComponent {
             )}
           </ContainerQuery>
         </DocumentTitle>
-        {(rendering || process.env.NODE_ENV === 'production') ? null : ( // Do show SettingDrawer in production
-          <SettingDrawer />
-        )}
+        {this.renderSettingDrawer()}
       </React.Fragment>
     );
   }
diff --git a/src/models/setting.js b/src/models/setting.js
index 0feaa908..477a9588 100644
--- a/src/models/setting.js
+++ b/src/models/setting.js
@@ -4,11 +4,9 @@ import defaultSettings from '../defaultSettings';
 let lessNodesAppended;
 const updateTheme = primaryColor => {
   // // Don't compile less in production!
-  /* eslint-disable */
   if (APP_TYPE !== 'site') {
     return;
   }
-  /* eslint-disable */
   // Determine if the component is remounted
   if (!primaryColor) {
     return;
@@ -111,8 +109,8 @@ export default {
       if (state.primaryColor !== primaryColor) {
         updateTheme(primaryColor);
       }
-      if (state.contentWidth !== contentWidth) {
-        window.dispatchEvent ? window.dispatchEvent(new Event('resize')) : null;
+      if (state.contentWidth !== contentWidth && window.dispatchEvent) {
+        window.dispatchEvent(new Event('resize'));
       }
       updateColorWeak(colorWeak);
       window.history.replaceState(null, 'setting', urlParams.href);
-- 
GitLab