From 81f39b138a65ee9e0aa6bdd6d6f8ce0e5f413265 Mon Sep 17 00:00:00 2001 From: Etienne Lemay Date: Fri, 29 Sep 2017 14:33:08 -0400 Subject: [PATCH] Use SVGs inline --- src/components/anchors.js | 7 ++--- src/svgs/activity.svg | 1 - src/svgs/custom.svg | 7 ----- src/svgs/flags.svg | 1 - src/svgs/foods.svg | 1 - src/svgs/index.js | 62 ++++++++++++++++++++++++++++++++------- src/svgs/nature.svg | 1 - src/svgs/objects.svg | 1 - src/svgs/people.svg | 1 - src/svgs/places.svg | 1 - src/svgs/recent.svg | 1 - src/svgs/symbols.svg | 1 - 12 files changed, 55 insertions(+), 30 deletions(-) delete mode 100755 src/svgs/activity.svg delete mode 100644 src/svgs/custom.svg delete mode 100755 src/svgs/flags.svg delete mode 100755 src/svgs/foods.svg delete mode 100755 src/svgs/nature.svg delete mode 100755 src/svgs/objects.svg delete mode 100755 src/svgs/people.svg delete mode 100755 src/svgs/places.svg delete mode 100755 src/svgs/recent.svg delete mode 100755 src/svgs/symbols.svg diff --git a/src/components/anchors.js b/src/components/anchors.js index 212dff9..5a94247 100644 --- a/src/components/anchors.js +++ b/src/components/anchors.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' -import * as SVGs from '../svgs' +import SVGs from '../svgs' export default class Anchors extends React.Component { constructor(props) { @@ -23,8 +23,7 @@ export default class Anchors extends React.Component { return
{categories.map((category, i) => { var { name, anchor } = category, - isSelected = name == selected, - SVGElement = SVGs[name] + isSelected = name == selected if (anchor === false) { return null @@ -38,7 +37,7 @@ export default class Anchors extends React.Component { className={`emoji-mart-anchor ${isSelected ? 'emoji-mart-anchor-selected' : ''}`} style={{ color: isSelected ? color : null }} > - +
) diff --git a/src/svgs/activity.svg b/src/svgs/activity.svg deleted file mode 100755 index 11b62ea..0000000 --- a/src/svgs/activity.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/svgs/custom.svg b/src/svgs/custom.svg deleted file mode 100644 index ef5bf50..0000000 --- a/src/svgs/custom.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/svgs/flags.svg b/src/svgs/flags.svg deleted file mode 100755 index eba93ad..0000000 --- a/src/svgs/flags.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/svgs/foods.svg b/src/svgs/foods.svg deleted file mode 100755 index c7c5eba..0000000 --- a/src/svgs/foods.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/svgs/index.js b/src/svgs/index.js index 96ab174..64e0db9 100644 --- a/src/svgs/index.js +++ b/src/svgs/index.js @@ -1,10 +1,52 @@ -export { default as Activity } from './activity.svg' -export { default as Flags } from './flags.svg' -export { default as Foods } from './foods.svg' -export { default as Nature } from './nature.svg' -export { default as Objects } from './objects.svg' -export { default as People } from './people.svg' -export { default as Places } from './places.svg' -export { default as Recent } from './recent.svg' -export { default as Symbols } from './symbols.svg' -export { default as Custom } from './custom.svg' +const SVGs = { + Activity: ` + + `, + + Custom: ` + + + + + + `, + + Flags: ` + + `, + + Foods: ` + + `, + + Nature: ` + + + `, + + Objects: ` + + + `, + + People: ` + + + `, + + Places: ` + + + `, + + Recent: ` + + + `, + + Symbols: ` + + `, +} + +export default SVGs diff --git a/src/svgs/nature.svg b/src/svgs/nature.svg deleted file mode 100755 index c2e0498..0000000 --- a/src/svgs/nature.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/svgs/objects.svg b/src/svgs/objects.svg deleted file mode 100755 index 872c141..0000000 --- a/src/svgs/objects.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/svgs/people.svg b/src/svgs/people.svg deleted file mode 100755 index e5d7ecd..0000000 --- a/src/svgs/people.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/svgs/places.svg b/src/svgs/places.svg deleted file mode 100755 index 706feef..0000000 --- a/src/svgs/places.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/svgs/recent.svg b/src/svgs/recent.svg deleted file mode 100755 index 9236b41..0000000 --- a/src/svgs/recent.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/svgs/symbols.svg b/src/svgs/symbols.svg deleted file mode 100755 index c751a67..0000000 --- a/src/svgs/symbols.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file