-
-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[feature/frogend] modify local emoji (#1143)
* update danger button red * emoji category and image modification * debug bundles in dev * fix linting error
- Loading branch information
Showing
11 changed files
with
321 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Affero General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU Affero General Public License for more details. | ||
| You should have received a copy of the GNU Affero General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| "use strict"; | ||
|
|
||
| const React = require("react"); | ||
| const splitFilterN = require("split-filter-n"); | ||
| const syncpipe = require('syncpipe'); | ||
| const { matchSorter } = require("match-sorter"); | ||
|
|
||
| const query = require("../../lib/query"); | ||
|
|
||
| const ComboBox = require("../../components/combo-box"); | ||
|
|
||
| function useEmojiByCategory(emoji) { | ||
| // split all emoji over an object keyed by the category names (or Unsorted) | ||
| return React.useMemo(() => splitFilterN( | ||
| emoji, | ||
| [], | ||
| (entry) => entry.category ?? "Unsorted" | ||
| ), [emoji]); | ||
| } | ||
|
|
||
| function CategorySelect({value, categoryState, setIsNew=() => {}, children}) { | ||
| const { | ||
| data: emoji = [], | ||
| isLoading, | ||
| isSuccess, | ||
| error | ||
| } = query.useGetAllEmojiQuery({filter: "domain:local"}); | ||
|
|
||
| const emojiByCategory = useEmojiByCategory(emoji); | ||
|
|
||
| const categories = React.useMemo(() => new Set(Object.keys(emojiByCategory)), [emojiByCategory]); | ||
|
|
||
| // data used by the ComboBox element to select an emoji category | ||
| const categoryItems = React.useMemo(() => { | ||
| return syncpipe(emojiByCategory, [ | ||
| (_) => Object.keys(_), // just emoji category names | ||
| (_) => matchSorter(_, value, {threshold: matchSorter.rankings.NO_MATCH}), // sorted by complex algorithm | ||
| (_) => _.map((categoryName) => [ // map to input value, and selectable element with icon | ||
| categoryName, | ||
| <> | ||
| <img src={emojiByCategory[categoryName][0].static_url} aria-hidden="true"></img> | ||
| {categoryName} | ||
| </> | ||
| ]) | ||
| ]); | ||
| }, [emojiByCategory, value]); | ||
|
|
||
| React.useEffect(() => { | ||
| if (value != undefined && isSuccess && value.trim().length > 0) { | ||
| setIsNew(!categories.has(value.trim())); | ||
| } | ||
| }, [categories, value, setIsNew, isSuccess]); | ||
|
|
||
| if (error) { // fall back to plain text input, but this would almost certainly have caused a bigger error message elsewhere | ||
| return ( | ||
| <> | ||
| <input type="text" placeholder="e.g., reactions" onChange={(e) => {categoryState.value = e.target.value;}}/>; | ||
| </> | ||
| ); | ||
| } else if (isLoading) { | ||
| return <input type="text" value="Loading categories..." disabled={true}/>; | ||
| } | ||
|
|
||
| return ( | ||
| <ComboBox | ||
| state={categoryState} | ||
| items={categoryItems} | ||
| label="Category" | ||
| placeHolder="e.g., reactions" | ||
| children={children} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| module.exports = { | ||
| useEmojiByCategory, | ||
| CategorySelect | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.