From 43b77d08af13fd4d7da2ad7cf33a9ea681ef2b16 Mon Sep 17 00:00:00 2001 From: Danieldare Date: Wed, 26 Jan 2022 11:45:55 +0100 Subject: [PATCH 1/3] fix: change delete icon --- app/client/src/components/ads/Icon.tsx | 6 +++++- .../src/components/formControls/WhereClauseControl.tsx | 10 ++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/client/src/components/ads/Icon.tsx b/app/client/src/components/ads/Icon.tsx index 5652023aa9..382b1dbb12 100644 --- a/app/client/src/components/ads/Icon.tsx +++ b/app/client/src/components/ads/Icon.tsx @@ -1,5 +1,5 @@ import React, { forwardRef, Ref } from "react"; -// import { ReactComponent as DeleteIcon } from "assets/icons/ads/delete.svg"; +import { ReactComponent as DeleteBin } from "assets/icons/ads/delete.svg"; import { ReactComponent as BookLineIcon } from "assets/icons/ads/book-open-line.svg"; import { ReactComponent as BugIcon } from "assets/icons/ads/bug.svg"; import { ReactComponent as CancelIcon } from "assets/icons/ads/cancel.svg"; @@ -226,6 +226,7 @@ export const IconCollection = [ "database-2-line", "datasource", "delete", + "delete-bin", "delete-blank", "desktop", "discord", @@ -472,6 +473,9 @@ const Icon = forwardRef( case "delete": returnIcon = ; break; + case "delete-bin": + returnIcon = ; + break; case "delete-blank": returnIcon = ; break; diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx index d5872f9a6b..da0302674d 100644 --- a/app/client/src/components/formControls/WhereClauseControl.tsx +++ b/app/client/src/components/formControls/WhereClauseControl.tsx @@ -165,12 +165,12 @@ function ConditionComponent(props: any, index: number) { /> {/* Component to render the delete icon */} { e.stopPropagation(); props.onDeletePressed(index); }} - size={IconSize.SMALL} + size={IconSize.XL} /> ); @@ -258,14 +258,12 @@ function ConditionBlock(props: any) { rerenderOnEveryChange={false} /> { e.stopPropagation(); onDeletePressed(index); }} - size={IconSize.SMALL} + size={IconSize.XL} /> ); From cfc89819a89945f148a8d2a3944bd9701df41526 Mon Sep 17 00:00:00 2001 From: Danieldare Date: Wed, 26 Jan 2022 11:52:56 +0100 Subject: [PATCH 2/3] fix: remove unused icon --- app/client/src/components/ads/Icon.tsx | 6 +----- .../src/components/formControls/WhereClauseControl.tsx | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/client/src/components/ads/Icon.tsx b/app/client/src/components/ads/Icon.tsx index 382b1dbb12..8a05b8a840 100644 --- a/app/client/src/components/ads/Icon.tsx +++ b/app/client/src/components/ads/Icon.tsx @@ -1,5 +1,5 @@ import React, { forwardRef, Ref } from "react"; -import { ReactComponent as DeleteBin } from "assets/icons/ads/delete.svg"; +// import { ReactComponent as DeleteBin } from "assets/icons/ads/delete.svg"; import { ReactComponent as BookLineIcon } from "assets/icons/ads/book-open-line.svg"; import { ReactComponent as BugIcon } from "assets/icons/ads/bug.svg"; import { ReactComponent as CancelIcon } from "assets/icons/ads/cancel.svg"; @@ -226,7 +226,6 @@ export const IconCollection = [ "database-2-line", "datasource", "delete", - "delete-bin", "delete-blank", "desktop", "discord", @@ -473,9 +472,6 @@ const Icon = forwardRef( case "delete": returnIcon = ; break; - case "delete-bin": - returnIcon = ; - break; case "delete-blank": returnIcon = ; break; diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx index da0302674d..b694d7342a 100644 --- a/app/client/src/components/formControls/WhereClauseControl.tsx +++ b/app/client/src/components/formControls/WhereClauseControl.tsx @@ -170,7 +170,7 @@ function ConditionComponent(props: any, index: number) { e.stopPropagation(); props.onDeletePressed(index); }} - size={IconSize.XL} + size={IconSize.LARGE} /> ); @@ -263,7 +263,7 @@ function ConditionBlock(props: any) { e.stopPropagation(); onDeletePressed(index); }} - size={IconSize.XL} + size={IconSize.LARGE} /> ); From 54e2f2e9b1263b5fce91c931c79d4b7ffc55a8b2 Mon Sep 17 00:00:00 2001 From: Danieldare Date: Wed, 26 Jan 2022 11:59:19 +0100 Subject: [PATCH 3/3] fix: revert delete icon name --- app/client/src/components/ads/Icon.tsx | 2 +- .../src/components/formControls/WhereClauseControl.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/client/src/components/ads/Icon.tsx b/app/client/src/components/ads/Icon.tsx index 8a05b8a840..5652023aa9 100644 --- a/app/client/src/components/ads/Icon.tsx +++ b/app/client/src/components/ads/Icon.tsx @@ -1,5 +1,5 @@ import React, { forwardRef, Ref } from "react"; -// import { ReactComponent as DeleteBin } from "assets/icons/ads/delete.svg"; +// import { ReactComponent as DeleteIcon } from "assets/icons/ads/delete.svg"; import { ReactComponent as BookLineIcon } from "assets/icons/ads/book-open-line.svg"; import { ReactComponent as BugIcon } from "assets/icons/ads/bug.svg"; import { ReactComponent as CancelIcon } from "assets/icons/ads/cancel.svg"; diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx index b694d7342a..e80ae22e29 100644 --- a/app/client/src/components/formControls/WhereClauseControl.tsx +++ b/app/client/src/components/formControls/WhereClauseControl.tsx @@ -170,7 +170,7 @@ function ConditionComponent(props: any, index: number) { e.stopPropagation(); props.onDeletePressed(index); }} - size={IconSize.LARGE} + size={IconSize.XL} /> ); @@ -258,12 +258,14 @@ function ConditionBlock(props: any) { rerenderOnEveryChange={false} /> { e.stopPropagation(); onDeletePressed(index); }} - size={IconSize.LARGE} + size={IconSize.XL} /> );