Use forked Emoji Mart picker to do the font icon picker instead

This commit is contained in:
Sean King
2020-10-16 19:35:28 -06:00
parent 3d64f9647c
commit 9507b7a82f
7 changed files with 20 additions and 67 deletions

View File

@@ -11,7 +11,7 @@ import Icon from 'soapbox/components/icon';
const messages = defineMessages({
emoji: { id: 'icon_button.label', defaultMessage: 'Select icon' },
emoji_search: { id: 'emoji_button.search', defaultMessage: 'Search...' },
emoji_not_found: { id: 'emoji_button.not_found', defaultMessage: 'No emojos!! (╯°□°)╯︵ ┻━┻' },
emoji_not_found: { id: 'icon_button.not_found', defaultMessage: 'No icons!! (╯°□°)╯︵ ┻━┻' },
custom: { id: 'icon_button.icons', defaultMessage: 'Icons' },
search_results: { id: 'emoji_button.search_results', defaultMessage: 'Search results' },
});
@@ -101,7 +101,7 @@ class IconPickerMenu extends React.PureComponent {
emoticons: [],
keywords: [name],
imageUrl: '',
custom: true,
render: <Icon id={name} />,
});
});
});
@@ -124,12 +124,12 @@ class IconPickerMenu extends React.PureComponent {
<IconPicker
perLine={8}
emojiSize={22}
include={categoriesSort}
sheetSize={32}
custom={this.buildIcons(custom_emojis)}
include={categoriesSort}
color=''
emoji=''
set='twitter'
set=''
title={title}
i18n={this.getI18n()}
onClick={this.handleClick}
@@ -137,6 +137,8 @@ class IconPickerMenu extends React.PureComponent {
backgroundImageFn={backgroundImageFn}
autoFocus
emojiTooltip
overwriteRender
noShowAnchors
/>
</div>
);

View File

@@ -392,25 +392,7 @@
"fa fa-spell-check",
"fa fa-moon",
"fa fa-sun",
"fa fa-biometric",
"fa fa-volume-mute",
"fa fa-bell-ringing",
"fa fa-bell-ringing-o",
"fa fa-bunny",
"fa fa-cc-by",
"fa fa-cc-cc",
"fa fa-cc-nc-eu",
"fa fa-cc-nc-jp",
"fa fa-cc-nc",
"fa fa-cc-nd",
"fa fa-cc-pd",
"fa fa-cc-remix",
"fa fa-cc-sa",
"fa fa-cc-share",
"fa fa-cc-zero",
"fa fa-email-bulk",
"fa fa-email-bulk-o",
"fa fa-skate"
"fa fa-biometric"
],
"Text Editor Icons": [
"fa fa-th-large",
@@ -730,41 +712,7 @@
"fa fa-unsplash",
"fa fa-hackster",
"fa fa-f-droid",
"fa fa-wire",
"fa fa-tor-onion",
"fa fa-hal",
"fa fa-jupyter",
"fa fa-julia",
"fa fa-classicpress",
"fa fa-classicpress-circle",
"fa fa-open-collective",
"fa fa-orcid",
"fa fa-researchgate",
"fa fa-funkwhale",
"fa fa-boardgamegeek",
"fa fa-buymeacoffee",
"fa fa-conway-glider",
"fa fa-csharp",
"fa fa-gnu",
"fa fa-google-play",
"fa fa-heroku",
"fa fa-home-assistant",
"fa fa-java",
"fa fa-mariadb",
"fa fa-markdown",
"fa fa-mysql",
"fa fa-nordcast",
"fa fa-plume",
"fa fa-postgresql",
"fa fa-sass-alt",
"fa fa-sass",
"fa fa-sketchfab",
"fa fa-tex",
"fa fa-textpattern",
"fa fa-unity",
"fa fa-signalapp",
"fa fa-askfm",
"fa fa-blockstack"
"fa fa-signalapp"
],
"Medical Icons": [
"fa fa-user-md",

View File

@@ -26,7 +26,6 @@ import Accordion from '../ui/components/accordion';
import SitePreview from './components/site_preview';
import ThemeToggle from 'soapbox/features/ui/components/theme_toggle';
import { defaultSettings } from 'soapbox/actions/settings';
import forkAwesomeIcons from './forkawesome.json';
import IconPickerDropdown from './components/icon_picker_dropdown';
const messages = defineMessages({
@@ -438,10 +437,6 @@ export class IconPicker extends ImmutablePureComponent {
onChange: PropTypes.func.isRequired,
}
static defaultProps = {
icons: forkAwesomeIcons,
};
render() {
const { onChange, value, label } = this.props;

View File

@@ -173,6 +173,13 @@
display: inline-block;
font-size: 0;
.fa {
font-size: 18px;
width: 22px;
height: 22px;
text-align: center;
}
span {
width: 22px;
height: 22px;

View File

@@ -518,6 +518,7 @@ code {
padding: 9px;
border: 1px solid var(--highlight-text-color);
border-radius: 4px;
cursor: pointer;
.fa {
font-size: 18px;