Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
36a5896
FEATURE-4149 : Style customisation in the button widget
wmdev0808 Jul 13, 2021
cbb1d73
FEATURE-4149 : Style customisation in the button widget
wmdev0808 Jul 15, 2021
5bd3b93
FEATURE-4149 : Style customisation in the button widget
wmdev0808 Jul 19, 2021
172c678
FEATURE-4149 : Style customisation in the button widget
wmdev0808 Jul 21, 2021
756290e
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Jul 21, 2021
beb308a
FEATURE-4149 : Style customization in the button widget
wmdev0808 Jul 23, 2021
f96c52a
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Jul 23, 2021
eee70bb
FEATURE-4149 : Style customisation in the button widget
wmdev0808 Jul 23, 2021
420731a
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Jul 23, 2021
2f8acf7
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Jul 28, 2021
63b4c70
FEATURE-4149 : Style customization in the button widget
wmdev0808 Jul 28, 2021
9b113bf
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Jul 28, 2021
9039d8b
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 5, 2021
70f35e8
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 5, 2021
8505e0a
FEATURE-4149 : Button Widget Style Customization
wmdev0808 Aug 5, 2021
b94a9d4
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 5, 2021
d31acbd
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 9, 2021
7cf8cfb
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 18, 2021
bafe3ae
FEATURE-4149 : Button Widget Style Customization
wmdev0808 Aug 18, 2021
99ebbed
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 18, 2021
f03275f
FEATURE-4149 : Button Widget Style Customization
wmdev0808 Aug 18, 2021
b839481
FEATURE-4149 : Button Widget Style Customization
wmdev0808 Aug 19, 2021
2870295
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 19, 2021
4daf84b
Merge branch 'release' into feature/4149-button-widget-style
arslanhaiderbuttar Aug 19, 2021
f06c42e
Update Button_spec.js
arslanhaiderbuttar Aug 19, 2021
316fd58
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 24, 2021
5e01f8a
Merge branch 'feature/4149-button-widget-style' of github.com-wm:apps…
wmdev0808 Aug 24, 2021
fff158d
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 24, 2021
8049528
FEATURE-4149 : Button Style Customization
wmdev0808 Aug 24, 2021
3916edf
Merge branch 'release' into feature/4149-button-widget-style
wmdev0808 Aug 24, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,20 @@ describe("Button Widget Functionality", function() {

it("Button-Style Validation", function() {
//Changing the style of the button from the property pane and verify it's color.
// Change to Warning button sytle
cy.changeButtonStyle(2, "rgb(254, 184, 17)", "rgba(0, 0, 0, 0)");
cy.get(publishPage.backToEditor).click({ force: true });
cy.openPropertyPane("buttonwidget");
// Change to Info button sytle
cy.changeButtonStyle(4, "rgb(102, 152, 255)", "rgba(0, 0, 0, 0)");
cy.get(publishPage.backToEditor).click({ force: true });
cy.openPropertyPane("buttonwidget");
// Change to Secondary button sytle
cy.changeButtonStyle(2, "rgba(0, 0, 0, 0)", "rgba(0, 0, 0, 0)");
cy.changeButtonStyle(5, "rgb(133, 130, 130)", "rgba(0, 0, 0, 0)");
cy.get(publishPage.backToEditor).click({ force: true });
// Change to Danger button sytle
cy.openPropertyPane("buttonwidget");
cy.changeButtonStyle(3, "rgb(179, 3, 56)", "rgb(139, 2, 43)");
cy.changeButtonStyle(3, "rgb(242, 43, 43)", "rgb(139, 2, 43)");
cy.get(publishPage.backToEditor).click({ force: true });
// Change to Primary button sytle
cy.openPropertyPane("buttonwidget");
Expand Down
2 changes: 1 addition & 1 deletion app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"styled-components": "^5.2.0",
"styled-system": "^5.1.5",
"tern": "^0.21.0",
"tinycolor2": "^1.4.1",
"tinycolor2": "^1.4.2",
"toposort": "^2.0.2",
"ts-loader": "^6.0.4",
"tslib": "^2.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ class FilePickerComponent extends React.Component<
}
return (
<BaseButton
accent="primary"
buttonStyle="PRIMARY"
disabled={this.props.isDisabled}
filled
loading={this.props.isLoading}
onClick={this.openModal}
text={label}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ import { IconName } from "@blueprintjs/icons";
import { ComponentProps } from "components/designSystems/appsmith/BaseComponent";
import { ThemeProp } from "components/ads/common";
import { WIDGET_PADDING } from "constants/WidgetConstants";
import {
ButtonBorderRadius,
ButtonBorderRadiusTypes,
} from "components/propertyControls/BorderRadiusOptionsControl";
import {
ButtonBoxShadow,
ButtonBoxShadowTypes,
} from "components/propertyControls/BoxShadowOptionsControl";

const IconButtonContainer = styled.div`
display: flex;
Expand Down Expand Up @@ -176,23 +184,6 @@ export enum ButtonVariantTypes {
}
export type ButtonVariant = keyof typeof ButtonVariantTypes;

export enum ButtonBorderRadiusTypes {
SHARP = "SHARP",
ROUNDED = "ROUNDED",
CIRCLE = "CIRCLE",
}
export type ButtonBorderRadius = keyof typeof ButtonBorderRadiusTypes;

export enum ButtonBoxShadowTypes {
NONE = "NONE",
VARIANT1 = "VARIANT1",
VARIANT2 = "VARIANT2",
VARIANT3 = "VARIANT3",
VARIANT4 = "VARIANT4",
VARIANT5 = "VARIANT5",
}
export type ButtonBoxShadow = keyof typeof ButtonBoxShadowTypes;

export interface IconButtonComponentProps extends ComponentProps {
iconName?: IconName;
buttonStyle: ButtonStyle;
Expand Down
Loading