dce-reactkit 3.6.10 → 3.6.12

package/dist/esm/types/components/MultiSwitch.d.ts

@@ -2,6 +2,7 @@
  * A switch with multiple options for selection
  * @author Alessandra De Lucas
  * @author Gabe Abrams
+ * @author Austen Money
  */
 import React from 'react';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';

package/dist/esm/types/helpers/combineClassNames.d.ts

@@ -1,8 +1,9 @@
 /**
  * Merges a list of class names into a class name, intelligently handling spaces
  * @author Gabe Abrams
- * @param classNames the list of class names to merge
+ * @param classNames the list of class names to merge (or falsey values to
+ *   ignore)
  * @returns the merged class name
  */
-declare const combineClassNames: (classNames: string[]) => string;
+declare const combineClassNames: (classNames: (string | undefined | null | false)[]) => string;
 export default combineClassNames;

package/dist/index.d.ts

@@ -642,6 +642,7 @@ declare const AutoscrollToBottomContainer: React.FC<Props$1>;
  * A switch with multiple options for selection
  * @author Alessandra De Lucas
  * @author Gabe Abrams
+ * @author Austen Money
  */
 
 type Props = {
@@ -1419,10 +1420,11 @@ declare const makeLinksClickable: (text: string, opts?: {
 /**
  * Merges a list of class names into a class name, intelligently handling spaces
  * @author Gabe Abrams
- * @param classNames the list of class names to merge
+ * @param classNames the list of class names to merge (or falsey values to
+ *   ignore)
  * @returns the merged class name
  */
-declare const combineClassNames: (classNames: string[]) => string;
+declare const combineClassNames: (classNames: (string | undefined | null | false)[]) => string;
 
 /**
  * List of error codes built into the react kit

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "3.6.10",
+  "version": "3.6.12",
   "description": "Shared components for Harvard DCE apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -27,13 +27,13 @@
     "react-select": "^5.7.3"
   },
   "peerDependencies": {
+    "@fortawesome/fontawesome-svg-core": "^x.x.x",
     "@fortawesome/free-regular-svg-icons": "^x.x.x",
     "@fortawesome/free-solid-svg-icons": "^x.x.x",
-    "@fortawesome/fontawesome-svg-core": "^x.x.x",
     "@fortawesome/react-fontawesome": "^x.x.x",
     "bootstrap": "^5.x.x",
-    "react": "^x.x.x",
-    "express": "^x.x.x"
+    "express": "^x.x.x",
+    "react": "^x.x.x"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.0",
@@ -55,7 +55,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.3",
     "jest-environment-jsdom": "^28.1.3",
-    "raixa": "^1.0.19",
+    "raixa": "^1.0.21",
     "rollup": "^2.70.2",
     "rollup-plugin-dts": "^4.2.1",
     "rollup-plugin-sourcemaps": "^0.6.3",

package/src/components/MultiSwitch.tsx

@@ -2,6 +2,7 @@
  * A switch with multiple options for selection
  * @author Alessandra De Lucas
  * @author Gabe Abrams
+ * @author Austen Money
  */
 
 // Import React
@@ -11,6 +12,10 @@ import React, { useReducer } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 
+// Import shared helpers
+import idify from '../helpers/idify';
+import combineClassNames from '../helpers/combineClassNames';
+
 /*------------------------------------------------------------------------*/
 /* -------------------------------- Types ------------------------------- */
 /*------------------------------------------------------------------------*/
@@ -253,12 +258,21 @@ const MultiSwitch: React.FC<Props> = (props) => {
   /*----------------------------------------*/
 
   const optionElements = options.map((option) => {
+    const isSelected = (option.id === selectedOptionId);
+    const isHovered = (option.id === hoveredOptionId);
+
     return (
       <button
         type="button"
-        className={`MultiSwitch-option-button${option.id === hoveredOptionId ? ' MultiSwitch-option-button-hovered' : ''}`}
+        key={option.id}
+        className={combineClassNames([
+          'MultiSwitch-option-button',
+          (isHovered ? 'MultiSwitch-option-button-hovered' : ''),
+          `MultiSwitch-option-button-with-id-${idify(option.id)}`,
+          `MultiSwitch-option-button-is${isSelected ? '' : '-not'}-selected`,
+        ])}
         aria-label={(
-          option.id === selectedOptionId
+          isSelected
             ? `option "${option.label}", currently selected`
             : `click to select option "${option.label}"`
         )}

package/src/helpers/combineClassNames.ts

@@ -1,12 +1,17 @@
 /**
  * Merges a list of class names into a class name, intelligently handling spaces
  * @author Gabe Abrams
- * @param classNames the list of class names to merge
+ * @param classNames the list of class names to merge (or falsey values to
+ *   ignore)
  * @returns the merged class name
  */
-const combineClassNames = (classNames: string[]): string => {
+const combineClassNames = (classNames: (string | undefined | null | false)[]): string => {
   return (
     classNames
+      // Turn falsey values into empty strings
+      .map((className) => {
+        return className || '';
+      })
       // Trim whitespace
       .map((className) => {
         return className.trim();