Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Fixed layout state sync issues (#21443)

Browse source 
refs https://linear.app/ghost/issue/AP-544

useState was still called twice, we should have pulled that out - but
instead passing values down for now
This commit is contained in:
Fabien 'egg' O'Carroll 2024-10-29 03:17:57 +00:00 • committed by GitHub
parent d0bf80b718
commit f8ef2a1cb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/admin-x-activitypub/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@tryghost/admin-x-activitypub",
"version": "0.3.0",
"version": "0.3.1",
"license": "MIT",
"repository": {
"type": "git",

4
apps/admin-x-activitypub/src/components/Inbox.tsx
View file

@ -19,7 +19,7 @@ interface InboxProps {}
const Inbox: React.FC<InboxProps> = ({}) => {
const [, setArticleContent] = useState<ObjectProperties | null>(null);
const [, setArticleActor] = useState<ActorProperties | null>(null);
const {layout} = useLayout();
const {layout, setFeed, setInbox} = useLayout();
const {
data,
@ -104,7 +104,7 @@ const Inbox: React.FC<InboxProps> = ({}) => {
return (
<>
<MainNavigation page='home'/>
<MainNavigation layout={layout} page='home' setFeed={setFeed} setInbox={setInbox}/>
<div className='z-0 my-5 flex w-full flex-col'>
<div className='w-full px-8'>
{isLoading ? (

10
apps/admin-x-activitypub/src/components/navigation/MainNavigation.tsx
View file

@ -1,19 +1,23 @@
import MainHeader from './MainHeader';
import React from 'react';
import {Button, Tooltip} from '@tryghost/admin-x-design-system';
import {useLayout} from '../../hooks/layout';
import {useRouting} from '@tryghost/admin-x-framework/routing';
interface MainNavigationProps {
page: string;
layout?: 'feed' | 'inbox';
setFeed?: () => void;
setInbox?: () => void;
}
const MainNavigation: React.FC<MainNavigationProps> = ({
page = ''
page = '',
layout,
setFeed,
setInbox
}) => {
const {route, updateRoute} = useRouting();
const mainRoute = route.split('/')[0];
const {layout, setFeed, setInbox} = useLayout();
return (
<MainHeader>

2
apps/admin-x-activitypub/src/hooks/layout.ts
View file

@ -14,5 +14,5 @@ export function useLayout() {
const setFeed = () => setLayout('feed');
const setInbox = () => setLayout('inbox');
return {layout, setInbox, setFeed};
return {layout, setInbox, setFeed} as {layout: Layout, setInbox: () => void, setFeed: () => void};
}