Skip to content

Take the latest changes from Raheel #534

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 12 commits into from
Nov 29, 2023
Merged

Take the latest changes from Raheel #534

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd314d4
Merge pull request #529 from lowcoder-org/feat/Layout-Mode
FalkWolsky Nov 27, 2023
d000d85
feat: added screenInfo hook
raheeliftikhar5 Nov 28, 2023
14e8dc2
Merge pull request #531 from raheeliftikhar5/screen-info-hook
FalkWolsky Nov 28, 2023
ae91db0
refactor: handle redirectUrl using sessionStoragee
raheeliftikhar5 Nov 28, 2023
27019d1
refactor: use redirectUrl from sessionStorage
raheeliftikhar5 Nov 28, 2023
85c0499
Merge branch 'dev' into refactor-redirect
FalkWolsky Nov 29, 2023
436283f
feat: foldable components sections
raheeliftikhar5 Nov 29, 2023
6e080c6
fix: initially show only commonly used comps
raheeliftikhar5 Nov 29, 2023
ad2e97e
fix: show border bottom for each section
raheeliftikhar5 Nov 29, 2023
5e065a7
Merge pull request #532 from raheeliftikhar5/refactor-redirect
FalkWolsky Nov 29, 2023
5fc8cdd
Merge branch 'dev' into foldable-comps-sections
FalkWolsky Nov 29, 2023
b4e12f2
Merge pull request #533 from raheeliftikhar5/foldable-comps-sections
FalkWolsky Nov 29, 2023
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
feat: foldable components sections
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Nov 29, 2023
commit 436283f2ae2b2626390e576c5fa2d7919924115c
64 changes: 32 additions & 32 deletions client/packages/lowcoder/src/pages/editor/right/uiCompPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,20 @@ import { draggingUtils } from "layout";
import { isEmpty } from "lodash";
import { language } from "i18n";
import {
ComListTitle,
CompIconDiv,
EmptyCompContent,
RightPanelContentWrapper,
} from "pages/editor/right/styledComponent";
import { tableDragClassName } from "pages/tutorials/tutorialsConstant";
import React, { useContext, useMemo } from "react";
import styled from "styled-components";
import { labelCss } from "lowcoder-design";
import {
BaseSection,
labelCss,
} from "lowcoder-design";
import { TransparentImg } from "../../../util/commonUtils";
import { RightContext } from "./rightContext";

const GrayLabel = (props: { label: string }) => {
const { label } = props;
return <ComListTitle>{label}</ComListTitle>;
};

const CompDiv = styled.div`
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -80,12 +77,10 @@ const InsertContain = styled.div`
gap: 8px;
`;

const CategoryLabel = styled(GrayLabel)`
margin: 0;
`;

const SectionWrapper = styled.div`
margin-bottom: 16px;
.section-header {
margin-left: 0;
}
`;

export const UICompPanel = () => {
Expand Down Expand Up @@ -122,26 +117,31 @@ export const UICompPanel = () => {

return (
<SectionWrapper key={index}>
<CategoryLabel label={uiCompCategoryNames[key as UICompCategory]} />
<InsertContain>
{infos.map((info) => (
<CompDiv key={info[0]} className={info[0] === "table" ? tableDragClassName : ""}>
<HovDiv
draggable
onDragStart={(e) => {
e.dataTransfer.setData("compType", info[0]);
e.dataTransfer.setDragImage(TransparentImg, 0, 0);
draggingUtils.setData("compType", info[0]);
onDrag(info[0]);
}}
>
<IconContain Icon={info[1].icon}></IconContain>
</HovDiv>
<CompNameLabel>{info[1].name}</CompNameLabel>
{language !== "en" && <CompEnNameLabel>{info[1].enName}</CompEnNameLabel>}
</CompDiv>
))}
</InsertContain>
<BaseSection
noMargin
width={288}
name={uiCompCategoryNames[key as UICompCategory]}
>
<InsertContain>
{infos.map((info) => (
<CompDiv key={info[0]} className={info[0] === "table" ? tableDragClassName : ""}>
<HovDiv
draggable
onDragStart={(e) => {
e.dataTransfer.setData("compType", info[0]);
e.dataTransfer.setDragImage(TransparentImg, 0, 0);
draggingUtils.setData("compType", info[0]);
onDrag(info[0]);
}}
>
<IconContain Icon={info[1].icon}></IconContain>
</HovDiv>
<CompNameLabel>{info[1].name}</CompNameLabel>
{language !== "en" && <CompEnNameLabel>{info[1].enName}</CompEnNameLabel>}
</CompDiv>
))}
</InsertContain>
</BaseSection>
</SectionWrapper>
);
})
Expand Down