TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-22 11:16:01 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Admin navigation settings fix (#21323)" (#21563)

Browse Source 
This reverts commit eaed33972f.

The fix we shipped for using the `RETURN` key to create navigation items
in Admin broke something with regards to saving the URL, so we're
reverting that change.
This commit is contained in:
Daniël van der Winden 2024-11-07 12:34:34 +01:00 committed by Steve Larson
parent 3f613a2b6a
commit d09b97756e
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/admin-x-settings/src/components/settings/site/navigation/NavigationEditForm.tsx
View File

@ -7,10 +7,6 @@ const NavigationEditForm: React.FC<{
baseUrl: string;
navigation: NavigationEditor;
}> = ({baseUrl, navigation}) => {
const onAddItem = () => {
navigation.addItem();
};
return <div className="w-full pt-2">
<SortableList
items={navigation.items}
@ -29,7 +25,7 @@ const NavigationEditForm: React.FC<{
<div className='flex items-center gap-3'>
<Icon colorClass='text-grey-300 dark:text-grey-900 mt-1' name='add' size='sm' />
<NavigationItemEditor
action={<Button className='mx-2 mt-2.5 self-start rounded bg-green p-1' data-testid="add-button" icon="add" iconColorClass='text-white' size='sm' unstyled onClick={onAddItem} />}
action={<Button className='mx-2 mt-1 self-center rounded bg-green p-1' data-testid="add-button" icon="add" iconColorClass='text-white' size='sm' unstyled onClick={navigation.addItem} />}
baseUrl={baseUrl}
className="mt-1"
clearError={key => navigation.clearError(navigation.newItem.id, key)}
@ -37,7 +33,6 @@ const NavigationEditForm: React.FC<{
item={navigation.newItem}
labelPlaceholder="New item label"
updateItem={navigation.setNewItem}
onAddItem={onAddItem}
/>
</div>
</div>;

20
apps/admin-x-settings/src/components/settings/site/navigation/NavigationItemEditor.tsx
View File

@ -12,17 +12,9 @@ export type NavigationItemEditorProps = React.HTMLAttributes<HTMLDivElement> & {
unstyled?: boolean
textFieldClasses?: string
action?: ReactNode
onAddItem?: () => void; // New prop
}
const NavigationItemEditor: React.FC<NavigationItemEditorProps> = ({baseUrl, item, updateItem, clearError, labelPlaceholder, unstyled, textFieldClasses, action, className, onAddItem,...props}) => {
const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key === 'Enter') {
e.preventDefault();
onAddItem?.();
}
};
const NavigationItemEditor: React.FC<NavigationItemEditorProps> = ({baseUrl, item, updateItem, clearError, labelPlaceholder, unstyled, textFieldClasses, action, className, ...props}) => {
return (
<div className={clsx('flex w-full items-start gap-3', className)} data-testid='navigation-item-editor' {...props}>
<div className="flex flex-1 pt-1">
@ -37,10 +29,7 @@ const NavigationItemEditor: React.FC<NavigationItemEditorProps> = ({baseUrl, ite
value={item.label}
hideTitle
onChange={e => updateItem?.({label: e.target.value})}
onKeyDown={(e) => {
clearError?.('label');
handleKeyDown(e);
}}
onKeyDown={() => clearError?.('label')}
/>
</div>
<div className="flex flex-1 pt-1">
@ -55,10 +44,7 @@ const NavigationItemEditor: React.FC<NavigationItemEditorProps> = ({baseUrl, ite
value={item.url}
hideTitle
onChange={value => updateItem?.({url: value || ''})}
onKeyDown={(e) => {
clearError?.('url');
handleKeyDown(e);
}}
onKeyDown={() => clearError?.('url')}
/>
</div>
{action}