V9 changes to master

.eslintignore

@@ -15,3 +15,6 @@ tests/coverage
 /html
 /docs/js
 node_modules
+
+# TODO: Upgrade to ESLint4 so we can apply a specific rule (one for CJS code) for below files
+src/**/*.config.js

.gitignore

@@ -38,3 +38,6 @@ tests/coverage
 
 # a11y testing
 .aat.yml
+
+# Generated by npm@5, but project currently uses Yarn
+package-lock.json

demo/.babelrc

@@ -11,5 +11,5 @@
     ],
     "react"
   ],
-  "plugins": ["transform-class-properties", "dev-expression"]
+  "plugins": ["transform-class-properties", "transform-object-rest-spread", "dev-expression"]
 }

demo/js/components/CodePage/CodePage.js

@@ -4,60 +4,36 @@ import Markdown from 'markdown-it';
 
 import ComponentExample from '../ComponentExample/ComponentExample';
 
-/**
- * @param {ComponentCollection|Component} metadata The component data.
- * @returns {string} The HTML snippet for the component.
- */
-const getContent = metadata => {
-  const { variants = {} } = metadata;
-  const { items = [] } = variants;
-  const variant = items[0];
-  return metadata.content || (variant && variant.content) || '';
-};
-
-/**
- * @param {ComponentCollection|Component} metadata The component data.
- * @returns {Component[]|Variant[]} The data of the component variants.
- */
-const getSubItems = metadata => {
-  if (metadata.isCollection) {
-    return metadata.items;
-  }
-  if (!metadata.isCollated) {
-    return metadata.variants.items;
-  }
-  return [];
-};
-
 /**
  * The page to show the component demo, its code as well as its README.
  */
 const CodePage = ({ metadata, hideViewFullRender }) => {
   const md = new Markdown({ html: true });
-  const subItems = getSubItems(metadata).filter(item => !item.isHidden);
+  const subItems = (metadata.items || []).filter(item => !item.isHidden);
+  /* eslint-disable react/no-danger */
   const componentContent =
     !metadata.isCollection && subItems.length <= 1 ? (
       <ComponentExample
         hideViewFullRender={hideViewFullRender}
         component={metadata.name}
-        htmlFile={getContent(metadata)}
+        htmlFile={metadata.renderedContent}
         useIframe={metadata.useIframe}
       />
     ) : (
       subItems.map(item => (
         <div key={item.id} className="component-variation">
           <h2 className="component-variation__name">{item.label}</h2>
+          {item.notes && metadata.notes !== item.notes && <p>{item.notes}</p>}
           <ComponentExample
             variant={item.handle.replace(/--default$/, '')}
             component={metadata.name}
-            htmlFile={getContent(item)}
+            htmlFile={item.renderedContent}
             useIframe={metadata.useIframe}
           />
         </div>
       ))
     );
 
-  /* eslint-disable react/no-danger */
   return (
     <div className="page code-page test">
       {componentContent}

demo/js/components/ComponentExample/ComponentExample.js

@@ -134,7 +134,8 @@ class ComponentExample extends Component {
     });
 
     const codepenLink = codepenSlug && `https://codepen.io/team/carbon/full/${codepenSlug}/`;
-    const componentLink = variant ? `/component/${component}/${variant}` : `/component/${component}`;
+    const variantSuffix = (component === variant && '--default') || '';
+    const componentLink = variant ? `/component/${variant}${variantSuffix}` : `/component/${component}`;
 
     const viewFullRender = hideViewFullRender ? null : (
       <Link className="component-example__view-full-render" target="_blank" href={codepenLink || componentLink}>

demo/js/components/RootPage.js

@@ -6,6 +6,67 @@ import SideNav from './SideNav';
 import PageHeader from './PageHeader/PageHeader';
 import SideNavToggle from './SideNavToggle/SideNavToggle';
 
+const checkStatus = response => {
+  if (response.status >= 200 && response.status < 400) {
+    return response;
+  }
+
+  const error = new Error(response.statusText);
+  error.response = response;
+  throw error;
+};
+
+const load = (componentItems, selectedNavItemId) => {
+  const metadata = componentItems && componentItems.find(item => item.id === selectedNavItemId);
+  const subItems = metadata.items || [];
+  const hasRenderedContent =
+    !metadata.isCollection && subItems.length <= 1 ? metadata.renderedContent : subItems.every(item => item.renderedContent);
+  if (!hasRenderedContent) {
+    return fetch(`/code/${metadata.name}`)
+      .then(checkStatus)
+      .then(response => {
+        const contentType = response.headers.get('content-type');
+        return contentType && contentType.includes('application/json') ? response.json() : response.text();
+      })
+      .then(responseContent => {
+        if (Object(responseContent) === responseContent) {
+          return componentItems.map(item => {
+            if (item.id !== selectedNavItemId) {
+              return item;
+            }
+            return !item.items
+              ? {
+                  ...item,
+                  renderedContent: responseContent[`${item.handle}--default`],
+                }
+              : {
+                  ...item,
+                  items: item.items.map(
+                    subItem =>
+                      !responseContent[subItem.handle]
+                        ? subItem
+                        : {
+                            ...subItem,
+                            renderedContent: responseContent[subItem.handle],
+                          }
+                  ),
+                };
+          });
+        }
+        return componentItems.map(
+          item =>
+            item.id !== selectedNavItemId
+              ? item
+              : {
+                  ...item,
+                  renderedContent: responseContent,
+                }
+        );
+      });
+  }
+  return Promise.resolve(null);
+};
+
 /**
  * The top-most React component for dev env page.
  */
@@ -22,9 +83,19 @@ class RootPage extends Component {
     docItems: PropTypes.arrayOf(PropTypes.shape()).isRequired, // eslint-disable-line react/no-unused-prop-types
   };
 
-  constructor() {
+  constructor(props) {
     super();
-    this.state = {};
+
+    const { componentItems } = props;
+
+    this.state = {
+      /**
+       * The array of component data.
+       * @type {Object[]}
+       */
+      componentItems,
+    };
+
     window.addEventListener('popstate', evt => {
       this.switchTo(evt.state.name);
     });
@@ -42,6 +113,13 @@ class RootPage extends Component {
     }
   }
 
+  componentWillReceiveProps(props) {
+    const { componentItems } = props;
+    if (this.props.componentItems !== componentItems) {
+      this.setState({ componentItems });
+    }
+  }
+
   /**
    * The handler for changing in the state of side nav's toggle button.
    */
@@ -53,7 +131,7 @@ class RootPage extends Component {
    * The handler for the `click` event on the side nav for changing selection.
    */
   onSideNavItemClick = evt => {
-    const { componentItems } = this.props;
+    const { componentItems } = this.state;
     const selectedNavItem = componentItems && componentItems.find(item => item.id === evt.target.dataset.navId);
     if (selectedNavItem) {
       this.switchTo(selectedNavItem.id);
@@ -64,7 +142,7 @@ class RootPage extends Component {
    * @returns The component data that is currently selected.
    */
   getCurrentComponentItem() {
-    const { componentItems } = this.props;
+    const { componentItems } = this.state;
     return componentItems && componentItems.find(item => item.id === this.state.selectedNavItemId);
   }
 
@@ -74,17 +152,22 @@ class RootPage extends Component {
    */
   switchTo(selectedNavItemId) {
     this.setState({ selectedNavItemId }, () => {
-      const { componentItems } = this.props;
+      const { componentItems } = this.state;
       const selectedNavItem = componentItems && componentItems.find(item => item.id === selectedNavItemId);
       const { name } = selectedNavItem || {};
       if (name) {
         history.pushState({ name }, name, `/demo/${name}`);
       }
+      load(componentItems, selectedNavItemId).then(newComponentItems => {
+        if (newComponentItems) {
+          this.setState({ componentItems: newComponentItems });
+        }
+      });
     });
   }
 
   render() {
-    const { componentItems } = this.props;
+    const { componentItems } = this.state;
     const metadata = this.getCurrentComponentItem();
     const { name, label } = metadata || {};
     const classNames = classnames({

demo/polyfills/devenv.js

@@ -1,4 +1,14 @@
 // Polyfill for dev env UI based on `carbon-components-react`
-/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable import/no-extraneous-dependencies, global-require */
+import 'core-js/modules/es6.string.includes';
 import 'core-js/modules/es7.object.values';
-/* eslint-enable import/no-extraneous-dependencies */
+import 'whatwg-fetch';
+
+if (typeof Promise === 'undefined') {
+  // Rejection tracking prevents a common issue where React gets into an
+  // inconsistent state due to an error, but it gets swallowed by a Promise,
+  // and the user has no idea what causes React's erratic future behavior.
+  require('promise/lib/rejection-tracking').enable();
+  window.Promise = require('promise/lib/es6-extensions.js');
+}
+/* eslint-enable import/no-extraneous-dependencies, global-require */

demo/scss/_page.scss

@@ -75,12 +75,12 @@ td {
     }
   }
 
-  button {
-    border-radius: 0;
-  }
-
   & > *:not(.component-example):not(.component-variation),
-  & >  {
+  & > {
+    button {
+      border-radius: 0;
+    }
+
     .page__divider-heading {
       @include typescale('zeta');
       font-weight: 600;

demo/views/demo-nav-data.hbs

@@ -0,0 +1,15 @@
+<script>
+  var needIframe = [
+    'detail-page-header',
+    'footer',
+    'grid',
+    'unified-header',
+  ];
+  var componentItems = {{{JSONstringify componentItems}}}.map(function (item) {
+    if (needIframe.indexOf(item.name) >= 0) {
+      item.useIframe = true;
+    }
+    return item;
+  });
+  var docItems = {{{JSONstringify docItems}}};
+</script>

demo/views/demo-nav.dust → demo/views/layouts/demo-nav.hbs

@@ -23,21 +23,7 @@
   <body>
     <div data-renderroot></div>
     <input aria-label="inpute-text-offleft" type="text" class="offleft" />
-    <script>
-      var needIframe = [
-        'detail-page-header',
-        'footer',
-        'grid',
-        'unified-header',
-      ];
-      var componentItems = {componentItems|js|s}.map(function (item) {
-        if (needIframe.indexOf(item.name) >= 0) {
-          item.useIframe = true;
-        }
-        return item;
-      });
-      var docItems = {docItems|js|s};
-    </script>
+    {{{body}}}
     <script src="/demo/demo.js"></script>
   </body>
 </html>