Skip to content

Added memoization to minimize re-rendering #1159

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 9 commits into from
Sep 12, 2024
Merged

Added memoization to minimize re-rendering #1159

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5a43440
memoize cacheView and cachePropertyView
raheeliftikhar5 Sep 12, 2024
2304cd9
memoize lazyloadView
raheeliftikhar5 Sep 12, 2024
f50ad38
memoize remoteCompView
raheeliftikhar5 Sep 12, 2024
64dc302
memoize text comp
raheeliftikhar5 Sep 12, 2024
bf383d2
expose autoIncrement from OptionControl
raheeliftikhar5 Sep 12, 2024
cd948af
fixed table not loading inside kanban card
raheeliftikhar5 Sep 12, 2024
0ef3216
memoize uiCompBuilder
raheeliftikhar5 Sep 12, 2024
6ebb066
added fallback for left-panel, right-panel and bottom-panel
raheeliftikhar5 Sep 12, 2024
4bafc34
memoize useMergeCompStyles hook
raheeliftikhar5 Sep 12, 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
Prev Previous commit
Next Next commit
memoize text comp
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Sep 12, 2024
commit 64dc3028ab84dcc1c441b89700ce04a05defe436
161 changes: 86 additions & 75 deletions client/packages/lowcoder/src/comps/comps/textComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ import { PaddingControl } from "../controls/paddingControl";
import React, { useContext, useEffect } from "react";
import { EditorContext } from "comps/editorState";
import { clickEvent, eventHandlerControl } from "../controls/eventHandlerControl";
import { NewChildren } from "../generators/uiCompBuilder";
import { RecordConstructorToComp } from "lowcoder-core";
import { ToViewReturn } from "../generators/multi";

const EventOptions = [clickEvent] as const;

Expand Down Expand Up @@ -130,87 +133,95 @@ const VerticalAlignmentOptions = [
{ label: <AlignVerticalCenter />, value: "center" },
{ label: <AlignBottom />, value: "flex-end" },
] as const;
const childrenMap = {
text: stringExposingStateControl(
"text",
trans("textShow.text", { name: "{{currentUser.name}}" })
),
onEvent: eventHandlerControl(EventOptions),
autoHeight: AutoHeightControl,
type: dropdownControl(typeOptions, "markdown"),
horizontalAlignment: alignWithJustifyControl(),
verticalAlignment: dropdownControl(VerticalAlignmentOptions, "center"),
style: styleControl(TextStyle, 'style'),
animationStyle: styleControl(AnimationStyle, 'animationStyle'),
margin: MarginControl,
padding: PaddingControl,
};

let TextTmpComp = (function () {
const childrenMap = {
text: stringExposingStateControl(
"text",
trans("textShow.text", { name: "{{currentUser.name}}" })
),
onEvent: eventHandlerControl(EventOptions),
autoHeight: AutoHeightControl,
type: dropdownControl(typeOptions, "markdown"),
horizontalAlignment: alignWithJustifyControl(),
verticalAlignment: dropdownControl(VerticalAlignmentOptions, "center"),
style: styleControl(TextStyle, 'style'),
animationStyle: styleControl(AnimationStyle, 'animationStyle'),
margin: MarginControl,
padding: PaddingControl,
};
return new UICompBuilder(childrenMap, (props, dispatch) => {
const value = props.text.value;

return (
<TextContainer
$animationStyle={props.animationStyle}
$type={props.type}
$styleConfig={props.style}
style={{
justifyContent: props.horizontalAlignment,
alignItems: props.autoHeight ? "center" : props.verticalAlignment,
textAlign: props.horizontalAlignment,
rotate: props.style.rotation
}}
onClick={() => props.onEvent("click")}
>
{props.type === "markdown" ? <TacoMarkDown>{value}</TacoMarkDown> : value}
</TextContainer>
);
})
.setPropertyViewFn((children) => {
return (
type ChildrenType = NewChildren<RecordConstructorToComp<typeof childrenMap>>;

const TextPropertyView = React.memo((props: {
children: ChildrenType
}) => {
return (
<>
<Section name={sectionNames.basic}>
{props.children.type.propertyView({
label: trans("value"),
tooltip: trans("textShow.valueTooltip"),
radioButton: true,
})}
{props.children.text.propertyView({})}
</Section>

{["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
<Section name={sectionNames.interaction}>
{hiddenPropertyView(props.children)}
{props.children.onEvent.getPropertyView()}
</Section>
)}

{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
<>
<Section name={sectionNames.basic}>
{children.type.propertyView({
label: trans("value"),
tooltip: trans("textShow.valueTooltip"),
<Section name={sectionNames.layout}>
{props.children.autoHeight.getPropertyView()}
{!props.children.autoHeight.getView() &&
props.children.verticalAlignment.propertyView({
label: trans("textShow.verticalAlignment"),
radioButton: true,
})}
{props.children.horizontalAlignment.propertyView({
label: trans("textShow.horizontalAlignment"),
radioButton: true,
})}
{children.text.propertyView({})}
</Section>

{["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
<Section name={sectionNames.interaction}>
{hiddenPropertyView(children)}
{children.onEvent.getPropertyView()}
</Section>
)}

{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
<>
<Section name={sectionNames.layout}>
{children.autoHeight.getPropertyView()}
{!children.autoHeight.getView() &&
children.verticalAlignment.propertyView({
label: trans("textShow.verticalAlignment"),
radioButton: true,
})}
{children.horizontalAlignment.propertyView({
label: trans("textShow.horizontalAlignment"),
radioButton: true,
})}
</Section>
<Section name={sectionNames.style}>
{children.style.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle} hasTooltip={true}>
{children.animationStyle.getPropertyView()}
</Section>
</>
)}
<Section name={sectionNames.style}>
{props.children.style.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle} hasTooltip={true}>
{props.children.animationStyle.getPropertyView()}
</Section>
</>
);
})
)}
</>
);
})

const TextView = React.memo((props: ToViewReturn<ChildrenType>) => {
const value = props.text.value;

return (
<TextContainer
$animationStyle={props.animationStyle}
$type={props.type}
$styleConfig={props.style}
style={{
justifyContent: props.horizontalAlignment,
alignItems: props.autoHeight ? "center" : props.verticalAlignment,
textAlign: props.horizontalAlignment,
rotate: props.style.rotation
}}
onClick={() => props.onEvent("click")}
>
{props.type === "markdown" ? <TacoMarkDown>{value}</TacoMarkDown> : value}
</TextContainer>
);
}, (prev, next) => JSON.stringify(prev) === JSON.stringify(next));

let TextTmpComp = (function () {
return new UICompBuilder(childrenMap, (props) => <TextView {...props} />)
.setPropertyViewFn((children) => <TextPropertyView children={children} />)
.build();
})();

Expand Down