From 78f7039e8554be54d1812c5b57a44cdbc175d920 Mon Sep 17 00:00:00 2001 From: devrk96 Date: Thu, 3 Sep 2020 11:51:36 +0530 Subject: [PATCH 1/2] hide edit icon issue fixed (#494) --- app/client/src/components/ads/EditableText.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/client/src/components/ads/EditableText.tsx b/app/client/src/components/ads/EditableText.tsx index 926ee58e61..b64ef37ce0 100644 --- a/app/client/src/components/ads/EditableText.tsx +++ b/app/client/src/components/ads/EditableText.tsx @@ -223,7 +223,9 @@ export const EditableText = (props: EditableTextProps) => { }; const iconName = - !isEditing && savingState.name === SavingState.NOT_STARTED + !isEditing && + savingState.name === SavingState.NOT_STARTED && + !props.hideEditIcon ? "edit" : !isEditing && savingState.name === SavingState.SUCCESS ? "success" From 3e8857831828c5604a52ce2c3fdf304b10204d74 Mon Sep 17 00:00:00 2001 From: satbir121 <39981226+satbir121@users.noreply.github.com> Date: Thu, 3 Sep 2020 12:42:22 +0530 Subject: [PATCH 2/2] Fixing Storybook deploy (#493) --- app/client/src/components/ads/common.tsx | 7 +++++++ app/client/src/components/stories/Button.stories.tsx | 2 +- .../src/components/stories/ColorSelector.stories.tsx | 2 +- app/client/src/components/stories/Dropdown.stories.tsx | 2 +- .../src/components/stories/EditableText.stories.tsx | 2 +- app/client/src/components/stories/Icon.stories.tsx | 2 +- .../src/components/stories/IconSelector.stories.tsx | 2 +- app/client/src/components/stories/SearchInput.stories.tsx | 2 +- app/client/src/components/stories/Table.stories.tsx | 2 +- .../src/components/stories/TableDropdown.stories.tsx | 2 +- app/client/src/components/stories/Tabs.stories.tsx | 8 +------- app/client/src/components/stories/Text.stories.tsx | 2 +- app/client/src/components/stories/TextInput.stories.tsx | 2 +- 13 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/client/src/components/ads/common.tsx b/app/client/src/components/ads/common.tsx index 5b44f4e172..4f779bebb0 100644 --- a/app/client/src/components/ads/common.tsx +++ b/app/client/src/components/ads/common.tsx @@ -1,4 +1,5 @@ import { Theme } from "constants/DefaultTheme"; +import styled from "styled-components"; export interface CommonComponentProps { isLoading?: boolean; //default false @@ -40,3 +41,9 @@ export const hexToRgba = (color: string, alpha: number) => { const value = hexToRgb(color); return `rgba(${value.r}, ${value.g}, ${value.b}, ${alpha});`; }; + +export const StoryWrapper = styled.div` + background: #1a191c; + height: 700px; + padding: 50px 100px; +`; diff --git a/app/client/src/components/stories/Button.stories.tsx b/app/client/src/components/stories/Button.stories.tsx index 2e5d5e7e06..22bcb3b19a 100644 --- a/app/client/src/components/stories/Button.stories.tsx +++ b/app/client/src/components/stories/Button.stories.tsx @@ -2,7 +2,7 @@ import React from "react"; import Button, { Size, Category, Variant } from "components/ads/Button"; import { withKnobs, select, boolean, text } from "@storybook/addon-knobs"; import { withDesign } from "storybook-addon-designs"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; import { IconCollection } from "components/ads/Icon"; export default { diff --git a/app/client/src/components/stories/ColorSelector.stories.tsx b/app/client/src/components/stories/ColorSelector.stories.tsx index ec30c74238..34e8bdc6ad 100644 --- a/app/client/src/components/stories/ColorSelector.stories.tsx +++ b/app/client/src/components/stories/ColorSelector.stories.tsx @@ -3,7 +3,7 @@ import { action } from "@storybook/addon-actions"; import ColorSelector, { appColorPalette } from "components/ads/ColorSelector"; import { withKnobs, array, boolean } from "@storybook/addon-knobs"; import { withDesign } from "storybook-addon-designs"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "ColorSelector", diff --git a/app/client/src/components/stories/Dropdown.stories.tsx b/app/client/src/components/stories/Dropdown.stories.tsx index 4b23cd0aa2..74233c6a6a 100644 --- a/app/client/src/components/stories/Dropdown.stories.tsx +++ b/app/client/src/components/stories/Dropdown.stories.tsx @@ -4,7 +4,7 @@ import { withDesign } from "storybook-addon-designs"; import Dropdown from "components/ads/Dropdown"; import { action } from "@storybook/addon-actions"; import { IconCollection } from "components/ads/Icon"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Dropdown", diff --git a/app/client/src/components/stories/EditableText.stories.tsx b/app/client/src/components/stories/EditableText.stories.tsx index 5c3e016d72..fc69fa1c91 100644 --- a/app/client/src/components/stories/EditableText.stories.tsx +++ b/app/client/src/components/stories/EditableText.stories.tsx @@ -7,7 +7,7 @@ import EditableText, { SavingState, } from "components/ads/EditableText"; import { action } from "@storybook/addon-actions"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "EditableText", diff --git a/app/client/src/components/stories/Icon.stories.tsx b/app/client/src/components/stories/Icon.stories.tsx index d753f30f5c..90b1b5be7e 100644 --- a/app/client/src/components/stories/Icon.stories.tsx +++ b/app/client/src/components/stories/Icon.stories.tsx @@ -4,7 +4,7 @@ import Button, { Size, Category, Variant } from "components/ads/Button"; import { withKnobs, select, boolean } from "@storybook/addon-knobs"; import { withDesign } from "storybook-addon-designs"; import AppIcon, { AppIconCollection } from "components/ads/AppIcon"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Icon", diff --git a/app/client/src/components/stories/IconSelector.stories.tsx b/app/client/src/components/stories/IconSelector.stories.tsx index 88f6cb0ed7..dce1dabf0f 100644 --- a/app/client/src/components/stories/IconSelector.stories.tsx +++ b/app/client/src/components/stories/IconSelector.stories.tsx @@ -4,7 +4,7 @@ import { withDesign } from "storybook-addon-designs"; import IconSelector from "components/ads/IconSelector"; import { action } from "@storybook/addon-actions"; import { AppIconCollection } from "components/ads/AppIcon"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "IconSelector", diff --git a/app/client/src/components/stories/SearchInput.stories.tsx b/app/client/src/components/stories/SearchInput.stories.tsx index 9b4bb8787f..e53ef0b5e8 100644 --- a/app/client/src/components/stories/SearchInput.stories.tsx +++ b/app/client/src/components/stories/SearchInput.stories.tsx @@ -2,7 +2,7 @@ import React from "react"; import { withKnobs, boolean, text, select } from "@storybook/addon-knobs"; import { action } from "@storybook/addon-actions"; import SearchInput, { SearchVariant } from "components/ads/SearchInput"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Search Input", diff --git a/app/client/src/components/stories/Table.stories.tsx b/app/client/src/components/stories/Table.stories.tsx index 0dadf2153e..7b21131027 100644 --- a/app/client/src/components/stories/Table.stories.tsx +++ b/app/client/src/components/stories/Table.stories.tsx @@ -4,7 +4,7 @@ import Button, { Category, Variant, Size } from "components/ads/Button"; import Icon, { IconSize } from "components/ads/Icon"; import TableDropdown from "components/ads/TableDropdown"; import { Position } from "@blueprintjs/core/lib/esm/common/position"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Table", diff --git a/app/client/src/components/stories/TableDropdown.stories.tsx b/app/client/src/components/stories/TableDropdown.stories.tsx index 3bf2c11c67..2a9bbdd1d5 100644 --- a/app/client/src/components/stories/TableDropdown.stories.tsx +++ b/app/client/src/components/stories/TableDropdown.stories.tsx @@ -3,7 +3,7 @@ import { withKnobs, select } from "@storybook/addon-knobs"; import { withDesign } from "storybook-addon-designs"; import TableDropdown from "components/ads/TableDropdown"; import { Position } from "@blueprintjs/core/lib/esm/common/position"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Dropdown", diff --git a/app/client/src/components/stories/Tabs.stories.tsx b/app/client/src/components/stories/Tabs.stories.tsx index 7c3e6ad089..6b7e97a9c4 100644 --- a/app/client/src/components/stories/Tabs.stories.tsx +++ b/app/client/src/components/stories/Tabs.stories.tsx @@ -3,7 +3,7 @@ import { TabComponent, TabProp } from "components/ads/Tabs"; import { select, text, withKnobs } from "@storybook/addon-knobs"; import { withDesign } from "storybook-addon-designs"; import { IconCollection } from "components/ads/Icon"; -import styled from "styled-components"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Tabs", @@ -97,9 +97,3 @@ export const Tabs = () => ( title4={text("Title 4", "")} /> ); - -export const StoryWrapper = styled.div` - background: #1a191c; - height: 700px; - padding: 50px 100px; -`; diff --git a/app/client/src/components/stories/Text.stories.tsx b/app/client/src/components/stories/Text.stories.tsx index d55b3f1665..ca0e495c32 100644 --- a/app/client/src/components/stories/Text.stories.tsx +++ b/app/client/src/components/stories/Text.stories.tsx @@ -2,7 +2,7 @@ import React from "react"; import { boolean, select, text, withKnobs } from "@storybook/addon-knobs"; import Text, { TextType, Case, FontWeight } from "components/ads/Text"; import styled from "styled-components"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Text", diff --git a/app/client/src/components/stories/TextInput.stories.tsx b/app/client/src/components/stories/TextInput.stories.tsx index 165de53a16..00baa3c35f 100644 --- a/app/client/src/components/stories/TextInput.stories.tsx +++ b/app/client/src/components/stories/TextInput.stories.tsx @@ -2,7 +2,7 @@ import React from "react"; import { withKnobs, boolean, text } from "@storybook/addon-knobs"; import TextInput from "components/ads/TextInput"; import { action } from "@storybook/addon-actions"; -import { StoryWrapper } from "./Tabs.stories"; +import { StoryWrapper } from "components/ads/common"; export default { title: "Text Input",