Small fixes on Shape Component 2

Author: FalkWolsky

client/packages/lowcoder-design/src/icons/index.ts

@@ -302,6 +302,7 @@ export { ReactComponent as RatingCompIconSmall } from "./v2/rating-s.svg";
 export { ReactComponent as ResponsiveLayoutCompIconSmall } from "./v2/resposive-layout-s.svg"; // new
 export { ReactComponent as RichTextEditorCompIconSmall } from "./v2/rich-text-editor-s.svg"; // new
 export { ReactComponent as ScannerCompIconSmall } from "./v2/scanner-s.svg";    // new
+export { ReactComponent as ShapesCompIconSmall } from "./v2/shapes-s.svg"; // new
 export { ReactComponent as SegmentedCompIconSmall } from "./v2/segmented-control-s.svg";
 export { ReactComponent as SelectCompIconSmall } from "./v2/select-s.svg";
 export { ReactComponent as SliderCompIconSmall } from "./v2/slider-s.svg";
@@ -401,6 +402,7 @@ export { ReactComponent as RatingCompIcon } from "./v2/rating-m.svg";
 export { ReactComponent as ResponsiveLayoutCompIcon } from "./v2/resposive-layout-m.svg";
 export { ReactComponent as RichTextEditorCompIcon } from "./v2/rich-text-editor-m.svg";
 export { ReactComponent as ScannerCompIcon } from "./v2/scanner-m.svg";
+export { ReactComponent as ShapesCompIcon } from "./v2/shapes-m.svg";
 export { ReactComponent as SegmentedCompIcon } from "./v2/segmented-control-m.svg";
 export { ReactComponent as SelectCompIcon } from "./v2/select-m.svg";
 export { ReactComponent as SliderCompIcon } from "./v2/slider-m.svg";

client/packages/lowcoder/src/comps/index.tsx

@@ -88,6 +88,7 @@ import {
   FloatingTextCompIcon,
   TourCompIcon,
   StepCompIcon,
+  ShapesCompIcon,
 
   CandlestickChartCompIcon,
   FunnelChartCompIcon,
@@ -109,7 +110,6 @@ import {
   GraphChartCompIcon
 
 } from "lowcoder-design";
-import { ShapeComp } from "./comps/shapeComp/shapeComp";
 
 type Registry = {
   [key in UICompType]?: UICompManifest;
@@ -123,22 +123,7 @@ const builtInRemoteComps: Omit<RemoteCompInfo, "compName"> = {
 
 export var uiCompMap: Registry = { 
   // Dashboards
-  
-  shape: {
-    name: trans("uiComp.shapeCompName"),
-    enName: "Shape",
-    description: trans("uiComp.shapeCompDesc"),
-    categories: ["dashboards"],
-    icon: ChartCompIcon,
-    keywords: trans("uiComp.shapeCompKeywords"),
-    lazyLoad: true,
-    compName: "ShapeComp",
-    compPath: "comps/shapeComp/shapeComp",
-    layoutInfo: {
-      w: 12,
-      h: 40,
-    },
-  },
+
 
   // charts
   chart: {
@@ -405,37 +390,6 @@ export var uiCompMap: Registry = {
     },
   },
 
-  slider: {
-    name: trans("uiComp.sliderCompName"),
-    enName: "Slider",
-    description: trans("uiComp.sliderCompDesc"),
-    categories: ["dashboards"],
-    icon: SliderCompIcon,
-    keywords: trans("uiComp.sliderCompKeywords"),
-    lazyLoad: true,
-    compName: "SliderComp",
-    compPath: "comps/numberInputComp/sliderComp",
-    layoutInfo: {
-      w: 6,
-      h: 5,
-    },
-  },
-  rangeSlider: {
-    name: trans("uiComp.rangeSliderCompName"),
-    enName: "Range Slider",
-    description: trans("uiComp.rangeSliderCompDesc"),
-    categories: ["dashboards"],
-    icon: RangeSliderCompIcon,
-    keywords: trans("uiComp.rangeSliderCompKeywords"),
-    lazyLoad: true,
-    compName: "RangeSliderComp",
-    compPath: "comps/numberInputComp/rangeSliderComp",
-    layoutInfo: {
-      w: 6,
-      h: 5,
-    },
-  },
-
   // Layout
 
   responsiveLayout: {
@@ -1118,6 +1072,38 @@ export var uiCompMap: Registry = {
       h: 6,
     },
   },
+
+  slider: {
+    name: trans("uiComp.sliderCompName"),
+    enName: "Slider",
+    description: trans("uiComp.sliderCompDesc"),
+    categories: ["forms"],
+    icon: SliderCompIcon,
+    keywords: trans("uiComp.sliderCompKeywords"),
+    lazyLoad: true,
+    compName: "SliderComp",
+    compPath: "comps/numberInputComp/sliderComp",
+    layoutInfo: {
+      w: 6,
+      h: 5,
+    },
+  },
+  rangeSlider: {
+    name: trans("uiComp.rangeSliderCompName"),
+    enName: "Range Slider",
+    description: trans("uiComp.rangeSliderCompDesc"),
+    categories: ["forms"],
+    icon: RangeSliderCompIcon,
+    keywords: trans("uiComp.rangeSliderCompKeywords"),
+    lazyLoad: true,
+    compName: "RangeSliderComp",
+    compPath: "comps/numberInputComp/rangeSliderComp",
+    layoutInfo: {
+      w: 6,
+      h: 5,
+    },
+  },
+
   button: {
     name: trans("uiComp.buttonCompName"),
     enName: "Button",
@@ -1368,6 +1354,23 @@ export var uiCompMap: Registry = {
       h: 40,
     },
   },
+
+  shape: {
+    name: trans("uiComp.shapeCompName"),
+    enName: "Shape",
+    description: trans("uiComp.shapeCompDesc"),
+    categories: ["multimedia", "dashboards"],
+    icon: ShapesCompIcon,
+    keywords: trans("uiComp.shapeCompKeywords"),
+    lazyLoad: true,
+    compName: "ShapeComp",
+    compPath: "comps/shapeComp/shapeComp",
+    layoutInfo: {
+      w: 12,
+      h: 40,
+    },
+  },
+
   jsonLottie: {
     name: trans("uiComp.jsonLottieCompName"),
     enName: "Lottie Animation",

client/packages/lowcoder/src/pages/editor/editorConstants.tsx

@@ -80,6 +80,7 @@ import {
   AvatarGroupCompIconSmall,
   ColorPickerCompIconSmall,
   TransferCompIconSmall,
+  ShapesCompIconSmall,
 
   CandlestickChartCompIconSmall,
   FunnelChartCompIconSmall,
@@ -208,5 +209,5 @@ export const CompStateIcon: {
   card: <CardCompIconSmall />,
   timer: <TimeRangeCompIconSmall/>,
 
-  shape: <ChartCompIconSmall />,
+  shape: <ShapesCompIconSmall />,
 };