Skip to content

Commit

Permalink
WCMS-0000: Fix dropdown and datepicker bugs (#165)
Browse files Browse the repository at this point in the history
  • Loading branch information
brdunfield authored Feb 7, 2024
1 parent 5868bad commit 1b07378
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@civicactions/cmsds-open-data-components",
"version": "2.3.0",
"version": "2.3.1",
"description": "Components for the open data catalog frontend using CMS Design System",
"main": "dist/main.js",
"source": "src/index.ts",
Expand Down
5 changes: 2 additions & 3 deletions src/templates/FilteredResource/QueryRow.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React, { useState, useEffect } from 'react';
import DatePicker from 'react-datepicker';
import { useMediaQuery } from 'react-responsive';
import { Accordion, AccordionItem, Button, Dropdown, TextField } from '@cmsgov/design-system';
import { Button, Dropdown, TextField } from '@cmsgov/design-system';
import { buildOperatorOptions, convertUTCToLocalDate, cleanText } from './functions';
import 'react-datepicker/dist/react-datepicker.css';
import CloseIcon from '../../assets/icons/close';

function getStartDate(condition, schema, id) {
if (schema[id].fields[condition.property].mysql_type === 'date') {
Expand Down Expand Up @@ -78,7 +77,7 @@ const QueryRow = ({ id, condition, index, update, remove, propertyOptions, schem
/>
</div>
{schema[id].fields[property].mysql_type === 'date' ? (
<div className="ds-l-md-col--5 ds-l-lg-col--4 ds-l-sm-col--8 ds-l-col--12 ds-u-padding--0 ds-u-sm-padding-right--2 ds-u-md-padding-right--0 ds-u-lg-padding-right--2">
<div className="ds-l-md-col--5 ds-l-lg-col--4 ds-l-sm-col--8 ds-l-col--12 ds-u-padding--0 ds-u-sm-padding-right--2 ds-u-md-padding-right--0 ds-u-lg-padding-right--2 ds-u-margin-bottom--2">
<label
className="ds-c-label"
htmlFor={`${condition.key}_date_value`}
Expand Down
3 changes: 3 additions & 0 deletions src/templates/FilteredResource/query-builder.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.dc-query-builder > .ds-c-accordion > .ds-c-accordion__content {
overflow: visible;
}
.dc-query-builder .react-datepicker select {
background-image: none;
}

0 comments on commit 1b07378

Please sign in to comment.