Skip to content

Adding Shapes Component #854

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.

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 27 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
10d27dc
initial shape component
freddysundowner Apr 18, 2024
840678f
Merge branch 'dev' of https://github.com/lowcoder-org/lowcoder into f…
freddysundowner Apr 18, 2024
6842c4f
merged from dev
freddysundowner Apr 18, 2024
cd3d37f
initial shape component
freddysundowner Apr 18, 2024
06d6458
selecting active shape
freddysundowner Apr 19, 2024
c0325fe
selecting active shape
freddysundowner Apr 19, 2024
7e190ed
aa
freddysundowner Apr 24, 2024
cd4f98b
fixed shape width and height, added default icon selection
freddysundowner Apr 27, 2024
a78fbe1
added icons lables
freddysundowner May 6, 2024
4ac855d
added grid too shapes comp and lables to shapes lists
freddysundowner May 6, 2024
acda8fe
referencing forked coolshapes package
freddysundowner May 6, 2024
e1a49c4
added grid too shapes comp and lables to shapes lists
freddysundowner May 6, 2024
578899e
initial shape component
freddysundowner Apr 18, 2024
e9d4aa4
initial shape component
freddysundowner Apr 18, 2024
be62b7d
selecting active shape
freddysundowner Apr 19, 2024
ebc66fe
selecting active shape
freddysundowner Apr 19, 2024
b07fee5
aa
freddysundowner Apr 24, 2024
b19c9bc
fixed shape width and height, added default icon selection
freddysundowner Apr 27, 2024
e5e1e2a
added icons lables
freddysundowner May 6, 2024
9e2f907
added grid too shapes comp and lables to shapes lists
freddysundowner May 6, 2024
bcd1211
referencing forked coolshapes package
freddysundowner May 6, 2024
5665218
added grid too shapes comp and lables to shapes lists
freddysundowner May 6, 2024
9143dd5
lazy load shapes comp
raheeliftikhar5 May 9, 2024
7dab708
removed console
raheeliftikhar5 May 9, 2024
307668c
Merge branch 'feat-ShapeComp' of https://github.com/lowcoder-org/lowc…
freddysundowner May 9, 2024
84ba449
fixed drag items to shape comp
freddysundowner May 10, 2024
b156fc0
Merge branch 'dev' into feat-ShapeComp
FalkWolsky May 11, 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
lazy load shapes comp
  • Loading branch information
raheeliftikhar5 committed May 9, 2024
commit 9143dd552df7c6037393dbd880a6abd19cfd4f5c
2 changes: 1 addition & 1 deletion client/packages/lowcoder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@
"vite-plugin-svgr": "^2.2.2",
"vite-tsconfig-paths": "^3.6.0"
}
}
}
1 change: 1 addition & 0 deletions client/packages/lowcoder/src/comps/comps/gridItemComp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const TmpComp = withTypeAndChildren<
continue;
}

console.log(manifest);
if(manifest.lazyLoad) {
return lazyLoadComp(
manifest.compName,
Expand Down
5 changes: 3 additions & 2 deletions client/packages/lowcoder/src/comps/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,14 @@ const builtInRemoteComps: Omit<RemoteCompInfo, "compName"> = {
export var uiCompMap: Registry = {
// Dashboards

// charts
shape: {
name: trans("uiComp.shapeCompName"),
enName: "Chart",
enName: "Shape",
description: trans("uiComp.shapeCompDesc"),
categories: ["dashboards"],
icon: ChartCompIcon,
keywords: trans("uiComp.shapeCompKeywords"),
lazyLoad: true,
compName: "ShapeComp",
compPath: "comps/shapeComp/shapeComp",
layoutInfo: {
Expand All @@ -132,6 +132,7 @@ export var uiCompMap: Registry = {
},
},

// charts
chart: {
name: trans("uiComp.chartCompName") + " (legacy)",
enName: "Chart",
Expand Down
4 changes: 4 additions & 0 deletions client/packages/lowcoder/src/i18n/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,10 @@ export const en = {
"chartCompDesc": "A versatile component for visualizing data through various types of charts and graphs.",
"chartCompKeywords": "chart, graph, data, visualization",

"shapeCompName": "Shape",
"shapeCompDesc": "",
"shapeCompKeywords": "shape",

"carouselCompName": "Image Carousel",
"carouselCompDesc": "A rotating carousel component for showcasing images, banners, or content slides.",
"carouselCompKeywords": "carousel, images, rotation, showcase",
Expand Down
2 changes: 2 additions & 0 deletions client/packages/lowcoder/src/pages/editor/editorConstants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,6 @@ export const CompStateIcon: {
transfer: <TransferCompIconSmall />,
card: <CardCompIconSmall />,
timer: <TimeRangeCompIconSmall/>,

shape: <ChartCompIconSmall />,
};
8 changes: 4 additions & 4 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7425,13 +7425,13 @@ __metadata:
languageName: node
linkType: hard

"coolshapes-react@file:/Users/la/Desktop/coolshapes-react::locator=lowcoder%40workspace%3Apackages%2Flowcoder":
coolshapes-react@lowcoder-org/coolshapes-react:
version: 1.0.1
resolution: "coolshapes-react@file:/Users/la/Desktop/coolshapes-react#/Users/la/Desktop/coolshapes-react::hash=163e05&locator=lowcoder%40workspace%3Apackages%2Flowcoder"
resolution: "coolshapes-react@https://github.com/lowcoder-org/coolshapes-react.git#commit=0530e0e01feeba965286c1321f9c1cacb47bf587"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 858b8476d410d3faae4cb26aab768d7a9d370befd51f54004540b84a08f27f5f11aa6ff4b76dca9f4dee82edfcd030d528819fabdbc82d2a6b0462b6f2d94ff3
checksum: e1b199f0325e87865cf6d89d4891ee84f4930196d21eed2356f4f2d2af8e748b8ad3889d1c9da2f5db6971913f75bd0f800b67a443ab7f4e972678031ce5c717
languageName: node
linkType: hard

Expand Down Expand Up @@ -13675,7 +13675,7 @@ __metadata:
buffer: ^6.0.3
clsx: ^2.0.0
cnchar: ^3.2.4
coolshapes-react: /Users/la/Desktop/coolshapes-react
coolshapes-react: lowcoder-org/coolshapes-react
copy-to-clipboard: ^3.3.3
core-js: ^3.25.2
dotenv: ^16.0.3
Expand Down