restyle collection rename

This commit is contained in:
zeppi 2022-03-29 12:58:21 -04:00 committed by jessopb
parent 5a24d6c570
commit 0de96358bd
4 changed files with 49 additions and 25 deletions

View file

@ -2293,5 +2293,13 @@
"%free% of %total% available": "%free% of %total% available", "%free% of %total% available": "%free% of %total% available",
"Short (< 4 min)": "Short (< 4 min)", "Short (< 4 min)": "Short (< 4 min)",
"Medium (4 - 20 min)": "Medium (4 - 20 min)", "Medium (4 - 20 min)": "Medium (4 - 20 min)",
"Rename List": "Rename List",
"New Name": "New Name",
"Rename": "Rename",
"New Collection Name": "New Collection Name",
"In %collection%": "In %collection%",
"Add to %collection%": "Add to %collection%",
"Show this channel your appreciation by sending a donation of Credits. ": "Show this channel your appreciation by sending a donation of Credits. ",
"%action% %collection%": "%action% %collection%",
"--end--": "--end--" "--end--": "--end--"
} }

View file

@ -29,7 +29,6 @@ type Props = {
doToggleShuffleList: (string, boolean) => void, doToggleShuffleList: (string, boolean) => void,
playNextUri: string, playNextUri: string,
firstItem: string, firstItem: string,
onRenameCollection: () => void,
}; };
function CollectionActions(props: Props) { function CollectionActions(props: Props) {
@ -49,7 +48,6 @@ function CollectionActions(props: Props) {
firstItem, firstItem,
showEdit, showEdit,
setShowEdit, setShowEdit,
onRenameCollection,
} = props; } = props;
const [doShuffle, setDoShuffle] = React.useState(false); const [doShuffle, setDoShuffle] = React.useState(false);
const { push } = useHistory(); const { push } = useHistory();
@ -122,17 +120,6 @@ function CollectionActions(props: Props) {
{!isBuiltin && {!isBuiltin &&
(isMyCollection ? ( (isMyCollection ? (
<> <>
{!uri && (
<Button
title={__('Rename')}
label={__('Rename')}
className={classnames('button--file-action')}
onClick={onRenameCollection}
icon={ICONS.EDIT}
iconSize={18}
disabled={claimIsPending}
/>
)}
<Button <Button
title={uri ? __('Update') : __('Publish')} title={uri ? __('Update') : __('Publish')}
label={uri ? __('Update') : __('Publish')} label={uri ? __('Update') : __('Publish')}

View file

@ -159,26 +159,24 @@ export default function CollectionPage(props: Props) {
<FormField <FormField
autoFocus autoFocus
type="text" type="text"
className={'editable-text__field'}
name="rename_collection" name="rename_collection"
value={newName} value={newName}
label={__('New Collection Name')}
inputButton={ inputButton={
<> <>
<Button <Button
button={'alt'}
icon={ICONS.COMPLETE} icon={ICONS.COMPLETE}
className={'button-toggle'}
disabled={!(newName || '').trim() || collectionName === newName} disabled={!(newName || '').trim() || collectionName === newName}
onClick={handleRenameCollection} onClick={handleRenameCollection}
className={'editable-text__input-button'}
/> />
<Button <Button
button={'alt'}
className={'button-toggle'}
icon={ICONS.REMOVE} icon={ICONS.REMOVE}
onClick={() => { onClick={() => {
setIsRenamingList(false); setIsRenamingList(false);
setNewName(collectionName); setNewName(collectionName);
}} }}
className={'editable-text__input-button'}
/> />
</> </>
} }
@ -195,6 +193,12 @@ export default function CollectionPage(props: Props) {
className="icon--margin-right" className="icon--margin-right"
/> />
{collectionName} {collectionName}
{!uri && (
<>
{' '}
<Button icon={ICONS.EDIT} onClick={() => setIsRenamingList(true)} />
</>
)}
</span> </span>
) )
} }
@ -210,7 +214,6 @@ export default function CollectionPage(props: Props) {
collectionUrls={collectionUrls} collectionUrls={collectionUrls}
setShowEdit={setShowEdit} setShowEdit={setShowEdit}
showEdit={showEdit} showEdit={showEdit}
onRenameCollection={() => setIsRenamingList(true)}
/> />
} }
actions={ actions={

View file

@ -141,12 +141,12 @@ input-submit {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-right: none; border-right: none;
} }
//
& > *:nth-child(2) { //& > *:nth-child(2) {
border-top-left-radius: 0; // border-top-left-radius: 0;
border-bottom-left-radius: 0; // border-bottom-left-radius: 0;
border: 1px solid var(--color-input-border); // border: 1px solid var(--color-input-border);
} //}
} }
.checkbox, .checkbox,
@ -737,3 +737,29 @@ fieldset-section {
animation: menu-animate-in var(--animation-duration) var(--animation-style); animation: menu-animate-in var(--animation-duration) var(--animation-style);
box-shadow: 3px 3px rgba(0, 0, 0, 0.1); box-shadow: 3px 3px rgba(0, 0, 0, 0.1);
} }
.editable-text__field {
height: 1.6rem;
border-radius: unset;
border: unset;
border-bottom: 2px solid;
color: var(--color-text);
border-color: var(--color-text);
padding-right: var(--spacing-s);
padding-left: var(--spacing-s);
}
.editable-text__input-button {
height: 1.6rem;
border-radius: unset;
border: unset;
color: var(--color-text);
border-color: var(--color-text);
padding-right: var(--spacing-s);
padding-left: var(--spacing-s);
input-submit {
border-top-left-radius: unset;
border-bottom-left-radius: unset;
border: unset;
}
}