review

mui · Nov 25, 2020 · 2cddd1a · 2cddd1a
1 parent 0cc7025
commit 2cddd1a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 21 deletions.
diff --git a/docs/next.config.js b/docs/next.config.js
@@ -36,7 +36,7 @@ module.exports = {
           CONTEXT: JSON.stringify(process.env.CONTEXT),
           LIB_VERSION: JSON.stringify(pkg.version),
           REACT_MODE: JSON.stringify(reactMode),
-          ENABLE_EXPERIMENTAL: JSON.stringify(
+          EXPERIMENTAL_ENABLED: JSON.stringify(
             // Set by Netlify
             process.env.PULL_REQUEST === 'false' ? 'false' : 'true',
           ),

diff --git a/packages/grid/_modules_/grid/constants/envConstants.ts b/packages/grid/_modules_/grid/constants/envConstants.ts
@@ -0,0 +1,8 @@
+import { localStorageAvailable } from '../utils/utils';
+
+const force =
+  localStorageAvailable() && window.localStorage.getItem('EXPERIMENTAL_ENABLED') != null;
+
+export const EXPERIMENTAL_ENABLED =
+  process.env.EXPERIMENTAL_ENABLED !== undefined &&
+  (process.env.EXPERIMENTAL_ENABLED === 'true' || force);
diff --git a/packages/grid/_modules_/grid/constants/index.ts b/packages/grid/_modules_/grid/constants/index.ts
@@ -1,2 +1,3 @@
+export * from './envConstants';
 export * from './eventsConstants';
 export * from './cssClassesConstants';
diff --git a/packages/grid/_modules_/grid/hooks/utils/useLogger.ts b/packages/grid/_modules_/grid/hooks/utils/useLogger.ts
@@ -1,19 +1,5 @@
 import * as React from 'react';
-import { isFunction } from '../../utils/utils';
-
-function localStorageAvailable() {
-  try {
-    // Incognito mode might reject access to the localStorage for security reasons.
-    // window isn't defined on Node.js
-    // https://stackoverflow.com/questions/16427636/check-if-localstorage-is-available
-    const key = '__some_random_key_you_are_not_going_to_use__';
-    window.localStorage.setItem(key, key);
-    window.localStorage.removeItem(key);
-    return true;
-  } catch (err) {
-    return false;
-  }
-}
+import { isFunction, localStorageAvailable } from '../../utils/utils';
 
 const forceDebug = localStorageAvailable() && window.localStorage.getItem('DEBUG') != null;
 

diff --git a/packages/grid/_modules_/grid/models/gridOptions.tsx b/packages/grid/_modules_/grid/models/gridOptions.tsx
@@ -19,6 +19,7 @@ import { RowSelectedParams } from './params/rowSelectedParams';
 import { SelectionChangeParams } from './params/selectionChangeParams';
 import { SortModelParams } from './params/sortModelParams';
 import { SortDirection, SortModel } from './sortModel';
+import { EXPERIMENTAL_ENABLED } from '../constants/envConstants';
 
 /**
  * Set of icons used in the grid component UI.
@@ -307,10 +308,10 @@ export const DEFAULT_GRID_OPTIONS: GridOptions = {
   sortingMode: FeatureModeConstant.client,
   sortingOrder: ['asc', 'desc', null],
   columnTypes: DEFAULT_COLUMN_TYPES,
-  disableColumnMenu: process.env.ENABLE_EXPERIMENTAL !== 'true',
-  disableColumnFilter: process.env.ENABLE_EXPERIMENTAL !== 'true',
-  disableColumnSelector: process.env.ENABLE_EXPERIMENTAL !== 'true',
-  hideToolbar: process.env.ENABLE_EXPERIMENTAL !== 'true',
+  disableColumnMenu: EXPERIMENTAL_ENABLED,
+  disableColumnFilter: EXPERIMENTAL_ENABLED,
+  disableColumnSelector: EXPERIMENTAL_ENABLED,
+  hideToolbar: EXPERIMENTAL_ENABLED,
   icons: {
     ColumnFiltering: FilterIcon,
     ColumnSelector: ColumnIcon,

diff --git a/packages/grid/_modules_/grid/utils/utils.ts b/packages/grid/_modules_/grid/utils/utils.ts
@@ -30,3 +30,17 @@ export function isFunction(value: any): value is Function {
 export function isObject(value: any): value is Record<string, any> {
   return typeof value === 'object';
 }
+
+export function localStorageAvailable() {
+  try {
+    // Incognito mode might reject access to the localStorage for security reasons.
+    // window isn't defined on Node.js
+    // https://stackoverflow.com/questions/16427636/check-if-localstorage-is-available
+    const key = '__some_random_key_you_are_not_going_to_use__';
+    window.localStorage.setItem(key, key);
+    window.localStorage.removeItem(key);
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
diff --git a/packages/storybook/.storybook/main.js b/packages/storybook/.storybook/main.js
@@ -75,7 +75,7 @@ module.exports = {
     config.plugins.push(
       new webpack.DefinePlugin({
         'process.env': {
-          ENABLE_EXPERIMENTAL: JSON.stringify(
+          EXPERIMENTAL_ENABLED: JSON.stringify(
             // Set by Netlify
             process.env.PULL_REQUEST === 'false' ? 'false' : 'true',
           ),