feat: Make color ARIA labels better (#3871)

* Make color aria labels better

* Use isTransparent helper

* Fix import

* Try to fix test

* More test fixes

* Reuse variable
This commit is contained in:
Thomas Steiner 2021-08-02 20:18:55 +02:00 committed by GitHub
parent d607249205
commit 621812d0eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 92 additions and 37 deletions

View file

@ -19,6 +19,7 @@ import { ShortcutName } from "../actions/shortcuts";
import { copiedStyles } from "../actions/actionStyles";
import { API } from "./helpers/api";
import { setDateTimeForTests } from "../utils";
import { t } from "../i18n";
const checkpoint = (name: string) => {
expect(renderScene.mock.calls.length).toMatchSnapshot(
@ -314,9 +315,9 @@ describe("contextMenu element", () => {
// Change some styles of second rectangle
clickLabeledElement("Stroke");
clickLabeledElement("#c92a2a");
clickLabeledElement(t("colors.c92a2a"));
clickLabeledElement("Background");
clickLabeledElement("#e64980");
clickLabeledElement(t("colors.e64980"));
// Fill style
fireEvent.click(screen.getByTitle("Cross-hatch"));
// Stroke width

View file

@ -16,6 +16,7 @@ import {
} from "./test-utils";
import { defaultLang } from "../i18n";
import { FONT_FAMILY } from "../constants";
import { t } from "../i18n";
const { h } = window;
@ -168,9 +169,9 @@ describe("regression tests", () => {
mouse.up(10, 10);
clickLabeledElement("Background");
clickLabeledElement("#fa5252");
clickLabeledElement(t("colors.fa5252"));
clickLabeledElement("Stroke");
clickLabeledElement("#5f3dc4");
clickLabeledElement(t("colors.5f3dc4"));
expect(API.getSelectedElement().backgroundColor).toBe("#fa5252");
expect(API.getSelectedElement().strokeColor).toBe("#5f3dc4");
});
@ -939,7 +940,7 @@ describe("regression tests", () => {
// change background color since default is transparent
// and transparent elements can't be selected by clicking inside of them
clickLabeledElement("Background");
clickLabeledElement("#fa5252");
clickLabeledElement(t("colors.fa5252"));
mouse.down();
mouse.up(1000, 1000);
@ -1046,7 +1047,7 @@ describe("regression tests", () => {
expect(screen.queryByText(/fill/i)).toBeNull();
clickLabeledElement("Background");
clickLabeledElement("#fa5252");
clickLabeledElement(t("colors.fa5252"));
// select rectangle
mouse.reset();
mouse.click();