From 73cd35e8d3445c3ec3c9368b5c51e06271ea7574 Mon Sep 17 00:00:00 2001 From: Tyler Roussos Date: Mon, 19 Aug 2019 09:36:45 -0400 Subject: [PATCH 1/2] Floating Action Button Documentation Updates --- docs/src/pages/components/buttons/FloatingActionButtons.js | 4 ++-- docs/src/pages/components/buttons/FloatingActionButtons.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/pages/components/buttons/FloatingActionButtons.js b/docs/src/pages/components/buttons/FloatingActionButtons.js index 49afa80fa82e02..901fe0ba073fe8 100644 --- a/docs/src/pages/components/buttons/FloatingActionButtons.js +++ b/docs/src/pages/components/buttons/FloatingActionButtons.js @@ -2,7 +2,7 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; import Fab from '@material-ui/core/Fab'; import AddIcon from '@material-ui/icons/Add'; -import Icon from '@material-ui/core/Icon'; +import EditIcon from '@material-ui/icons/Edit'; import DeleteIcon from '@material-ui/icons/Delete'; import NavigationIcon from '@material-ui/icons/Navigation'; @@ -24,7 +24,7 @@ export default function FloatingActionButtons() { - edit_icon + diff --git a/docs/src/pages/components/buttons/FloatingActionButtons.tsx b/docs/src/pages/components/buttons/FloatingActionButtons.tsx index 397f94722cee8e..08ccc27ce362c0 100644 --- a/docs/src/pages/components/buttons/FloatingActionButtons.tsx +++ b/docs/src/pages/components/buttons/FloatingActionButtons.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'; import Fab from '@material-ui/core/Fab'; import AddIcon from '@material-ui/icons/Add'; -import Icon from '@material-ui/core/Icon'; +import EditIcon from '@material-ui/icons/Edit'; import DeleteIcon from '@material-ui/icons/Delete'; import NavigationIcon from '@material-ui/icons/Navigation'; @@ -26,7 +26,7 @@ export default function FloatingActionButtons() { - edit_icon + From 646408705e8810583fec4f29dab5131edfc55d8f Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Tue, 20 Aug 2019 13:28:34 +0200 Subject: [PATCH 2/2] Add regression test --- .../LabelBottomNavigation.js | 4 ++-- .../LabelBottomNavigation.tsx | 4 ++-- .../pages/components/buttons/IconButtons.js | 4 ++-- .../pages/components/buttons/IconButtons.tsx | 4 ++-- test/regressions/tests/Button/FontSvgIcons.js | 24 +++++++++++++++++++ 5 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 test/regressions/tests/Button/FontSvgIcons.js diff --git a/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.js b/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.js index 3708fcd9579c00..8aea9592b66270 100644 --- a/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.js +++ b/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.js @@ -2,7 +2,7 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; import BottomNavigation from '@material-ui/core/BottomNavigation'; import BottomNavigationAction from '@material-ui/core/BottomNavigationAction'; -import Icon from '@material-ui/core/Icon'; +import FolderIcon from '@material-ui/icons/Folder'; import RestoreIcon from '@material-ui/icons/Restore'; import FavoriteIcon from '@material-ui/icons/Favorite'; import LocationOnIcon from '@material-ui/icons/LocationOn'; @@ -26,7 +26,7 @@ export default function LabelBottomNavigation() { } /> } /> } /> - folder} /> + } /> ); } diff --git a/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.tsx b/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.tsx index 1df497ab4ddb27..123bc2ec80a48a 100644 --- a/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.tsx +++ b/docs/src/pages/components/bottom-navigation/LabelBottomNavigation.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; import BottomNavigation from '@material-ui/core/BottomNavigation'; import BottomNavigationAction from '@material-ui/core/BottomNavigationAction'; -import Icon from '@material-ui/core/Icon'; +import FolderIcon from '@material-ui/icons/Folder'; import RestoreIcon from '@material-ui/icons/Restore'; import FavoriteIcon from '@material-ui/icons/Favorite'; import LocationOnIcon from '@material-ui/icons/LocationOn'; @@ -26,7 +26,7 @@ export default function LabelBottomNavigation() { } /> } /> } /> - folder} /> + } /> ); } diff --git a/docs/src/pages/components/buttons/IconButtons.js b/docs/src/pages/components/buttons/IconButtons.js index 81aa92d9ea5994..f599a3ba1a8d1a 100644 --- a/docs/src/pages/components/buttons/IconButtons.js +++ b/docs/src/pages/components/buttons/IconButtons.js @@ -1,8 +1,8 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import Icon from '@material-ui/core/Icon'; import IconButton from '@material-ui/core/IconButton'; import DeleteIcon from '@material-ui/icons/Delete'; +import AlarmIcon from '@material-ui/icons/Alarm'; import AddShoppingCartIcon from '@material-ui/icons/AddShoppingCart'; import PhotoCamera from '@material-ui/icons/PhotoCamera'; @@ -27,7 +27,7 @@ export default function IconButtons() { - alarm + diff --git a/docs/src/pages/components/buttons/IconButtons.tsx b/docs/src/pages/components/buttons/IconButtons.tsx index 228284ebb95302..c369aadcc96e15 100644 --- a/docs/src/pages/components/buttons/IconButtons.tsx +++ b/docs/src/pages/components/buttons/IconButtons.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'; -import Icon from '@material-ui/core/Icon'; import IconButton from '@material-ui/core/IconButton'; import DeleteIcon from '@material-ui/icons/Delete'; +import AlarmIcon from '@material-ui/icons/Alarm'; import AddShoppingCartIcon from '@material-ui/icons/AddShoppingCart'; import PhotoCamera from '@material-ui/icons/PhotoCamera'; @@ -29,7 +29,7 @@ export default function IconButtons() { - alarm + diff --git a/test/regressions/tests/Button/FontSvgIcons.js b/test/regressions/tests/Button/FontSvgIcons.js new file mode 100644 index 00000000000000..73bada7a828e61 --- /dev/null +++ b/test/regressions/tests/Button/FontSvgIcons.js @@ -0,0 +1,24 @@ +import React from 'react'; +import Fab from '@material-ui/core/Fab'; +import IconButton from '@material-ui/core/IconButton'; +import DeleteIcon from '@material-ui/icons/Delete'; +import Icon from '@material-ui/core/Icon'; + +export default function FontSvgIcons() { + return ( +
+ + + + + delete_icon + + + + + + delete_icon + +
+ ); +}