Merge branch 'fix/list-select-item' into develop

illacloud · Mar 1, 2024 · 40d8b8f · 40d8b8f
2 parents 5ca195e + f3098ca
commit 40d8b8f
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 37 deletions.
diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "author": "ILLA Cloud <opensource@illasoft.com>",
   "license": "Apache-2.0",
-  "version": "4.5.8",
+  "version": "4.5.9",
   "scripts": {
     "dev": "vite --strictPort --force",
     "build-cloud": "NODE_OPTIONS=--max-old-space-size=12288  vite build --mode cloud",

diff --git a/...der/src/page/App/components/DotPanel/components/Canvas/renderComponentCanvasContainer.tsx b/...der/src/page/App/components/DotPanel/components/Canvas/renderComponentCanvasContainer.tsx
@@ -558,6 +558,7 @@ const RenderComponentCanvasContainer: FC<
             data-canvas-container={displayName}
             data-column-number={columnNumber}
             data-unit-width={unitWidth}
+            data-list-widget-container
           >
             {isEditMode && (
               <DragShadowPreview

diff --git a/...page/App/components/DotPanel/components/Canvas/renderComponentCanvasContainerWithJson.tsx b/...page/App/components/DotPanel/components/Canvas/renderComponentCanvasContainerWithJson.tsx
@@ -49,6 +49,7 @@ export const RenderComponentCanvasWithJson: FC<{
     <div
       css={outerComponentCanvasContainerWithJsonStyle(containerPadding)}
       ref={canvasRef}
+      data-list-widget-container
     >
       {componentTree}
     </div>

diff --git a/...der/src/widgetLibrary/PC/GridListWidget/components/ListWidgetWithAutoPagination/index.tsx b/...der/src/widgetLibrary/PC/GridListWidget/components/ListWidgetWithAutoPagination/index.tsx
@@ -220,10 +220,11 @@ const ListWidgetWithAutoPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                   loading,
                 )}
                 ref={itemRef}
-                onClick={() => {
-                  handleUpdateSelectedItem(
-                    selectIndexForMark === 0 ? undefined : 0,
-                  )
+                onClick={(e) => {
+                  const isClickOnContainer = !!(
+                    e.target as HTMLElement
+                  )?.getAttribute("data-list-widget-container")
+                  handleUpdateSelectedItem(0, isClickOnContainer)
                 }}
               >
                 <RenderTemplateContainer
@@ -279,10 +280,11 @@ const ListWidgetWithAutoPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                   itemHeight,
                   itemPadding?.size,
                 )}
-                onClick={() => {
-                  handleUpdateSelectedItem(
-                    selectIndexForMark === index ? undefined : index,
-                  )
+                onClick={(e) => {
+                  const isClickOnContainer = !!(
+                    e.target as HTMLElement
+                  )?.getAttribute("data-list-widget-container")
+                  handleUpdateSelectedItem(index, isClickOnContainer)
                 }}
               >
                 <RenderCopyContainer

diff --git a/...r/src/widgetLibrary/PC/GridListWidget/components/ListWidgetWithServerPagination/index.tsx b/...r/src/widgetLibrary/PC/GridListWidget/components/ListWidgetWithServerPagination/index.tsx
@@ -291,8 +291,12 @@ const ListWidgetWithServerPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                 isEditMode,
                 loading,
               )}
-              onClick={() => {
-                handleUpdateSelectedItem(0)
+              onClick={(e) => {
+                const isClickOnContainer = !!(
+                  e.target as HTMLElement
+                )?.getAttribute("data-list-widget-container")
+
+                handleUpdateSelectedItem(0, isClickOnContainer)
               }}
             >
               <RenderTemplateContainer
@@ -346,8 +350,12 @@ const ListWidgetWithServerPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                   itemPadding?.size,
                 )}
                 ref={itemRef}
-                onClick={() => {
-                  handleUpdateSelectedItem(index)
+                onClick={(e) => {
+                  const isClickOnContainer = !!(
+                    e.target as HTMLElement
+                  )?.getAttribute("data-list-widget-container")
+
+                  handleUpdateSelectedItem(index, isClickOnContainer)
                 }}
               >
                 <RenderCopyContainer

diff --git a/apps/builder/src/widgetLibrary/PC/GridListWidget/gridList.tsx b/apps/builder/src/widgetLibrary/PC/GridListWidget/gridList.tsx
@@ -171,16 +171,22 @@ export const GridListWidget: FC<GridListWidgetProps> = (props) => {
   }, [childrenNode, dataSources, transTemplateContainerNodes])
 
   const handleUpdateSelectedItem = useCallback(
-    (index?: number) => {
+    (index?: number, isContainerClick?: boolean) => {
       if (!Array.isArray(dataSources) || disabled) return
-      if (selectIndexForMark === index || index === undefined) {
+      if (
+        (selectIndexForMark === index && isContainerClick) ||
+        index === undefined
+      ) {
         setSelectIndexForMark(undefined)
       } else {
         setSelectIndexForMark(index)
       }
       new Promise((resolve) => {
         let value
-        if (index === undefined || index < 0 || index > dataSources.length) {
+        if (
+          index === undefined ||
+          (selectIndexForMark === index && isContainerClick)
+        ) {
           value = {
             selectedItem: undefined,
             selectedIndex: undefined,

diff --git a/apps/builder/src/widgetLibrary/PC/GridListWidget/interface.ts b/apps/builder/src/widgetLibrary/PC/GridListWidget/interface.ts
@@ -79,6 +79,6 @@ export interface RenderCopyContainerProps {
 
 export interface ListWidgetPropsWithChildrenNodes extends GridListWidgetProps {
   copyComponents: ComponentTreeNode[] | null
-  handleUpdateSelectedItem: (index?: number) => void
+  handleUpdateSelectedItem: (index?: number, isContainerClick?: boolean) => void
   selectIndexForMark?: number
 }
diff --git a/...builder/src/widgetLibrary/PC/ListWidget/components/ListWidgetWithAutoPagination/index.tsx b/...builder/src/widgetLibrary/PC/ListWidget/components/ListWidgetWithAutoPagination/index.tsx
@@ -184,10 +184,11 @@ const ListWidgetWithAutoPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                   isEditMode,
                   loading,
                 )}
-                onClick={() => {
-                  handleUpdateSelectedItem(
-                    selectIndexForMark === 0 ? undefined : 0,
-                  )
+                onClick={(e) => {
+                  const isClickOnContainer = !!(
+                    e.target as HTMLElement
+                  )?.getAttribute("data-list-widget-container")
+                  handleUpdateSelectedItem(0, isClickOnContainer)
                 }}
               >
                 <RenderTemplateContainer
@@ -245,10 +246,11 @@ const ListWidgetWithAutoPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                   itemPadding?.size,
                 )}
                 key={node.displayName}
-                onClick={() => {
-                  handleUpdateSelectedItem(
-                    selectIndexForMark === index ? undefined : index,
-                  )
+                onClick={(e) => {
+                  const isClickOnContainer = !!(
+                    e.target as HTMLElement
+                  )?.getAttribute("data-list-widget-container")
+                  handleUpdateSelectedItem(index, isClickOnContainer)
                 }}
               >
                 <RenderCopyContainer

diff --git a/...ilder/src/widgetLibrary/PC/ListWidget/components/ListWidgetWithServerPagination/index.tsx b/...ilder/src/widgetLibrary/PC/ListWidget/components/ListWidgetWithServerPagination/index.tsx
@@ -254,10 +254,11 @@ const ListWidgetWithServerPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                 isEditMode,
                 loading,
               )}
-              onClick={() => {
-                handleUpdateSelectedItem(
-                  selectIndexForMark === 0 ? undefined : 0,
-                )
+              onClick={(e) => {
+                const isClickOnContainer = !!(
+                  e.target as HTMLElement
+                )?.getAttribute("data-list-widget-container")
+                handleUpdateSelectedItem(0, isClickOnContainer)
               }}
             >
               <RenderTemplateContainer
@@ -311,10 +312,11 @@ const ListWidgetWithServerPagination: FC<ListWidgetPropsWithChildrenNodes> = (
                   itemPadding?.size,
                 )}
                 key={node.displayName}
-                onClick={() => {
-                  handleUpdateSelectedItem(
-                    selectIndexForMark === index ? undefined : index,
-                  )
+                onClick={(e) => {
+                  const isClickOnContainer = !!(
+                    e.target as HTMLElement
+                  )?.getAttribute("data-list-widget-container")
+                  handleUpdateSelectedItem(index, isClickOnContainer)
                 }}
               >
                 <RenderCopyContainer

diff --git a/apps/builder/src/widgetLibrary/PC/ListWidget/interface.ts b/apps/builder/src/widgetLibrary/PC/ListWidget/interface.ts
@@ -71,5 +71,5 @@ export interface RenderCopyContainerProps {
 export interface ListWidgetPropsWithChildrenNodes extends ListWidgetProps {
   copyComponents: ComponentTreeNode[] | null
   selectIndexForMark?: number
-  handleUpdateSelectedItem: (index?: number) => void
+  handleUpdateSelectedItem: (index?: number, isContainerClick?: boolean) => void
 }
diff --git a/apps/builder/src/widgetLibrary/PC/ListWidget/list.tsx b/apps/builder/src/widgetLibrary/PC/ListWidget/list.tsx
@@ -175,16 +175,22 @@ export const ListWidget: FC<ListWidgetProps> = (props) => {
   }, [childrenNode, dataSources, transTemplateContainerNodes])
 
   const handleUpdateSelectedItem = useCallback(
-    (index?: number) => {
+    (index?: number, isContainerClick?: boolean) => {
       if (!Array.isArray(dataSources) || disabled) return
-      if (selectIndexForMark === index || index === undefined) {
+      if (
+        (selectIndexForMark === index && isContainerClick) ||
+        index === undefined
+      ) {
         setSelectIndexForMark(undefined)
       } else {
         setSelectIndexForMark(index)
       }
       new Promise((resolve) => {
         let value
-        if (index === undefined || index < 0 || index > dataSources.length) {
+        if (
+          index === undefined ||
+          (selectIndexForMark === index && isContainerClick)
+        ) {
           value = {
             selectedItem: undefined,
             selectedIndex: undefined,