Generalize UserTagPicker #13080
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
|
Collaborator
There was a problem hiding this comment. do a two steps commit - one renaming the file, and another one updating the file. Otherwise the history won't get carried over to the new file |
This file contains hidden or 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,77 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| import { rulesetNames, rulesets } from 'interfaces/ruleset'; | ||
| import { action } from 'mobx'; | ||
| import { observer } from 'mobx-react'; | ||
| import BeatmapTag from 'models/beatmap-tag'; | ||
| import core from 'osu-core-singleton'; | ||
| import React, { useCallback, useEffect, useRef } from 'react'; | ||
| import { classWithModifiers } from 'utils/css'; | ||
| import { trans } from 'utils/lang'; | ||
|
|
||
| const controller = core.beatmapTagPickerController; | ||
|
|
||
| const onChange = action((e: React.ChangeEvent<HTMLInputElement>) => controller.query = e.target.value); | ||
|
|
||
| interface Props { | ||
| isTagEnabled: (tag: BeatmapTag) => boolean; | ||
| onDisabled: (tag: BeatmapTag) => void; | ||
| onEnabled: (tag: BeatmapTag) => void; | ||
| showAllRulesets: boolean; | ||
| } | ||
|
|
||
| export default observer(function BeatmapUserTagPicker(props: Props) { | ||
| const inputRef = useRef<HTMLInputElement>(null); | ||
|
|
||
| useEffect(() => { | ||
| inputRef.current?.focus(); | ||
| }, []); | ||
|
|
||
| return ( | ||
| <div className='beatmap-user-tag-picker'> | ||
| <input | ||
| ref={inputRef} | ||
| className='beatmap-user-tag-picker__search' | ||
| name='tag-search' | ||
| onChange={onChange} | ||
| placeholder={trans('beatmaps.listing.search.tag_picker.prompt')} | ||
| value={controller.query} | ||
| /> | ||
| <div className='beatmap-user-tag-picker__scroll-area u-fancy-scrollbar'> | ||
| <div className='beatmap-user-tag-picker__list'> | ||
| {controller.groups.map((group) => ( | ||
| <React.Fragment key={group.name}> | ||
| <span className='beatmap-user-tag-picker__category'>{group.name}</span> | ||
| {group.tags.map((tag) => <UserTag key={tag.id} props={props} tag={tag} />)} | ||
| </React.Fragment> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }); | ||
|
|
||
| const UserTag = observer(function UserTag({ tag, props }: { props: Props; tag: BeatmapTag }) { | ||
| const active = props.isTagEnabled(tag); | ||
|
|
||
| const onClick = useCallback(() => { | ||
| if (!active) { | ||
| props.onEnabled(tag); | ||
| } else { | ||
| props.onDisabled(tag); | ||
| } | ||
| }, [tag, active, props]); | ||
|
|
||
| const hasAllRulesets = tag.rulesetIds.length === rulesets.length; | ||
|
|
||
| return (<div className={classWithModifiers('beatmap-user-tag-picker__tag', { active })} onClick={onClick}> | ||
| <span className='beatmap-user-tag-picker__tag-info beatmap-user-tag-picker__tag-info--name'>{tag.tagName}</span> | ||
| <span className='beatmap-user-tag-picker__tag-info beatmap-user-tag-picker__tag-info--description'> | ||
| {props.showAllRulesets && !hasAllRulesets && tag.rulesetIds.map((rulesetId) => (<React.Fragment key={rulesetId}> | ||
| <span className={`fal fa-extra-mode-${rulesetNames[rulesetId]}`} />{' '} | ||
| </React.Fragment>))} | ||
| {tag.description} | ||
| </span> | ||
| </div>); | ||
| }); |
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe just call it
beatmap-tag-pickerinstead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i feel like this would make it too ambiguous whether it concerns mapper tags or user tags. not sure how those are generally named throughout the project
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right. except the mapper tag is attached to beatmapset, not beatmap. and I think user tag is referred as beatmap tag everywhere