diff --git a/public-dashboard-client/src/controls/CohortSelect.js b/public-dashboard-client/src/controls/CohortSelect.js
index ed1efb6f..14294210 100644
--- a/public-dashboard-client/src/controls/CohortSelect.js
+++ b/public-dashboard-client/src/controls/CohortSelect.js
@@ -36,6 +36,12 @@ import {
const SELECT_ALL_ID = "ALL";
const DropdownWrapper = styled(DropdownWrapperBase)`
+ /*
+ increasing the z index so that following menu buttons
+ don't cover this up when they are stacked
+ */
+ z-index: ${(props) => props.theme.zIndex.control + 1};
+
${ControlValue} {
border: 0;
cursor: pointer;
@@ -226,7 +232,6 @@ function NativeSelect({ buttonContents, options, selected, setSelected }) {
setSelected(
options.filter((opt) => currentlySelectedIds.includes(opt.id))
);
- // toggleSelected(options.find((opt) => opt.id === event.target.value));
}}
value={selected.map((opt) => opt.id)}
>
diff --git a/public-dashboard-client/src/controls/DimensionControl.js b/public-dashboard-client/src/controls/DimensionControl.js
index 0feca549..489715d5 100644
--- a/public-dashboard-client/src/controls/DimensionControl.js
+++ b/public-dashboard-client/src/controls/DimensionControl.js
@@ -1,11 +1,33 @@
+// Recidiviz - a data platform for criminal justice reform
+// Copyright (C) 2020 Recidiviz, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+// =============================================================================
+
import React from "react";
import PropTypes from "prop-types";
import Dropdown from "./Dropdown";
import { DIMENSIONS_LIST } from "../constants";
-export default function DimensionControl({ onChange }) {
+export default function DimensionControl({ onChange, ...passThruProps }) {
return (
-
+
);
}
diff --git a/public-dashboard-client/src/controls/Dropdown.js b/public-dashboard-client/src/controls/Dropdown.js
index 8a4a0e20..220ecbaf 100644
--- a/public-dashboard-client/src/controls/Dropdown.js
+++ b/public-dashboard-client/src/controls/Dropdown.js
@@ -1,3 +1,20 @@
+// Recidiviz - a data platform for criminal justice reform
+// Copyright (C) 2020 Recidiviz, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+// =============================================================================
+
import { useId } from "@reach/auto-id";
import useBreakpoint from "@w11r/use-breakpoint";
import classNames from "classnames";
@@ -43,6 +60,7 @@ const DropdownMenu = styled(DropdownMenuBase)`
// in the absence of that it will be uncontrolled and expose the ID of
// its selected option via a listener
export default function Dropdown({
+ disabled,
highlighted,
label,
onChange,
@@ -78,6 +96,7 @@ export default function Dropdown({
// selecting something other than the default (first) option
// causes a highlight
highlighted || currentOptionId !== options[0].id,
+ "Dropdown--disabled": disabled,
})}
>
@@ -85,7 +104,7 @@ export default function Dropdown({
{!renderNativeSelect && (