Skip to content

Fixed flickering issue in app editor #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Fixed flickering issue in app editor #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b22ab99
fixed flickering issues in app editor
raheeliftikhar5 Apr 2, 2024
aff6aa9
revert change
raheeliftikhar5 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/packages/lowcoder/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ class AppIndex extends React.Component<AppIndexProps, any> {
/>
)}
<LazyRoute exact path={IMPORT_APP_FROM_TEMPLATE_URL} component={LazyAppFromTemplate} />
<LazyRoute path={APP_EDITOR_URL} component={LazyAppEditor} />
<LazyRoute fallback="layout" path={APP_EDITOR_URL} component={LazyAppEditor} />
<LazyRoute
fallback="layout"
path={[
ALL_APPLICATIONS_URL,
DATASOURCE_CREATE_URL,
Expand Down
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/components/LazyRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { default as Skeleton } from "antd/es/skeleton";
import { ComponentType, lazy, Suspense, useRef } from "react";
import { Route, RouteProps } from "react-router";
import PageSkeleton from "./PageSkeleton";
import EditorSkeletonView from "@lowcoder-ee/pages/editor/editorSkeletonView";
import { ProductLoading } from "./ProductLoading";

interface IProps extends RouteProps {
/**
Expand All @@ -13,7 +15,7 @@ interface IProps extends RouteProps {

const fallbacks = {
normal: <Skeleton style={{ padding: 32 }} />,
layout: <PageSkeleton />,
layout: <ProductLoading />,
outAppLayout: <PageSkeleton logoWithName />,
};

Expand Down
6 changes: 4 additions & 2 deletions client/packages/lowcoder/src/comps/comps/rootComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
} from "lowcoder-design";
import RefTreeComp from "./refTreeComp";
import { ExternalEditorContext } from "util/context/ExternalEditorContext";
import { useUserViewMode } from "util/hooks";

const EditorView = lazy(
() => import("pages/editor/editorView"),
Expand Down Expand Up @@ -60,6 +61,7 @@ function RootView(props: RootViewProps) {
const [editorState, setEditorState] = useState<EditorState>();
const [propertySectionState, setPropertySectionState] = useState<PropertySectionState>({});
const { readOnly } = useContext(ExternalEditorContext);
const isUserViewMode = useUserViewMode();
const appThemeId = comp.children.settings.getView().themeId;
const { orgCommonSettings } = getGlobalSettings();
const themeList = orgCommonSettings?.themeList || [];
Expand Down Expand Up @@ -109,7 +111,7 @@ function RootView(props: RootViewProps) {
};
}, [editorState, propertySectionState]);

if (!editorState && readOnly) {
if (!editorState && !isUserViewMode && readOnly) {
return <ModuleLoading />;
}

Expand All @@ -127,7 +129,7 @@ function RootView(props: RootViewProps) {
{Object.keys(comp.children.queries.children).map((key) => (
<div key={key}>{comp.children.queries.children[key].getView()}</div>
))}
<Suspense fallback={!readOnly && SuspenseFallback}>
<Suspense fallback={!readOnly || isUserViewMode ? SuspenseFallback : null}>
<EditorView uiComp={comp.children.ui} preloadComp={comp.children.preload} />
</Suspense>
</EditorContext.Provider>
Expand Down
20 changes: 11 additions & 9 deletions client/packages/lowcoder/src/pages/editor/editorView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,15 +393,17 @@ function EditorView(props: EditorViewProps) {
<script key="clearbit-script" src="https://tag.clearbitscripts.com/v1/pk_931b51e405557300e6a7c470e8247d5f/tags.js" referrerPolicy="strict-origin-when-cross-origin" type="text/javascript"></script>
]}
</Helmet>
{!hideBodyHeader && <PreviewHeader />}
<EditorContainerWithViewMode>
<ViewBody $hideBodyHeader={hideBodyHeader} $height={height}>
{uiComp.getView()}
</ViewBody>
<div style={{ zIndex: Layers.hooksCompContainer }}>
{hookCompViews}
</div>
</EditorContainerWithViewMode>
<Suspense fallback={<EditorSkeletonView />}>
{!hideBodyHeader && <PreviewHeader />}
<EditorContainerWithViewMode>
<ViewBody $hideBodyHeader={hideBodyHeader} $height={height}>
{uiComp.getView()}
</ViewBody>
<div style={{ zIndex: Layers.hooksCompContainer }}>
{hookCompViews}
</div>
</EditorContainerWithViewMode>
</Suspense>
</CustomShortcutWrapper>
);
}
Expand Down