Commit86fc3e0

authored

refactor: Better colocate suspense (#4863)

1 parente7dd3f9 commit86fc3e0Copy full SHA for 86fc3e0

File tree

+18

-8

lines changed

+18

-8

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import{makeStyles}from"@material-ui/core/styles"`
`2`	`2`	`import{useActor}from"@xstate/react"`
`3`		`-import{FC,useContext}from"react"`
	`3`	`+import{Loader}from"components/Loader/Loader"`
	`4`	`+import{FC,Suspense,useContext}from"react"`
`4`	`5`	`import{XServiceContext}from"../../xServices/StateContext"`
`5`	`6`	`import{Footer}from"../Footer/Footer"`
`6`	`7`	`import{Navbar}from"../Navbar/Navbar"`
`@@ -16,14 +17,15 @@ interface AuthAndFrameProps {`
`16`	`17`	`exportconstAuthAndFrame:FC<AuthAndFrameProps>=({ children})=>{`
`17`	`18`	`conststyles=useStyles()`
`18`	`19`	`constxServices=useContext(XServiceContext)`
`19`		`-`
`20`	`20`	`const[buildInfoState]=useActor(xServices.buildInfoXService)`
`21`	`21`
`22`	`22`	`return(`
`23`	`23`	`<RequireAuth>`
`24`	`24`	`<divclassName={styles.site}>`
`25`	`25`	`<Navbar/>`
`26`		`-<divclassName={styles.siteContent}>{children}</div>`
	`26`	`+<divclassName={styles.siteContent}>`
	`27`	`+<Suspensefallback={<Loader/>}>{children}</Suspense>`
	`28`	`+</div>`
`27`	`29`	`<FooterbuildInfo={buildInfoState.context.buildInfo}/>`
`28`	`30`	`</div>`
`29`	`31`	`</RequireAuth>`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { Sidebar } from "./Sidebar"`
`5`	`5`	`importReact,{`
`6`	`6`	`createContext,`
`7`	`7`	`PropsWithChildren,`
	`8`	`+Suspense,`
`8`	`9`	`useContext,`
`9`	`10`	`useEffect,`
`10`	`11`	`}from"react"`
`@@ -52,7 +53,7 @@ export const DeploySettingsLayout: React.FC<PropsWithChildren> = ({`
`52`	`53`	`<DeploySettingsContext.Provider`
`53`	`54`	`value={{deploymentConfig:deploymentConfig}}`
`54`	`55`	`>`
`55`		`-{children}`
	`56`	`+<Suspensefallback={<Loader/>}>{children}</Suspense>`
`56`	`57`	`</DeploySettingsContext.Provider>`
`57`	`58`	`) :(`
`58`	`59`	`<Loader/>`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,13 @@ import {`
`15`	`15`	`PageHeaderTitle,`
`16`	`16`	`}from"components/PageHeader/PageHeader"`
`17`	`17`	`import{useOrganizationId}from"hooks/useOrganizationId"`
`18`		`-import{createContext,FC,PropsWithChildren,useContext}from"react"`
	`18`	`+import{`
	`19`	`+createContext,`
	`20`	`+FC,`
	`21`	`+PropsWithChildren,`
	`22`	`+Suspense,`
	`23`	`+useContext,`
	`24`	`+}from"react"`
`19`	`25`	`import{`
`20`	`26`	`LinkasRouterLink,`
`21`	`27`	`Navigate,`
`@@ -33,6 +39,7 @@ import {`
`33`	`39`	`import{Margins}from"../../components/Margins/Margins"`
`34`	`40`	`import{Stack}from"../../components/Stack/Stack"`
`35`	`41`	`import{Permissions}from"xServices/auth/authXService"`
	`42`	`+import{Loader}from"components/Loader/Loader"`
`36`	`43`
`37`	`44`	`constLanguage={`
`38`	`45`	`settingsButton:"Settings",`
`@@ -224,7 +231,7 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {`
`224`	`231`	`<TemplateLayoutContext.Provider`
`225`	`232`	`value={{ permissions,context:templateState.context}}`
`226`	`233`	`>`
`227`		`-{children}`
	`234`	`+<Suspensefallback={<Loader/>}>{children}</Suspense>`
`228`	`235`	`</TemplateLayoutContext.Provider>`
`229`	`236`	`</Margins>`
`230`	`237`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { AlertBanner } from "components/AlertBanner/AlertBanner"`
`4`	`4`	`import{ChooseOne,Cond}from"components/Conditionals/ChooseOne"`
`5`	`5`	`import{FC,useEffect}from"react"`
`6`	`6`	`import{useParams}from"react-router-dom"`
`7`		`-import{FullScreenLoader}from"components/Loader/FullScreenLoader"`
	`7`	`+import{Loader}from"components/Loader/Loader"`
`8`	`8`	`import{firstOrItem}from"util/array"`
`9`	`9`	`import{workspaceMachine}from"xServices/workspace/workspaceXService"`
`10`	`10`	`import{WorkspaceReadyPage}from"./WorkspaceReadyPage"`
`@@ -55,7 +55,7 @@ export const WorkspacePage: FC = () => {`
`55`	`55`	`/>`
`56`	`56`	`</Cond>`
`57`	`57`	`<Cond>`
`58`		`-<FullScreenLoader/>`
	`58`	`+<Loader/>`
`59`	`59`	`</Cond>`
`60`	`60`	`</ChooseOne>`
`61`	`61`	`)`

Comments

(0)