Merge branch 'release/1.7.x'

mlaursen · Oct 19, 2018 · d46ae78 · d46ae78
2 parents c7a5e5f + 2668610
commit d46ae78
Show file tree

Hide file tree

Showing 43 changed files with 2,456 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -80,14 +80,14 @@ Please see the list of [examples](examples/) for how you can get a project start
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="https://unpkg.com/[email protected].1/dist/react-md.deep_purple-pink.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/[email protected].2/dist/react-md.deep_purple-pink.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons|Roboto:400,500,700">
   </head>
   <body>
     <div id="app"></div>
     <script src="https://unpkg.com/react/dist/react-with-addons.min.js"></script>
     <script src="https://unpkg.com/react-dom/dist/react-dom.min.js"></script>
-    <script src="https://unpkg.com/[email protected].1/dist/react-md.min.js"></script>
+    <script src="https://unpkg.com/[email protected].2/dist/react-md.min.js"></script>
     <script>
     var MyAwesomeComponent = React.createClass({
       render: function()  {

diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-md-documentation",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "The documentaiton website for react-md",
   "homepage": "https://react-md.mlaursen.com",
   "private": true,

diff --git a/docs/src/components/DiscoverMore/WhatsNew/README.md b/docs/src/components/DiscoverMore/WhatsNew/README.md
@@ -1,3 +1,7 @@
+## October 2018
+### v1.7.2 Released
+- Updated all `component` prop-types to not trigger a warning when the component was created with `React.forwardRef`. ([@luisrudge] - [pull-809])
+
 ## September 2018
 ### v1.7.1 Released
 - Reverted the `InkContainer` workaround for Preact since there were additional unwanted side-effects. [issues-801]

diff --git a/docs/src/components/InlineSVG.jsx b/docs/src/components/InlineSVG.jsx
@@ -10,6 +10,7 @@ InlineSVG.propTypes = {
   component: PropTypes.oneOfType([
     PropTypes.func,
     PropTypes.string,
+    PropTypes.object,
   ]).isRequired,
   src: PropTypes.string.isRequired,
 };

diff --git a/docs/src/components/Markdown/Markdown.jsx b/docs/src/components/Markdown/Markdown.jsx
@@ -15,6 +15,7 @@ export class PureMarkdown extends PureComponent {
     component: PropTypes.oneOfType([
       PropTypes.string,
       PropTypes.func,
+      PropTypes.object,
     ]).isRequired,
     history: PropTypes.object.isRequired,
     location: PropTypes.object.isRequired,

diff --git a/docs/src/components/PhoneEmulator/PhoneEmulator.jsx b/docs/src/components/PhoneEmulator/PhoneEmulator.jsx
@@ -117,6 +117,7 @@ PhoneEmulator.propTypes = {
   contentComponent: PropTypes.oneOfType([
     PropTypes.func,
     PropTypes.string,
+    PropTypes.object,
   ]).isRequired,
   transitionContent: PropTypes.bool,
   contentId: PropTypes.string,