* 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>
432 lines
14 KiB
TypeScript
432 lines
14 KiB
TypeScript
import {
|
|
ButtonBorderRadiusTypes,
|
|
ButtonVariantTypes,
|
|
} from "components/constants";
|
|
import { TextSizes } from "constants/WidgetConstants";
|
|
import { remove } from "lodash";
|
|
import { getTheme, ThemeMode } from "selectors/themeSelectors";
|
|
import { rgbaMigrationConstantV56 } from "./constants";
|
|
import {
|
|
borderRadiusUtility,
|
|
replaceRgbaMigrationConstant,
|
|
boxShadowMigration,
|
|
boxShadowUtility,
|
|
escapeSpecialChars,
|
|
fontSizeUtility,
|
|
lightenColor,
|
|
sanitizeKey,
|
|
} from "./WidgetUtils";
|
|
import {
|
|
getCustomTextColor,
|
|
getCustomBackgroundColor,
|
|
getCustomHoverColor,
|
|
} from "./WidgetUtils";
|
|
|
|
const tableWidgetProps = {
|
|
dynamicBindingPathList: [
|
|
{
|
|
key: "primaryColumns.action.boxShadowColor",
|
|
},
|
|
],
|
|
primaryColumns: {
|
|
action: {
|
|
boxShadow: "0px 0px 4px 3px rgba(0, 0, 0, 0.25)",
|
|
boxShadowColor: ["red", "red", "red"],
|
|
},
|
|
},
|
|
};
|
|
|
|
describe("validate widget utils button style functions", () => {
|
|
const theme = getTheme(ThemeMode.LIGHT);
|
|
// validate getCustomTextColor function
|
|
it("getCustomTextColor - validate empty or undefined background color", () => {
|
|
// background color is undefined
|
|
const result = getCustomTextColor(theme);
|
|
expect(result).toStrictEqual("#FFFFFF");
|
|
|
|
// background color is empty string
|
|
const backgroundColor = "";
|
|
const expected = "#FFFFFF";
|
|
const result2 = getCustomTextColor(theme, backgroundColor);
|
|
expect(result2).toStrictEqual(expected);
|
|
});
|
|
|
|
it("getCustomTextColor - validate text color in case of dark or light background color", () => {
|
|
// background color is dark
|
|
const blueBackground = "#3366FF";
|
|
const expected1 = "#FFFFFF";
|
|
const result1 = getCustomTextColor(theme, blueBackground);
|
|
expect(result1).toStrictEqual(expected1);
|
|
|
|
// background color is light
|
|
const yellowBackground = "#FFC13D";
|
|
const expected2 = "#FFFFFF";
|
|
const result2 = getCustomTextColor(theme, yellowBackground);
|
|
|
|
expect(result2).toStrictEqual(expected2);
|
|
});
|
|
|
|
// validate getCustomBackgroundColor function
|
|
it("getCustomBackgroundColor - validate empty or undefined background color", () => {
|
|
const expected = "none";
|
|
const result = getCustomBackgroundColor();
|
|
expect(result).toStrictEqual(expected);
|
|
});
|
|
|
|
it("getCustomBackgroundColor - validate background color with primary button variant", () => {
|
|
const backgroundColor = "#03b365";
|
|
const expected = "#03b365";
|
|
const result = getCustomBackgroundColor(
|
|
ButtonVariantTypes.PRIMARY,
|
|
backgroundColor,
|
|
);
|
|
expect(result).toStrictEqual(expected);
|
|
});
|
|
|
|
it("getCustomBackgroundColor - validate background color with secondary button variant", () => {
|
|
const backgroundColor = "#03b365";
|
|
const expected = "none";
|
|
const result = getCustomBackgroundColor(
|
|
ButtonVariantTypes.SECONDARY,
|
|
backgroundColor,
|
|
);
|
|
expect(result).toStrictEqual(expected);
|
|
});
|
|
|
|
// validate getCustomHoverColor function
|
|
it("getCustomHoverColor - validate empty or undefined background color or variant", () => {
|
|
// background color and variant is both are undefined
|
|
const expected = "#e6e6e6";
|
|
const result = getCustomHoverColor(theme);
|
|
expect(result).toStrictEqual(expected);
|
|
|
|
// variant is undefined
|
|
const backgroundColor = "#03b365";
|
|
const expected1 = "#028149";
|
|
const result1 = getCustomHoverColor(theme, undefined, backgroundColor);
|
|
expect(result1).toStrictEqual(expected1);
|
|
});
|
|
|
|
// validate getCustomHoverColor function
|
|
it("getCustomHoverColor - validate hover color for different variant", () => {
|
|
const backgroundColor = "#03b365";
|
|
// variant : PRIMARY
|
|
const expected1 = "#028149";
|
|
const result1 = getCustomHoverColor(
|
|
theme,
|
|
ButtonVariantTypes.PRIMARY,
|
|
backgroundColor,
|
|
);
|
|
|
|
expect(result1).toStrictEqual(expected1);
|
|
|
|
// variant : PRIMARY without background
|
|
const expected2 = "#e6e6e6";
|
|
const result2 = getCustomHoverColor(theme, ButtonVariantTypes.PRIMARY);
|
|
expect(result2).toStrictEqual(expected2);
|
|
|
|
// variant : SECONDARY
|
|
const expected3 = "#dcfeef";
|
|
const result3 = getCustomHoverColor(
|
|
theme,
|
|
ButtonVariantTypes.SECONDARY,
|
|
backgroundColor,
|
|
);
|
|
|
|
expect(result3).toStrictEqual(expected3);
|
|
|
|
// variant : SECONDARY without background
|
|
const expected4 = "#ededed";
|
|
const result4 = getCustomHoverColor(theme, ButtonVariantTypes.SECONDARY);
|
|
expect(result4).toStrictEqual(expected4);
|
|
|
|
// variant : TERTIARY
|
|
const expected5 = "#dcfeef";
|
|
const result5 = getCustomHoverColor(
|
|
theme,
|
|
ButtonVariantTypes.TERTIARY,
|
|
backgroundColor,
|
|
);
|
|
expect(result5).toStrictEqual(expected5);
|
|
|
|
// variant : TERTIARY without background
|
|
const expected6 = "#ededed";
|
|
const result6 = getCustomHoverColor(theme, ButtonVariantTypes.TERTIARY);
|
|
expect(result6).toStrictEqual(expected6);
|
|
});
|
|
|
|
it("validate escaping special characters", () => {
|
|
const testString = `a\nb\nc
|
|
hello! how are you?
|
|
`;
|
|
const result = escapeSpecialChars(testString);
|
|
const expectedResult = "a\nb\nc\nhello! how are you?\n";
|
|
expect(result).toStrictEqual(expectedResult);
|
|
});
|
|
|
|
it("Check if the color is lightened with lightenColor utility", () => {
|
|
/**
|
|
* Colors with :
|
|
* 0% brightness = #000000,
|
|
* > 40% brightness = #696969
|
|
* > 50% brightness = #8a8a8a
|
|
* > 60% brightness = #b0b0b0
|
|
* > 70% brightness = #d6d4d4
|
|
*/
|
|
|
|
const actualColors = [
|
|
"#000000",
|
|
"#696969",
|
|
"#8a8a8a",
|
|
"#b0b0b0",
|
|
"#d6d4d4",
|
|
];
|
|
const lightColors = ["#ededed", "#ededed", "#ededed", "#ededed", "#eeeded"];
|
|
|
|
actualColors.forEach((color, idx) => {
|
|
expect(lightenColor(color)).toEqual(lightColors[idx]);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe(".sanitizeKey", () => {
|
|
it("returns sanitized value when passed a valid string", () => {
|
|
const inputAndExpectedOutput = [
|
|
["lowercase", "lowercase"],
|
|
["__abc__", "__abc__"],
|
|
["lower_snake_case", "lower_snake_case"],
|
|
["UPPER_SNAKE_CASE", "UPPER_SNAKE_CASE"],
|
|
["PascalCase", "PascalCase"],
|
|
["camelCase", "camelCase"],
|
|
["lower-kebab-case", "lower_kebab_case"],
|
|
["UPPER_KEBAB-CASE", "UPPER_KEBAB_CASE"],
|
|
["Sentencecase", "Sentencecase"],
|
|
["", "_"],
|
|
["with space", "with_space"],
|
|
["with multiple spaces", "with_multiple__spaces"],
|
|
["with%special)characters", "with_special_characters"],
|
|
["with%$multiple_spl.)characters", "with__multiple_spl__characters"],
|
|
["1startingWithNumber", "_1startingWithNumber"],
|
|
];
|
|
|
|
inputAndExpectedOutput.forEach(([input, expectedOutput]) => {
|
|
const result = sanitizeKey(input);
|
|
expect(result).toEqual(expectedOutput);
|
|
});
|
|
});
|
|
|
|
it("returns sanitized value when valid string with existing keys and reserved keys", () => {
|
|
const existingKeys = [
|
|
"__id",
|
|
"__restricted__",
|
|
"firstName1",
|
|
"_1age",
|
|
"gender",
|
|
"poll123",
|
|
"poll124",
|
|
"poll125",
|
|
"address_",
|
|
];
|
|
|
|
const inputAndExpectedOutput = [
|
|
["lowercase", "lowercase"],
|
|
["__abc__", "__abc__"],
|
|
["lower_snake_case", "lower_snake_case"],
|
|
["UPPER_SNAKE_CASE", "UPPER_SNAKE_CASE"],
|
|
["PascalCase", "PascalCase"],
|
|
["camelCase", "camelCase"],
|
|
["lower-kebab-case", "lower_kebab_case"],
|
|
["UPPER_KEBAB-CASE", "UPPER_KEBAB_CASE"],
|
|
["Sentencecase", "Sentencecase"],
|
|
["", "_"],
|
|
["with space", "with_space"],
|
|
["with multiple spaces", "with_multiple__spaces"],
|
|
["with%special)characters", "with_special_characters"],
|
|
["with%$multiple_spl.)characters", "with__multiple_spl__characters"],
|
|
["1startingWithNumber", "_1startingWithNumber"],
|
|
["1startingWithNumber", "_1startingWithNumber"],
|
|
["firstName", "firstName"],
|
|
["firstName1", "firstName2"],
|
|
["1age", "_1age1"],
|
|
["address&", "address_1"],
|
|
["%&id", "__id1"],
|
|
["%&restricted*(", "__restricted__1"],
|
|
["poll130", "poll130"],
|
|
["poll124", "poll126"],
|
|
["हिन्दि", "xn__j2bd4cyac6f"],
|
|
["😃", "xn__h28h"],
|
|
];
|
|
|
|
inputAndExpectedOutput.forEach(([input, expectedOutput]) => {
|
|
const result = sanitizeKey(input, {
|
|
existingKeys,
|
|
});
|
|
expect(result).toEqual(expectedOutput);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Test widget utility functions", () => {
|
|
it("case: fontSizeUtility returns the font sizes based on variant", () => {
|
|
const expectedFontSize = "0.75rem";
|
|
|
|
expect(fontSizeUtility(TextSizes.PARAGRAPH2)).toEqual(expectedFontSize);
|
|
});
|
|
|
|
it("case: borderRadiusUtility returns the borderRadius based on borderRadius variant", () => {
|
|
const expectedBorderRadius = "0.375rem";
|
|
expect(borderRadiusUtility(ButtonBorderRadiusTypes.ROUNDED)).toEqual(
|
|
expectedBorderRadius,
|
|
);
|
|
});
|
|
|
|
it("case: replaceRgbaMigrationConstant returns the new boxShadow by replacing default boxShadowColor with new boxShadowColor", () => {
|
|
const boxShadow = "0px 0px 4px 3px rgba(0, 0, 0, 0.25)";
|
|
const boxShadowColor = "red";
|
|
const expectedBoxShadow = "0px 0px 4px 3px red";
|
|
expect(replaceRgbaMigrationConstant(boxShadow, boxShadowColor)).toEqual(
|
|
expectedBoxShadow,
|
|
);
|
|
});
|
|
|
|
it("case: boxShadowUtility returns the new boxShadow", () => {
|
|
const variants = [
|
|
"VARIANT1",
|
|
"VARIANT2",
|
|
"VARIANT3",
|
|
"VARIANT4",
|
|
"VARIANT5",
|
|
];
|
|
let newBoxShadowColor = rgbaMigrationConstantV56;
|
|
let expectedBoxShadows = [
|
|
`0px 0px 4px 3px ${newBoxShadowColor}`,
|
|
`3px 3px 4px ${newBoxShadowColor}`,
|
|
`0px 1px 3px ${newBoxShadowColor}`,
|
|
`2px 2px 0px ${newBoxShadowColor}`,
|
|
`-2px -2px 0px ${newBoxShadowColor}`,
|
|
];
|
|
|
|
// Check the boxShadow when the boxShadowColor is set to default;
|
|
variants.forEach((value: string, index: number) => {
|
|
expect(boxShadowUtility(value, newBoxShadowColor)).toEqual(
|
|
expectedBoxShadows[index],
|
|
);
|
|
});
|
|
|
|
// Check the boxShadow when the boxShadowColor is set to custom color;
|
|
newBoxShadowColor = "red";
|
|
expectedBoxShadows = [
|
|
`0px 0px 4px 3px ${newBoxShadowColor}`,
|
|
`3px 3px 4px ${newBoxShadowColor}`,
|
|
`0px 1px 3px ${newBoxShadowColor}`,
|
|
`2px 2px 0px ${newBoxShadowColor}`,
|
|
`-2px -2px 0px ${newBoxShadowColor}`,
|
|
];
|
|
variants.forEach((value: string, index: number) => {
|
|
expect(boxShadowUtility(value, newBoxShadowColor)).toEqual(
|
|
expectedBoxShadows[index],
|
|
);
|
|
});
|
|
});
|
|
|
|
it("case: boxShadowMigration returns correct boxShadow whenever boxShadow and boxShadowColor ar dynamic", () => {
|
|
/**
|
|
* Function usd inside table widget cell properties for Icon and menu button types.
|
|
* This function is used to run theming migration boxShadow and boxShadowColor has dynamic bindings
|
|
* Function runs for the following scenarios, when:
|
|
* 1. boxShadow: Static; boxShadowColor: Dynamic
|
|
* 2. boxShadow: Dynamic; boxShadowColor: Static
|
|
* 3. boxShadow: Dynamic; boxShadowColor: empty
|
|
* 4. boxShadow: Dynamic; boxShadowColor: dynamic
|
|
*/
|
|
|
|
// Case 1:
|
|
expect(
|
|
boxShadowMigration(
|
|
tableWidgetProps.dynamicBindingPathList as any,
|
|
"action",
|
|
"0px 0px 4px 3px rgba(0, 0, 0, 0.25)",
|
|
"red",
|
|
),
|
|
).toEqual("0px 0px 4px 3px red");
|
|
|
|
// Case 2 & 3:
|
|
// Make boxShadow dynamic
|
|
/**
|
|
* 1. Add the boxShadow to the DBPL
|
|
* 2. Remove boxShadowColor from the DBPL
|
|
* 3. Assign the action.boxShadowcolor as a static value.
|
|
* 4. Assign the action.boxShadowcolor as a empty value.
|
|
*/
|
|
tableWidgetProps.dynamicBindingPathList.push({
|
|
key: "primaryColumns.action.boxShadow",
|
|
});
|
|
// Remove boxShadowColor from dynamicBindingPathList
|
|
remove(
|
|
tableWidgetProps.dynamicBindingPathList,
|
|
(value: { key: string }) =>
|
|
value.key === "primaryColumns.action.boxShadowColor",
|
|
);
|
|
// Assign values to boxShadow and boxShadowColor
|
|
tableWidgetProps.primaryColumns.action.boxShadow = "VARIANT1";
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor = "blue" as any;
|
|
let newBoxShadow = boxShadowMigration(
|
|
tableWidgetProps.dynamicBindingPathList as any,
|
|
"action",
|
|
tableWidgetProps.primaryColumns.action.boxShadow,
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor,
|
|
);
|
|
expect(newBoxShadow).toEqual("0px 0px 4px 3px blue");
|
|
|
|
tableWidgetProps.primaryColumns.action.boxShadow = "VARIANT1";
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor = "" as any; // Add empty boxShadowColor.
|
|
|
|
newBoxShadow = boxShadowMigration(
|
|
tableWidgetProps.dynamicBindingPathList as any,
|
|
"action",
|
|
tableWidgetProps.primaryColumns.action.boxShadow,
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor,
|
|
);
|
|
expect(newBoxShadow).toEqual("0px 0px 4px 3px rgba(0, 0, 0, 0.25)");
|
|
|
|
// Case 4:
|
|
// Add boxShadow and boxShadowColor to the dynamicBindingPathList
|
|
tableWidgetProps.dynamicBindingPathList = [
|
|
...tableWidgetProps.dynamicBindingPathList,
|
|
{
|
|
key: "primaryColumns.action.boxShadow",
|
|
},
|
|
{
|
|
key: "primaryColumns.action.boxShadowColor",
|
|
},
|
|
];
|
|
|
|
// Assign values to boxShadow and boxShadowColor
|
|
tableWidgetProps.primaryColumns.action.boxShadow = "VARIANT1";
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor = [
|
|
"orange",
|
|
"orange",
|
|
"orange",
|
|
];
|
|
newBoxShadow = boxShadowMigration(
|
|
tableWidgetProps.dynamicBindingPathList as any,
|
|
"action",
|
|
tableWidgetProps.primaryColumns.action.boxShadow,
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor[0],
|
|
);
|
|
expect(newBoxShadow).toEqual("0px 0px 4px 3px orange");
|
|
|
|
tableWidgetProps.primaryColumns.action.boxShadow = "VARIANT1";
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor = ["", "", ""] as any; // Add empty boxShadowColor when dynamic
|
|
|
|
// Add empty boxShadowColor.
|
|
newBoxShadow = boxShadowMigration(
|
|
tableWidgetProps.dynamicBindingPathList as any,
|
|
"action",
|
|
tableWidgetProps.primaryColumns.action.boxShadow,
|
|
tableWidgetProps.primaryColumns.action.boxShadowColor[0],
|
|
);
|
|
expect(newBoxShadow).toEqual("0px 0px 4px 3px rgba(0, 0, 0, 0.25)");
|
|
});
|
|
});
|