Use object destructuring in Icon templates (#1049)

* Used object destructuring * Update all icons entrypoints with new template
oblador · Nov 24, 2019 · 272625b · 272625b
1 parent 49a6704
commit 272625b
Show file tree

Hide file tree

Showing 17 changed files with 119 additions and 106 deletions.
diff --git a/AntDesign.js b/AntDesign.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/AntDesign.json';
 const iconSet = createIconSet(glyphMap, 'anticon', 'AntDesign.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/Entypo.js b/Entypo.js
@@ -9,10 +9,10 @@ import glyphMap from './glyphmaps/Entypo.json';
 const iconSet = createIconSet(glyphMap, 'Entypo', 'Entypo.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
-
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
diff --git a/EvilIcons.js b/EvilIcons.js
@@ -9,10 +9,10 @@ import glyphMap from './glyphmaps/EvilIcons.json';
 const iconSet = createIconSet(glyphMap, 'EvilIcons', 'EvilIcons.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
-
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
diff --git a/Feather.js b/Feather.js
@@ -9,10 +9,10 @@ import glyphMap from './glyphmaps/Feather.json';
 const iconSet = createIconSet(glyphMap, 'Feather', 'Feather.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
-
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
diff --git a/FontAwesome.js b/FontAwesome.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/FontAwesome.json';
 const iconSet = createIconSet(glyphMap, 'FontAwesome', 'FontAwesome.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/FontAwesome5.js b/FontAwesome5.js
@@ -13,9 +13,10 @@ export { FA5Style } from './lib/create-icon-set-from-fontawesome5';
 const iconSet = createFA5iconSet(glyphMap, metadata, false);
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
diff --git a/FontAwesome5Pro.js b/FontAwesome5Pro.js
@@ -13,9 +13,10 @@ export { FA5Style } from './lib/create-icon-set-from-fontawesome5';
 const iconSet = createFA5iconSet(glyphMap, metadata, true);
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
diff --git a/Fontisto.js b/Fontisto.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/Fontisto.json';
 const iconSet = createIconSet(glyphMap, 'Fontisto', 'Fontisto.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/Foundation.js b/Foundation.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/Foundation.json';
 const iconSet = createIconSet(glyphMap, 'fontcustom', 'Foundation.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/Ionicons.js b/Ionicons.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/Ionicons.json';
 const iconSet = createIconSet(glyphMap, 'Ionicons', 'Ionicons.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/MaterialCommunityIcons.js b/MaterialCommunityIcons.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/MaterialCommunityIcons.json';
 const iconSet = createIconSet(glyphMap, 'Material Design Icons', 'MaterialCommunityIcons.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/MaterialIcons.js b/MaterialIcons.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/MaterialIcons.json';
 const iconSet = createIconSet(glyphMap, 'Material Icons', 'MaterialIcons.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/Octicons.js b/Octicons.js
@@ -9,10 +9,10 @@ import glyphMap from './glyphmaps/Octicons.json';
 const iconSet = createIconSet(glyphMap, 'Octicons', 'Octicons.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
-
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
diff --git a/SimpleLineIcons.js b/SimpleLineIcons.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/SimpleLineIcons.json';
 const iconSet = createIconSet(glyphMap, 'simple-line-icons', 'SimpleLineIcons.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/Zocial.js b/Zocial.js
@@ -9,10 +9,11 @@ import glyphMap from './glyphmaps/Zocial.json';
 const iconSet = createIconSet(glyphMap, 'zocial', 'Zocial.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
 
diff --git a/templates/bundled-icon-set.tpl b/templates/bundled-icon-set.tpl
@@ -9,9 +9,10 @@ const glyphMap = ${glyphMap};
 const iconSet = createIconSet(glyphMap, '${fontFamily}', '${componentName}.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;
diff --git a/templates/separated-icon-set.tpl b/templates/separated-icon-set.tpl
@@ -9,9 +9,10 @@ import glyphMap from './glyphmaps/${componentName}.json';
 const iconSet = createIconSet(glyphMap, '${fontFamily}', '${componentName}.ttf');
 
 export default iconSet;
-
-export const Button = iconSet.Button;
-export const TabBarItem = iconSet.TabBarItem;
-export const TabBarItemIOS = iconSet.TabBarItemIOS;
-export const ToolbarAndroid = iconSet.ToolbarAndroid;
-export const getImageSource = iconSet.getImageSource;
+export const {
+  Button,
+  TabBarItem,
+  TabBarItemIOS,
+  ToolbarAndroid,
+  getImageSource,
+} = iconSet;