Skip to content

chore: remove console errors on dev #36639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rishabhrathod01 merged 3 commits into from
Oct 14, 2024
Merged

chore: remove console errors on dev #36639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c585202
fix: remove console errors on dev
Oct 1, 2024
6cd9efb
fix wrong spelled prop `varient`
Oct 2, 2024
49353f7
fix the spelling of prop `varient`
Oct 2, 2024
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
6 changes: 3 additions & 3 deletions app/client/src/pages/AppViewer/AppViewerButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { getTypographyByKey } from "@appsmith/ads-old";
const StyledButton = styled(Button)<{
primaryColor: string;
navColorStyle: NavigationSetting["colorStyle"];
varient?: ButtonVariant;
variant?: ButtonVariant;
Comment thread
rishabhrathod01 marked this conversation as resolved.
insideSidebar?: boolean;
isMinimal?: boolean;
}>`
Expand Down Expand Up @@ -87,7 +87,7 @@ const StyledButton = styled(Button)<{
}}

// Secondary button styles (such as the sign in button)
${({ insideSidebar = false, navColorStyle, primaryColor, varient }) => {
${({ insideSidebar = false, navColorStyle, primaryColor, variant }) => {
const styles = getSignInButtonStyles(primaryColor, navColorStyle);

let secondaryVarientStyles = `
Expand Down Expand Up @@ -123,7 +123,7 @@ const StyledButton = styled(Button)<{
`;
}

return varient === ButtonVariantTypes.SECONDARY
return variant === ButtonVariantTypes.SECONDARY
? secondaryVarientStyles
: "";
}}
Expand Down
6 changes: 3 additions & 3 deletions app/client/src/pages/AppViewer/PrimaryCTA.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ function PrimaryCTA(props: Props) {
}}
primaryColor={primaryColor}
text={createMessage(FORK_APP)}
varient={ButtonVariantTypes.SECONDARY}
variant={ButtonVariantTypes.SECONDARY}
/>
);
}
Expand All @@ -220,7 +220,7 @@ function PrimaryCTA(props: Props) {
}}
primaryColor={primaryColor}
text={createMessage(FORK_APP)}
varient={ButtonVariantTypes.SECONDARY}
variant={ButtonVariantTypes.SECONDARY}
/>
<ForkApplicationModal
applicationId={currentApplication?.id || ""}
Expand Down Expand Up @@ -255,7 +255,7 @@ function PrimaryCTA(props: Props) {
}}
primaryColor={primaryColor}
text={createMessage(SIGN_IN)}
varient={ButtonVariantTypes.SECONDARY}
variant={ButtonVariantTypes.SECONDARY}
/>
);
}
Expand Down
1 change: 1 addition & 0 deletions app/client/src/widgets/BaseInputWidget/component/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const InputComponentWrapper = styled((props) => (
"boxShadow",
"accentColor",
"isDynamicHeightEnabled",
"isMultiLine",
])}
/>
))<{
Expand Down
5 changes: 5 additions & 0 deletions app/client/src/widgets/ButtonWidget/component/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ export const StyledButton = styled((props) => (
"boxShadowColor",
"buttonColor",
"buttonVariant",
"primaryColor",
"navColorStyle",
"variant",
"insideSidebar",
"isMinimal",
])}
/>
))<ThemeProp & ButtonStyleProps>`
Expand Down
6 changes: 5 additions & 1 deletion app/client/src/widgets/ContainerWidget/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,11 @@ export class ContainerWidget extends BaseWidget<
this.props.positioning !== Positioning.Vertical;

return (
<ContainerComponent {...props} noScroll={isAutoHeightEnabled}>
<ContainerComponent
key={props.widgetId}
{...props}
noScroll={isAutoHeightEnabled}
>
<WidgetsMultiSelectBox
{...this.getSnapSpaces()}
noContainerOffset={!!props.noContainerOffset}
Expand Down
5 changes: 5 additions & 0 deletions app/client/src/widgets/IconButtonWidget/component/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ export const StyledButton = styled((props) => (
"dimension",
"hasOnClickAction",
"compactMode",
"buttonColor",
"primaryColor",
"navColorStyle",
"isMinimal",
"insideSidebar",
])}
/>
))<ThemeProp & ButtonStyleProps>`
Expand Down
4 changes: 2 additions & 2 deletions app/client/src/widgets/WidgetUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@ export const getCustomHoverColor = (
* Calculate Hover Color using the logic
* https://www.notion.so/appsmith/Widget-hover-colors-165e54b304ca4e83a355e4e14d7aa3cb
*
* In case of transparent backgrounds (secondary or tertiary button varients)
* In case of transparent backgrounds (secondary or tertiary button variants)
* 1. Find out the button color
* 2. Calculate hover color by setting the button color to 10% transparency
* 3. Add the calculated color to the background of the button
*
* In case of non transparent backgrounds (primary button varient), using the HSL color modal,
* In case of non transparent backgrounds (primary button variant), using the HSL color modal,
* 1. If lightness > 35, decrease the lightness by 5 on hover
* 2. If lightness <= 35, increase the lightness by 5 on hover
*
Expand Down