* fix style bugs * fix select styles * test: fix font size issue for cypress tests * incorporate ashit feedback * test: addresed review comments for cypress tests * add analytics events * height issue in view mode * incorporate code review feedbacks * incorporate code review feedbacks * refactor: addressed review comments; removed border radius and box shadow for text widget; Updated migrations * feat: Makes shadow and radius controls keyboard accessible (#11547) * makes shadow and radius controls keyboard accessible * removes unused imports * moves options out of render method * fix: changed the misnomer background property name to the relevant property name * fix: border radius issue for the map widget * address qa bugs * address qa bugs * fix ux of theming pane when widget is selected * fix: * added backgroundColor to the video widget * restricted pop-over border radius to 0.375rem * added box shadow for the input group for select widget * fix: added delete icon in the delete theme modal * address qa bugs * change checkbox column size in config * add js convertible to button color * remove unused imports * test: fixed jest tests * fix primary color typo * fix: migrations for the theming * fix: * Removed background color from MultiTreeSelect and TreeSelect component. * grouped button's menu button pop over border radius restricting to 0.375rem. * test: updated Dsl migration UT * address qa bugs * address qa bugs * fix: address qa comments * address qa bugs * fix: * migration issue; * unit test cases; * fix rating widget scroll issue * fix youtube video border radius bug * fix select widget * fix select widgets styles * address qa bugs * merge conflicts * makes the reset button keyboard accessible (#12134) * -resolved merge conflicts * address qa bugs * fix: labelTextSize migration fixes * refactor: * made changes to the fontSizeUtils function * fixed the issue related to unit tests * fix button group widget * remove unused imports * fix: fixed the text size migration for the table widget * refactor: addressed review comments for the table widget theming migration * fix button group widget * add init calls for view mode * json form init theme changes * fix: added migration for boxShadow, borderRadius and textSizes for table widget * fix broken fields * test: fixed unit tests * wip * inconsistancy fixes and schemaItem update in updateHook/fieldConfiguration * feat: init json form migration theming * json form primaryColor -> accentColor * update table widget * update table widget * object field label styling * fix: migration related to the JSON form * fix: fixed labelTextSize migration for JSON form nested widgets * property control nested stylesheet lookup * JSONForm label styles form array items * show label for checkbox field array item * fix button group widget * wip * refactor: addressed table widget review comments * refactor: addressed ashit review comments; * added childStylesheet for widgets * feat: Keyboard navigable Color Picker control (#11797) * Makes ColorPicker keyboard accessible * seperate out keyboard and mouse interactions * fix issue with not focusing back to input * Adds test for Color picker * chore: added comment for the boxShadow property * fix: * added unit test cases for the widget and property utils * resolved warning messages * wip * theme config update * fix merge conflicts * refactor: moved theming migration inside the migrations folder * fix qa bugs * fix jest test * fix: unit test cases * fix table column creation logic * refactor: addressed review comments for migrations * fix: Overriding margin and padding for custom render in the dropdown component (#12875) * * fix for custom render padding and margin in ADS dropdown * * fix for removing padding from normal render options * refactor: moved the boxShadow condition to the variable * fix qa bugs * fix: migration QA callouts for audio recorder widget * refactor: added updated comments for boxShadow migration for table widget * fix theme binfings for JSONForm fields under Object * fix table widget theming bug * fix: addressed code review comments * fix: unit test cases * fix: qa migration callouts * fix table widget theming bug * fix JSONForm currency input dropdown not submit form * Added new tests - AppThemingSpec * fix qa bugs * fix unit test * fix JSONForm cellBorderWidth to have default value post migration * fix unit test * fix qa bugs * remove unused imports * fix qa bugs * fix JSONForm input height issue * fix qa bugs * Updating Theming spec * * dropdown color fixes (#13249) * fix caching issue ; * Fixed Theming tests * fix tests * fix tab widget tests * fix: json form children level migration issue * fix table widget tests * Updated test * updated tests * updated test * updated tests * updated tests * updated pageload * fix cypress tests * remove cypress created files * fix color picker issues * Failure fixes * Fixed some more tests * fix: cypress test failures * fix tests * remove consoles * fix table tests * fix qa bugs * updating snapshots for AppPageLayout_spec as per new UI * fix rating widget bug * fix qa bugs * fix: * cypress failing tests * Migration QA callouts * Removed unused imports * update constract check algo * fix color contrast issue * fix: cypress failure test cases * update font sizes labels * fix regression bugs * fix: * JSON form labelTextSize issue fix * Updated comment for the fontSizeUtility function * migrations issues related to table widget borderRadius and boxShadow * fix: default labelTextSize issue for the Input and Select families * fix regression bugs * fix regression bugs * PassingParams spec - added wait time * fix: font family default value issue on JS toggle * fix js toggle issue in text widget * fix tests * fix tests * fix tests * fix cypress tests * fix regression bugs * fix regression bugs * fix: * refactored table widget migration function as per review comments, * added default value to the widget * fix: failing unit test cases * fix theming spec * fix cypress tests * test: fixed failed cypress test * incorporate ashit feedback * fix cypress tests * fix: addressed review comments * comment out table cypress test * fix merge conflicts * comment out color picker tests Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local> Co-authored-by: keyurparalkar <keyur@appsmith.com> Co-authored-by: Aswath K <aswath@appsmith.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Ashit Rath <ashit@appsmith.com> Co-authored-by: balajisoundar <balaji@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: apple <nandan@thinkify.io> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
150 lines
3.7 KiB
TypeScript
150 lines
3.7 KiB
TypeScript
import React from "react";
|
|
import {
|
|
Intent,
|
|
BlueprintButtonIntentsCSS,
|
|
Skin,
|
|
} from "constants/DefaultTheme";
|
|
import styled, { css } from "styled-components";
|
|
import {
|
|
AnchorButton as BlueprintAnchorButton,
|
|
Button as BlueprintButton,
|
|
Intent as BlueprintIntent,
|
|
IconName,
|
|
MaybeElement,
|
|
IButtonProps,
|
|
} from "@blueprintjs/core";
|
|
import { Direction, Directions } from "utils/helpers";
|
|
import { omit } from "lodash";
|
|
|
|
const outline = css`
|
|
&&&&&& {
|
|
border-width: 1px;
|
|
border-style: solid;
|
|
}
|
|
`;
|
|
|
|
const buttonStyles = css<Partial<ButtonProps>>`
|
|
${BlueprintButtonIntentsCSS}
|
|
&&&& {
|
|
border-radius: 0;
|
|
background: ${(props) =>
|
|
props.filled || props.outline ? "inherit" : "transparent"};
|
|
border-radius: ${({ borderRadius }) => borderRadius};
|
|
box-shadow: ${({ boxShadow }) => `${boxShadow}`} !important;
|
|
width: ${(props) => (props.fluid ? "100%" : "auto")};
|
|
height: 100%;
|
|
padding: 0 10px;
|
|
}
|
|
&&&&&& {
|
|
&.bp3-button span {
|
|
font-weight: ${(props) => (props.skin !== undefined ? 400 : 700)};
|
|
}
|
|
.bp3-icon svg {
|
|
width: ${(props) => (props.skin !== undefined ? 14 : 16)}px;
|
|
height: ${(props) => (props.skin !== undefined ? 14 : 16)}px;
|
|
}
|
|
&.bp3-button {
|
|
display: flex;
|
|
justify-content: ${(props) =>
|
|
props.skin === undefined
|
|
? "center"
|
|
: props.iconAlignment === Directions.RIGHT
|
|
? "space-between"
|
|
: "flex-start"};
|
|
}
|
|
}
|
|
${(props) => (props.outline ? outline : "")}
|
|
`;
|
|
const StyledButton = styled((props: IButtonProps & Partial<ButtonProps>) => (
|
|
<BlueprintButton
|
|
{...omit(props, ["iconAlignment", "fluid", "filled", "outline"])}
|
|
/>
|
|
))`
|
|
${buttonStyles}
|
|
`;
|
|
const StyledAnchorButton = styled(
|
|
(props: IButtonProps & Partial<ButtonProps>) => (
|
|
<BlueprintAnchorButton
|
|
{...omit(props, ["iconAlignment", "fluid", "filled", "outline"])}
|
|
/>
|
|
),
|
|
)`
|
|
${buttonStyles}
|
|
`;
|
|
|
|
export type ButtonProps = {
|
|
outline?: boolean;
|
|
filled?: boolean;
|
|
intent?: Intent;
|
|
text?: string;
|
|
onClick?: () => void;
|
|
href?: string;
|
|
icon?: string | MaybeElement;
|
|
iconAlignment?: Direction;
|
|
loading?: boolean;
|
|
disabled?: boolean;
|
|
size?: "large" | "small";
|
|
type?: "button" | "submit" | "reset";
|
|
className?: string;
|
|
fluid?: boolean;
|
|
skin?: Skin;
|
|
target?: string;
|
|
borderRadius?: string;
|
|
boxShadow?: string;
|
|
boxShadowColor?: string;
|
|
};
|
|
|
|
export const Button = (props: ButtonProps) => {
|
|
const icon: IconName | undefined =
|
|
props.icon &&
|
|
(props.iconAlignment === Directions.LEFT ||
|
|
props.iconAlignment === undefined)
|
|
? (props.icon as IconName)
|
|
: undefined;
|
|
const rightIcon: IconName | undefined =
|
|
props.icon && props.iconAlignment === Directions.RIGHT
|
|
? (props.icon as IconName)
|
|
: undefined;
|
|
|
|
const baseProps = {
|
|
text: props.text,
|
|
minimal: !props.filled,
|
|
outline: !!props.outline,
|
|
filled: !!props.filled,
|
|
intent: props.intent as BlueprintIntent,
|
|
large: props.size === "large",
|
|
small: props.size === "small",
|
|
loading: props.loading,
|
|
disabled: props.disabled,
|
|
type: props.type,
|
|
className: props.className,
|
|
fluid: !!props.fluid,
|
|
skin: props.skin,
|
|
iconAlignment: props.iconAlignment ? props.iconAlignment : undefined,
|
|
};
|
|
if (props.href) {
|
|
return (
|
|
<StyledAnchorButton
|
|
icon={icon}
|
|
rightIcon={rightIcon}
|
|
{...baseProps}
|
|
href={props.href}
|
|
target={props.target}
|
|
/>
|
|
);
|
|
} else
|
|
return (
|
|
<StyledButton
|
|
borderRadius={props.borderRadius}
|
|
boxShadow={props.boxShadow}
|
|
boxShadowColor={props.boxShadowColor}
|
|
icon={icon}
|
|
rightIcon={rightIcon}
|
|
{...baseProps}
|
|
onClick={props.onClick}
|
|
/>
|
|
);
|
|
};
|
|
|
|
export default Button;
|