@@ -636,18 +636,6 @@ export function TimeDropdown({
636636 setSelectedQuickDate ( "thisWeek" ) ;
637637 } }
638638 />
639- < QuickDateButton
640- label = "Last week"
641- isActive = { selectedQuickDate === "lastWeek" }
642- onClick = { ( ) => {
643- const lastWeek = subWeeks ( new Date ( ) , 1 ) ;
644- setFromValue ( startOfWeek ( lastWeek , { weekStartsOn : 1 } ) ) ;
645- setToValue ( endOfWeek ( lastWeek , { weekStartsOn : 1 } ) ) ;
646- setActiveSection ( "dateRange" ) ;
647- setValidationError ( null ) ;
648- setSelectedQuickDate ( "lastWeek" ) ;
649- } }
650- />
651639 < QuickDateButton
652640 label = "Last weekend"
653641 isActive = { selectedQuickDate === "lastWeekend" }
@@ -669,6 +657,18 @@ export function TimeDropdown({
669657 setSelectedQuickDate ( "lastWeekend" ) ;
670658 } }
671659 />
660+ < QuickDateButton
661+ label = "Last week"
662+ isActive = { selectedQuickDate === "lastWeek" }
663+ onClick = { ( ) => {
664+ const lastWeek = subWeeks ( new Date ( ) , 1 ) ;
665+ setFromValue ( startOfWeek ( lastWeek , { weekStartsOn : 1 } ) ) ;
666+ setToValue ( endOfWeek ( lastWeek , { weekStartsOn : 1 } ) ) ;
667+ setActiveSection ( "dateRange" ) ;
668+ setValidationError ( null ) ;
669+ setSelectedQuickDate ( "lastWeek" ) ;
670+ } }
671+ />
672672 < QuickDateButton
673673 label = "Last weekdays"
674674 isActive = { selectedQuickDate === "lastWeekdays" }
@@ -683,18 +683,6 @@ export function TimeDropdown({
683683 setSelectedQuickDate ( "lastWeekdays" ) ;
684684 } }
685685 />
686- < QuickDateButton
687- label = "This month"
688- isActive = { selectedQuickDate === "thisMonth" }
689- onClick = { ( ) => {
690- const now = new Date ( ) ;
691- setFromValue ( startOfMonth ( now ) ) ;
692- setToValue ( now ) ;
693- setActiveSection ( "dateRange" ) ;
694- setValidationError ( null ) ;
695- setSelectedQuickDate ( "thisMonth" ) ;
696- } }
697- />
698686 < QuickDateButton
699687 label = "Last month"
700688 isActive = { selectedQuickDate === "lastMonth" }
@@ -707,6 +695,18 @@ export function TimeDropdown({
707695 setSelectedQuickDate ( "lastMonth" ) ;
708696 } }
709697 />
698+ < QuickDateButton
699+ label = "This month"
700+ isActive = { selectedQuickDate === "thisMonth" }
701+ onClick = { ( ) => {
702+ const now = new Date ( ) ;
703+ setFromValue ( startOfMonth ( now ) ) ;
704+ setToValue ( now ) ;
705+ setActiveSection ( "dateRange" ) ;
706+ setValidationError ( null ) ;
707+ setSelectedQuickDate ( "thisMonth" ) ;
708+ } }
709+ />
710710 < QuickDateButton
711711 label = "Year to date"
712712 isActive = { selectedQuickDate === "yearToDate" }
0 commit comments