Skip to content

A platform for community discussion. Free, open, simple.

UX: Polish the admin dashboard date range picker calendar (#40598)

Alan Guo Xiang Tan95268da67708
diff --git a/app/assets/stylesheets/common/components/date-range-picker.scss b/app/assets/stylesheets/common/components/date-range-picker.scss
index 3336542b4e6..8f2bb080959 100644
--- a/app/assets/stylesheets/common/components/date-range-picker.scss
+++ b/app/assets/stylesheets/common/components/date-range-picker.scss
@@ -1,10 +1,17 @@
@use "lib/viewport";
.d-date-range-picker {
+ --d-date-range-picker-nav-size: var(--space-10);
display: grid;
grid-template-columns: max-content 1fr;
background: var(--secondary);
min-width: 0;
+ box-sizing: border-box;
+
+ @include viewport.from(sm) {
+ width: 40rem;
+ max-width: 100vw;
+ }
@include viewport.until(sm) {
grid-template-columns: 1fr;
@@ -16,11 +23,10 @@
flex-direction: column;
padding: var(--space-2) 0;
border-right: 1px solid var(--primary-low);
- min-width: 8.75rem;
+ min-width: min-content;
@include viewport.until(sm) {
flex-direction: row;
- flex-wrap: nowrap;
gap: var(--space-1);
padding: var(--space-2) var(--space-4);
border-right: none;
@@ -43,7 +49,6 @@
}
&__preset {
- width: 100%;
text-align: left;
background: transparent;
border: 0;
@@ -59,12 +64,10 @@
&.is-active {
background: var(--tertiary-low);
- color: var(--tertiary);
- font-weight: 500;
+ font-weight: 700;
}
@include viewport.until(sm) {
- width: auto;
flex-shrink: 0;
border: 1px solid var(--primary-low);
border-radius: var(--space-1);
@@ -75,23 +78,20 @@
&__body {
display: flex;
flex-direction: column;
- padding: var(--space-3);
+ padding: var(--space-2);
min-width: 0;
}
- &__calendar {
- display: flex;
- align-items: flex-start;
- gap: var(--space-2);
- }
-
&__nav {
- background: transparent;
- border: 0;
- padding: var(--space-2);
- cursor: pointer;
- color: var(--primary-medium);
- border-radius: var(--space-1);
+ width: var(--d-date-range-picker-nav-size);
+
+ &.--prev {
+ grid-column: 1;
+ }
+
+ &.--next {
+ grid-column: 3;
+ }
&:hover {
background: var(--primary-low);
@@ -101,10 +101,8 @@
&__months {
display: flex;
- gap: var(--space-8);
- flex: 1;
+ gap: var(--space-4);
min-width: 0;
- align-items: stretch;
@include viewport.until(sm) {
gap: 0;
@@ -117,15 +115,25 @@
}
&__month-header {
- text-align: center;
+ display: grid;
+ grid-template-columns:
+ var(--d-date-range-picker-nav-size)
+ 1fr
+ var(--d-date-range-picker-nav-size);
+ align-items: center;
+ min-height: var(--d-date-range-picker-nav-size);
font-weight: 500;
- padding: var(--space-1) 0 var(--space-2);
+ padding-bottom: var(--space-2);
+ }
+
+ &__month-title {
+ grid-column: 2;
+ text-align: center;
}
&__weekdays {
display: grid;
grid-template-columns: repeat(7, minmax(0, 1fr));
- gap: 2px;
color: var(--primary-medium);
font-size: var(--font-down-2);
text-align: center;
@@ -135,24 +143,26 @@
&__grid {
display: flex;
flex-direction: column;
- gap: 2px;
+ gap: var(--space-1);
}
&__week {
display: grid;
grid-template-columns: repeat(7, minmax(0, 1fr));
- gap: 2px;
}
&__day {
background: transparent;
border: 0;
- padding: var(--space-1) 0;
- cursor: pointer;
+ padding: 0;
border-radius: var(--space-1);
- font: inherit;
color: var(--primary);
aspect-ratio: 1;
+ font-size: var(--font-down-2-rem);
+
+ @include viewport.until(sm) {
+ font-size: var(--font-down-1-rem);
+ }
&:hover:not(.--disabled) {
background: var(--tertiary-low);
@@ -161,23 +171,15 @@
&.--disabled {
color: var(--primary-low-mid);
cursor: not-allowed;
- background: transparent;
}
&.--in-range {
background: var(--tertiary-very-low, var(--tertiary-low));
- border-radius: 0;
}
- &.--hover-preview {
- background: repeating-linear-gradient(
- 45deg,
- var(--tertiary-very-low, var(--tertiary-low)),
- var(--tertiary-very-low, var(--tertiary-low)) 4px,
- var(--secondary) 4px,
- var(--secondary) 8px
- );
- border-radius: 0;
+ &.--hover-preview,
+ &.--hover-end {
+ background: var(--tertiary-low);
}
&.--start,
@@ -191,6 +193,28 @@
}
}
+ // range cells form a continuous strip, rounded only where the strip ends:
+ // at a cap, a row edge, or a month edge;
+ // :where keeps this reset below the corner rules' specificity
+ &:where(.--in-range, .--hover-preview, .--hover-end, .--start, .--end) {
+ border-radius: 0;
+ }
+
+ &.--start,
+ &.--month-start,
+ &:first-child {
+ border-start-start-radius: var(--space-1);
+ border-end-start-radius: var(--space-1);
+ }
+
+ &.--end,
+ &.--hover-end,
+ &.--month-end,
+ &:last-child {
+ border-start-end-radius: var(--space-1);
+ border-end-end-radius: var(--space-1);
+ }
+
&:focus-visible {
outline: 2px solid var(--tertiary);
outline-offset: -2px;
diff --git a/frontend/discourse/admin/components/dashboard/date-range-picker.gjs b/frontend/discourse/admin/components/dashboard/date-range-picker.gjs
index 88bdcab369b..5276d8e731f 100644
--- a/frontend/discourse/admin/components/dashboard/date-range-picker.gjs
+++ b/frontend/discourse/admin/components/dashboard/date-range-picker.gjs
@@ -5,9 +5,9 @@ import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { modifier } from "ember-modifier";
+import { eq } from "discourse/truth-helpers";
import DButton from "discourse/ui-kit/d-button";
import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
-import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
function toDayMoment(value) {
@@ -103,6 +103,10 @@ export default class DashboardDateRangePicker extends Component {
return months;
}
+ get lastMonthIndex() {
+ return this.visibleMonths.length - 1;
+ }
+
get effectiveFocusedDay() {
return (
this.focusedDay ?? toDayMoment(this.args.to) ?? moment().startOf("day")
@@ -114,21 +118,19 @@ export default class DashboardDateRangePicker extends Component {
}
get hoverRangeEnd() {
- if (this.committed || this.pendingEnd || !this.hoveredDay) {
+ if (
+ this.committed ||
+ this.pendingEnd ||
+ !this.hoveredDay ||
+ this.hoveredDay.isBefore(this.pendingStart, "day")
+ ) {
return null;
}
- return this.hoveredDay.isBefore(this.pendingStart, "day")
- ? this.pendingStart
- : this.hoveredDay;
+ return this.hoveredDay;
}
get hoverRangeStart() {
- if (this.committed || this.pendingEnd || !this.hoveredDay) {
- return null;
- }
- return this.hoveredDay.isBefore(this.pendingStart, "day")
- ? this.hoveredDay
- : this.pendingStart;
+ return this.hoverRangeEnd ? this.pendingStart : null;
}
@action
@@ -153,6 +155,16 @@ export default class DashboardDateRangePicker extends Component {
return !day.isSame(monthStart, "month");
}
+ @action
+ isMonthStartDay(day) {
+ return day.date() === 1;
+ }
+
+ @action
+ isMonthEndDay(day) {
+ return day.date() === day.daysInMonth();
+ }
+
@action
isDisabledDay(day) {
return day.isAfter(this.maxDate, "day");
@@ -190,6 +202,16 @@ export default class DashboardDateRangePicker extends Component {
);
}
+ @action
+ isHoverEndDay(day) {
+ return (
+ this.hoverRangeStart &&
+ this.hoverRangeEnd &&
+ day.isSame(this.hoverRangeEnd, "day") &&
+ day.isAfter(this.hoverRangeStart, "day")
+ );
+ }
+
@action
isFocusedDay(day) {
return day.isSame(this.effectiveFocusedDay, "day");
@@ -226,6 +248,15 @@ export default class DashboardDateRangePicker extends Component {
if (this.isHoverPreviewDay(day)) {
classes.push("--hover-preview");
}
+ if (this.isHoverEndDay(day)) {
+ classes.push("--hover-end");
+ }
+ if (this.isMonthStartDay(day)) {
+ classes.push("--month-start");
+ }
+ if (this.isMonthEndDay(day)) {
+ classes.push("--month-end");
+ }
return classes.join(" ");
}
@@ -455,20 +486,29 @@ export default class DashboardDateRangePicker extends Component {
class="d-date-range-picker__calendar"
{{on "mouseleave" this.leaveGrid}}
>
- <button
- type="button"
- class="d-date-range-picker__nav"
- aria-label={{i18n "dates.previous_month"}}
- {{on "click" (fn this.shiftMonth -1)}}
- >
- {{dIcon "chevron-left"}}
- </button>
-
<div class="d-date-range-picker__months">
- {{#each this.visibleMonths as |month|}}
+ {{#each this.visibleMonths as |month index|}}
<div class="d-date-range-picker__month">
<div class="d-date-range-picker__month-header">
- {{formatDate month "MMMM YYYY"}}
+ {{#if (eq index 0)}}
+ <DButton
+ class="btn-transparent d-date-range-picker__nav --prev"
+ @icon="chevron-left"
+ @ariaLabel="dates.previous_month"
+ @action={{fn this.shiftMonth -1}}
+ />
+ {{/if}}
+ <span class="d-date-range-picker__month-title">
+ {{formatDate month "MMMM YYYY"}}
+ </span>
+ {{#if (eq index this.lastMonthIndex)}}
+ <DButton
+ class="btn-transparent d-date-range-picker__nav --next"
+ @icon="chevron-right"
+ @ariaLabel="dates.next_month"
+ @action={{fn this.shiftMonth 1}}
+ />
+ {{/if}}
</div>
<div class="d-date-range-picker__weekdays" aria-hidden="true">
{{#each this.weekdayLabels as |dow|}}
@@ -512,15 +552,6 @@ export default class DashboardDateRangePicker extends Component {
</div>
{{/each}}
</div>
-
- <button
- type="button"
- class="d-date-range-picker__nav"
- aria-label={{i18n "dates.next_month"}}
- {{on "click" (fn this.shiftMonth 1)}}
- >
- {{dIcon "chevron-right"}}
- </button>
</div>
<div class="d-date-range-picker__inputs">
diff --git a/frontend/discourse/admin/components/dashboard/date-range.gjs b/frontend/discourse/admin/components/dashboard/date-range.gjs
index 2ba5232c9ea..3fc686fdb89 100644
--- a/frontend/discourse/admin/components/dashboard/date-range.gjs
+++ b/frontend/discourse/admin/components/dashboard/date-range.gjs
@@ -52,7 +52,7 @@ export default class DashboardDateRange extends Component {
@triggerClass="db-date-range__trigger"
@modalForMobile={{true}}
@placement="bottom-end"
- @maxWidth={{680}}
+ @maxWidth={{800}}
@contentClass="db-date-range__popover"
>
<:trigger>
diff --git a/frontend/discourse/tests/integration/components/dashboard/date-range-picker-test.gjs b/frontend/discourse/tests/integration/components/dashboard/date-range-picker-test.gjs
index a2b92f068fd..04851d3d78f 100644
--- a/frontend/discourse/tests/integration/components/dashboard/date-range-picker-test.gjs
+++ b/frontend/discourse/tests/integration/components/dashboard/date-range-picker-test.gjs
@@ -17,7 +17,7 @@ function dayButton(dateString) {
function monthHeaders() {
return [
- ...document.querySelectorAll(".d-date-range-picker__month-header"),
+ ...document.querySelectorAll(".d-date-range-picker__month-title"),
].map((el) => el.textContent.trim());
}