@khanacademy/wonder-blocks-dropdown 2.5.1 → 2.6.2

package/dist/index.js

@@ -506,6 +506,7 @@ class ActionItem extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
       target,
       indent,
       label,
+      lang,
       onClick,
       role,
       style,
@@ -534,6 +535,7 @@ class ActionItem extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
         ...childrenProps
       };
       const children = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_khanacademy_wonder_blocks_typography__WEBPACK_IMPORTED_MODULE_6__["LabelMedium"], {
+        lang: lang,
         style: [indent && styles.indent, styles.label]
       }, label));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-dropdown",
-  "version": "2.5.1",
+  "version": "2.6.2",
   "design": "v1",
   "description": "Dropdown variants for Wonder Blocks.",
   "main": "dist/index.js",
@@ -15,18 +15,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.10",
-    "@khanacademy/wonder-blocks-button": "^2.10.1",
-    "@khanacademy/wonder-blocks-clickable": "^2.2.0",
-    "@khanacademy/wonder-blocks-color": "^1.1.19",
-    "@khanacademy/wonder-blocks-core": "^3.2.0",
-    "@khanacademy/wonder-blocks-icon": "^1.2.23",
-    "@khanacademy/wonder-blocks-icon-button": "^3.4.0",
-    "@khanacademy/wonder-blocks-layout": "^1.4.5",
-    "@khanacademy/wonder-blocks-modal": "^2.1.44",
-    "@khanacademy/wonder-blocks-spacing": "^3.0.4",
-    "@khanacademy/wonder-blocks-timing": "^2.0.2",
-    "@khanacademy/wonder-blocks-typography": "^1.1.27"
+    "@babel/runtime": "^7.16.3",
+    "@khanacademy/wonder-blocks-button": "^2.11.2",
+    "@khanacademy/wonder-blocks-clickable": "^2.2.3",
+    "@khanacademy/wonder-blocks-color": "^1.1.20",
+    "@khanacademy/wonder-blocks-core": "^4.2.1",
+    "@khanacademy/wonder-blocks-icon": "^1.2.25",
+    "@khanacademy/wonder-blocks-icon-button": "^3.4.3",
+    "@khanacademy/wonder-blocks-layout": "^1.4.7",
+    "@khanacademy/wonder-blocks-modal": "^2.2.1",
+    "@khanacademy/wonder-blocks-spacing": "^3.0.5",
+    "@khanacademy/wonder-blocks-timing": "^2.1.0",
+    "@khanacademy/wonder-blocks-typography": "^1.1.29"
   },
   "peerDependencies": {
     "@popperjs/core": "^2.10.1",
@@ -39,7 +39,6 @@
     "react-window": "^1.8.5"
   },
   "devDependencies": {
-    "wb-dev-build-settings": "^0.1.2"
-  },
-  "gitHead": "61090a61b6e9d2a735976d5fd53a15d06f10c853"
+    "wb-dev-build-settings": "^0.3.0"
+  }
 }

package/src/__tests__/__snapshots__/generated-snapshot.test.js.snap

@@ -651,7 +651,7 @@ exports[`wonder-blocks-dropdown example 4 1`] = `
           "touchAction": "manipulation",
         }
       }
-      tabIndex={-1}
+      tabIndex={0}
       type="button"
     >
       <div
@@ -1134,8 +1134,8 @@ exports[`wonder-blocks-dropdown example 6 1`] = `
     }
   />
   <button
+    aria-disabled={false}
     className=""
-    disabled={false}
     onBlur={[Function]}
     onClick={[Function]}
     onDragStart={[Function]}
@@ -1627,7 +1627,7 @@ exports[`wonder-blocks-dropdown example 10 1`] = `
           "whiteSpace": "nowrap",
         }
       }
-      tabIndex={-1}
+      tabIndex={0}
       type="button"
     >
       <span
@@ -1926,7 +1926,7 @@ exports[`wonder-blocks-dropdown example 12 1`] = `
           "whiteSpace": "nowrap",
         }
       }
-      tabIndex={-1}
+      tabIndex={0}
       type="button"
     >
       <span
@@ -2292,8 +2292,8 @@ exports[`wonder-blocks-dropdown example 14 1`] = `
     }
   />
   <button
+    aria-disabled={false}
     className=""
-    disabled={false}
     onBlur={[Function]}
     onClick={[Function]}
     onDragStart={[Function]}
@@ -2998,8 +2998,8 @@ exports[`wonder-blocks-dropdown example 20 1`] = `
   }
 >
   <button
+    aria-disabled={false}
     className=""
-    disabled={false}
     onBlur={[Function]}
     onClick={[Function]}
     onDragStart={[Function]}
@@ -3159,7 +3159,7 @@ exports[`wonder-blocks-dropdown example 21 1`] = `
           "whiteSpace": "nowrap",
         }
       }
-      tabIndex={-1}
+      tabIndex={0}
       type="button"
     >
       <span
@@ -3661,8 +3661,8 @@ exports[`wonder-blocks-dropdown example 24 1`] = `
     }
   />
   <button
+    aria-disabled={false}
     className=""
-    disabled={false}
     onBlur={[Function]}
     onClick={[Function]}
     onDragStart={[Function]}

package/src/components/__tests__/action-item.test.js

@@ -1,32 +1,54 @@
+// @flow
 import * as React from "react";
-import renderer from "react-test-renderer";
 import {MemoryRouter, Link} from "react-router-dom";
 import {mount} from "enzyme";
+import {render, screen} from "@testing-library/react";
 
 import ActionItem from "../action-item.js";
 
 describe("ActionItem", () => {
     it("should render with disabled styles", () => {
-        const actionItem = renderer.create(
-            <ActionItem href="/foo" disabled={true} />,
-        );
+        // Arrange
+
+        // Act
+        render(<ActionItem href="/foo" label="Example" disabled={true} />);
 
-        expect(actionItem).toMatchSnapshot();
+        // Assert
+        expect(screen.getByRole("menuitem")).toBeDisabled();
     });
 
     it("should render an anchor if there's no router", () => {
-        const wrapper = mount(<ActionItem href="/foo" />);
+        // Arrange
 
-        expect(wrapper.find("a")).toHaveLength(1);
+        // Act
+        render(<ActionItem href="/foo" label="Example" />);
+
+        // Assert
+        // eslint-disable-next-line testing-library/no-node-access
+        expect(document.querySelectorAll("a")).toHaveLength(1);
     });
 
     it("should render a Link if there's a router", () => {
+        // Arrange
+
+        // Act
         const wrapper = mount(
             <MemoryRouter>
-                <ActionItem href="/foo" />
+                <ActionItem href="/foo" label="Example" />
             </MemoryRouter>,
         );
 
+        // Assert
         expect(wrapper.find(Link)).toHaveLength(1);
     });
+
+    it("should set the lang attribute if it's passed down", () => {
+        // Arrange
+
+        // Act
+        render(<ActionItem label="Español" lang="es" />);
+
+        // Assert
+        expect(screen.getByText("Español")).toHaveAttribute("lang", "es");
+    });
 });

package/src/components/__tests__/action-menu.test.js

@@ -1,6 +1,7 @@
 //@flow
 import * as React from "react";
 import {mount} from "enzyme";
+import "jest-enzyme";
 
 import ActionItem from "../action-item.js";
 import OptionItem from "../option-item.js";

package/src/components/__tests__/dropdown-core-virtualized.test.js

@@ -2,12 +2,15 @@
 import * as React from "react";
 import {VariableSizeList as List} from "react-window";
 import {mount} from "enzyme";
+import "jest-enzyme";
 
 import OptionItem from "../option-item.js";
 import SeparatorItem from "../separator-item.js";
 import DropdownCoreVirtualized from "../dropdown-core-virtualized.js";
 import SearchTextInput from "../search-text-input.js";
 
+import {unmountAll} from "../../../../../utils/testing/enzyme-shim.js";
+
 describe("DropdownCoreVirtualized", () => {
     beforeEach(() => {
         jest.useFakeTimers();
@@ -24,6 +27,12 @@ describe("DropdownCoreVirtualized", () => {
     });
 
     afterEach(() => {
+        // We have to explicitly unmount before clearing mocks, otherwise jest
+        // timers will throw because we'll try to clear an animation frame that
+        // we set with a setTimeout but are clearing with clearAnimationFrame
+        // because we restored the clearAnimationFrame mock (and we won't
+        // have cleared the timeout we actually set!)
+        unmountAll();
         jest.restoreAllMocks();
     });
 

package/src/components/__tests__/dropdown-core.test.js

@@ -2,12 +2,15 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 import {mount} from "enzyme";
+import "jest-enzyme";
 
 import OptionItem from "../option-item.js";
 import SearchTextInput from "../search-text-input.js";
 import DropdownCore from "../dropdown-core.js";
 import {keyCodes} from "../../util/constants.js";
 
+import {unmountAll} from "../../../../../utils/testing/enzyme-shim.js";
+
 jest.mock("../dropdown-core-virtualized.js");
 
 const elementAtIndex = (wrapper, index) =>
@@ -87,6 +90,12 @@ describe("DropdownCore", () => {
     });
 
     afterEach(() => {
+        // We have to explicitly unmount before clearing mocks, otherwise jest
+        // timers will throw because we'll try to clear an animation frame that
+        // we set with a setTimeout but are clearing with clearAnimationFrame
+        // because we restored the clearAnimationFrame mock (and we won't
+        // have cleared the timeout we actually set!)
+        unmountAll();
         jest.restoreAllMocks();
     });
 

package/src/components/__tests__/multi-select.test.js

@@ -2,6 +2,7 @@
 //@flow
 import * as React from "react";
 import {mount} from "enzyme";
+import "jest-enzyme";
 
 import {ClickableBehavior} from "@khanacademy/wonder-blocks-clickable";
 import IconButton from "@khanacademy/wonder-blocks-icon-button";
@@ -14,6 +15,8 @@ import MultiSelect from "../multi-select.js";
 import {keyCodes} from "../../util/constants.js";
 import SearchTextInput from "../search-text-input.js";
 
+import {unmountAll} from "../../../../../utils/testing/enzyme-shim.js";
+
 import type {Labels} from "../multi-select.js";
 
 jest.useFakeTimers();
@@ -68,6 +71,12 @@ describe("MultiSelect", () => {
     });
 
     afterEach(() => {
+        // We have to explicitly unmount before clearing mocks, otherwise jest
+        // timers will throw because we'll try to clear an animation frame that
+        // we set with a setTimeout but are clearing with clearAnimationFrame
+        // because we restored the clearAnimationFrame mock (and we won't
+        // have cleared the timeout we actually set!)
+        unmountAll();
         jest.restoreAllMocks();
     });
 

package/src/components/__tests__/search-text-input.test.js

@@ -1,6 +1,7 @@
 // @flow
 import * as React from "react";
 import {shallow} from "enzyme";
+import "jest-enzyme";
 
 import SearchTextInput from "../search-text-input.js";
 

package/src/components/__tests__/single-select.test.js

@@ -1,8 +1,6 @@
 //@flow
 import * as React from "react";
 import {render, screen} from "@testing-library/react";
-// eslint-disable-next-line import/no-unassigned-import
-import "@testing-library/jest-dom/extend-expect";
 
 import OptionItem from "../option-item.js";
 import SingleSelect from "../single-select.js";
@@ -25,8 +23,7 @@ describe("SingleSelect", () => {
     afterEach(() => {
         window.scrollTo.mockClear();
         onChange.mockReset();
-        // $FlowIgnore[prop-missing]: Flow doesn't understand that we're mocking console.error
-        console.error.mockReset(); // eslint-disable-line no-console
+        jest.spyOn(console, "error").mockReset();
     });
 
     afterEach(() => {
@@ -52,7 +49,7 @@ describe("SingleSelect", () => {
                 userEvent.click(opener);
 
                 // Assert
-                expect(screen.queryByRole("listbox")).toBeInTheDocument();
+                expect(screen.getByRole("listbox")).toBeInTheDocument();
             });
 
             it("should focus the first item in the dropdown", () => {
@@ -121,9 +118,7 @@ describe("SingleSelect", () => {
                         userEvent.keyboard(key);
 
                         // Assert
-                        expect(
-                            screen.queryByRole("listbox"),
-                        ).toBeInTheDocument();
+                        expect(screen.getByRole("listbox")).toBeInTheDocument();
                     });
 
                     it("should focus the first item in the dropdown", () => {
@@ -152,7 +147,7 @@ describe("SingleSelect", () => {
 
                 // Assert
                 expect(onChange).not.toHaveBeenCalled();
-                expect(screen.queryByRole("listbox")).toBeInTheDocument();
+                expect(screen.getByRole("listbox")).toBeInTheDocument();
             });
 
             it("should select an item when pressing {space}", () => {
@@ -278,7 +273,7 @@ describe("SingleSelect", () => {
             userEvent.click(screen.getByText("Choose"));
 
             // Assert
-            expect(screen.queryByRole("listbox")).toBeInTheDocument();
+            expect(screen.getByRole("listbox")).toBeInTheDocument();
         });
 
         it("closes the menu when the anchor is clicked", () => {
@@ -321,7 +316,7 @@ describe("SingleSelect", () => {
             userEvent.click(opener);
 
             // Assert
-            expect(screen.queryByRole("listbox")).toBeInTheDocument();
+            expect(screen.getByRole("listbox")).toBeInTheDocument();
         });
 
         it("calls the custom onClick handler", () => {

package/src/components/action-item.js

@@ -38,6 +38,12 @@ type ActionProps = {|
      */
     href?: string,
 
+    /**
+     * Optional attribute to indicate to the Screen Reader which language the
+     * item text is in.
+     */
+    lang?: string,
+
     /**
      * A target destination window for a link to open in.
      */
@@ -131,6 +137,7 @@ export default class ActionItem extends React.Component<ActionProps> {
             target,
             indent,
             label,
+            lang,
             onClick,
             role,
             style,
@@ -176,6 +183,7 @@ export default class ActionItem extends React.Component<ActionProps> {
                     const children = (
                         <React.Fragment>
                             <LabelMedium
+                                lang={lang}
                                 style={[indent && styles.indent, styles.label]}
                             >
                                 {label}

package/src/components/action-menu.stories.js

@@ -0,0 +1,48 @@
+// @flow
+import * as React from "react";
+
+import type {StoryComponentType} from "@storybook/react";
+import ActionMenu from "./action-menu.js";
+import ActionItem from "./action-item.js";
+
+export default {
+    title: "Dropdown / ActionMenu",
+    component: ActionMenu,
+};
+
+export const ActionMenuWithLang: StoryComponentType = () => (
+    <ActionMenu menuText="Locales">
+        {locales.map((locale) => (
+            <ActionItem
+                key={locale.locale}
+                label={locale.localName}
+                lang={locale.locale}
+                testId={"language_picker_" + locale.locale}
+            />
+        ))}
+    </ActionMenu>
+);
+
+ActionMenuWithLang.storyName = "Using the ActionMenu with the lang attribute";
+
+ActionMenuWithLang.parameters = {
+    docs: {
+        storyDescription:
+            "You can use the `lang` attribute to specify the language of the action item(s). This is useful if you want to avoid issues with Screen Readers trying to read the proper language for the rendered text.",
+    },
+    chromatic: {
+        disableSnapshot: true,
+    },
+};
+
+const locales = [
+    {id: "az", locale: "az", localName: "Azərbaycanca"},
+    {id: "id", locale: "id", localName: "Bahasa Indonesia"},
+    {id: "cs", locale: "cs", localName: "čeština"},
+    {id: "da", locale: "da", localName: "dansk"},
+    {id: "de", locale: "de", localName: "Deutsch"},
+    {id: "en", locale: "en", localName: "English"},
+    {id: "es", locale: "es", localName: "español"},
+    {id: "fr", locale: "fr", localName: "français"},
+    {id: "it", locale: "it", localName: "italiano"},
+];

package/src/components/checkbox.js

@@ -14,8 +14,7 @@ import type {IconAsset} from "@khanacademy/wonder-blocks-icon";
 // If the intended icon is a check without a checkbox, you should be using
 // icons.check from the Wonder Blocks Icon package.
 const checkboxCheck: IconAsset = {
-    small:
-        "M11.263 4.324a1 1 0 1 1 1.474 1.352l-5.5 6a1 1 0 0 1-1.505-.036l-2.5-3a1 1 0 1 1 1.536-1.28L6.536 9.48l4.727-5.157z",
+    small: "M11.263 4.324a1 1 0 1 1 1.474 1.352l-5.5 6a1 1 0 0 1-1.505-.036l-2.5-3a1 1 0 1 1 1.536-1.28L6.536 9.48l4.727-5.157z",
 };
 const {blue, white, offBlack16, offBlack32, offBlack50, offWhite} = Color;
 

package/src/components/dropdown-core.js

@@ -522,9 +522,8 @@ class DropdownCore extends React.Component<Props, State> {
         // appropriate item in handleKeyDown
         this.itemsClicked = true;
         this.focusedIndex = index;
-        this.focusedOriginalIndex = this.state.itemRefs[
-            this.focusedIndex
-        ].originalIndex;
+        this.focusedOriginalIndex =
+            this.state.itemRefs[this.focusedIndex].originalIndex;
     };
 
     handleDropdownMouseUp: (event: SyntheticMouseEvent<>) => void = (event) => {

package/src/components/multi-select.stories.js

@@ -79,18 +79,18 @@ class MultiSelectWithCustomStyles extends React.Component<Props, State> {
     }
 }
 
-export const customStyles: StoryComponentType = () => (
+export const CustomStyles: StoryComponentType = () => (
     <MultiSelectWithCustomStyles />
 );
 
-customStyles.parameters = {
+CustomStyles.parameters = {
     chromatic: {
         // we don't need screenshots because this story only tests behavior.
         disableSnapshot: true,
     },
 };
 
-export const customStylesOpened: StoryComponentType = () => (
+export const CustomStylesOpened: StoryComponentType = () => (
     <MultiSelectWithCustomStyles opened={true} />
 );
 

package/src/components/select-opener.js

@@ -16,15 +16,8 @@ import {DROPDOWN_ITEM_HEIGHT} from "../util/constants.js";
 
 const StyledButton = addStyle("button");
 
-const {
-    blue,
-    white,
-    white50,
-    offBlack,
-    offBlack16,
-    offBlack32,
-    offBlack64,
-} = Color;
+const {blue, white, white50, offBlack, offBlack16, offBlack32, offBlack64} =
+    Color;
 
 type SelectOpenerProps = {|
     ...AriaProps,

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Khan Academy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/src/components/__tests__/__snapshots__/action-item.test.js.snap

@@ -1,63 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ActionItem should render with disabled styles 1`] = `
-<button
-  className=""
-  disabled={true}
-  onBlur={[Function]}
-  onClick={[Function]}
-  onDragStart={[Function]}
-  onFocus={[Function]}
-  onKeyDown={[Function]}
-  onKeyUp={[Function]}
-  onMouseDown={[Function]}
-  onMouseEnter={[Function]}
-  onMouseLeave={[Function]}
-  onMouseUp={[Function]}
-  onTouchCancel={[Function]}
-  onTouchEnd={[Function]}
-  onTouchStart={[Function]}
-  role="menuitem"
-  style={
-    Object {
-      "::MozFocusInner": Object {
-        "border": 0,
-      },
-      "alignItems": "center",
-      "background": "#ffffff",
-      "border": "none",
-      "color": "rgba(33,36,44,0.32)",
-      "cursor": "default",
-      "display": "flex",
-      "flexDirection": "row",
-      "height": 40,
-      "margin": 0,
-      "minHeight": 40,
-      "outline": "none",
-      "paddingLeft": 16,
-      "paddingRight": 16,
-      "textDecoration": "none",
-      "touchAction": "manipulation",
-    }
-  }
-  tabIndex={-1}
-  type="button"
->
-  <span
-    className=""
-    style={
-      Object {
-        "MozOsxFontSmoothing": "grayscale",
-        "WebkitFontSmoothing": "antialiased",
-        "display": "block",
-        "fontFamily": "Lato, \\"Noto Sans\\", sans-serif",
-        "fontSize": 16,
-        "fontWeight": 400,
-        "lineHeight": "20px",
-        "userSelect": "none",
-        "whiteSpace": "nowrap",
-      }
-    }
-  />
-</button>
-`;