@dereekb/dbx-form 9.24.43 → 9.24.45

package/fesm2020/dereekb-dbx-form.mjs

@@ -9,7 +9,7 @@ import * as i2 from '@dereekb/dbx-core';
 import { AbstractSubscriptionDirective, safeDetectChanges, DbxInjectionComponentModule, DbxDatePipeModule, mergeDbxInjectionComponentConfigs, tapDetectChanges, DbxValuePipeModule } from '@dereekb/dbx-core';
 import * as i2$1 from '@dereekb/dbx-web';
 import { DbxActionTransitionSafetyDirective, DbxTextModule, DbxLoadingModule, DbxFlexLayoutModule, DbxSectionLayoutModule, DbxRouterAnchorModule, dbxValueListItemDecisionFunction, DbxButtonModule, DbxListLayoutModule, AbstractDbxSelectionListWrapperDirective, DEFAULT_LIST_WRAPPER_DIRECTIVE_TEMPLATE, AbstractDbxSelectionListViewDirective, addConfigToValueListItems, provideDbxListView, AbstractDbxValueListViewItemComponent, DbxActionModule, mapCompactModeObs, DbxBarLayoutModule } from '@dereekb/dbx-web';
-import { isPast, addSeconds, startOfDay, addMinutes, addDays } from 'date-fns';
+import { isPast, addSeconds, startOfDay, addMinutes, addDays, isAfter } from 'date-fns';
 import { BehaviorSubject, switchMap, first, exhaustMap, of, catchError, delay, filter, combineLatest, map, distinctUntilChanged, shareReplay, Subject, tap, takeUntil, EMPTY, mergeMap, startWith, debounceTime, skipWhile, scan, combineLatestWith, throttleTime, interval, merge, timer } from 'rxjs';
 import { LockSet, SubscriptionObject, asObservable, cleanup, loadingStateHasFinishedLoading, switchMapMaybeObs, filterMaybe, switchMapMaybeDefault, SimpleLoadingContext, distinctUntilHasDifferentValues, startWithBeginLoading, mapLoadingStateResults, successResult, ListLoadingStateContextInstance, isListLoadingStateEmpty, LoadingStateContextInstance, loadingStateHasValue, loadingStateIsLoading, beginLoading, mapLoadingStateValueWithOperator, valueFromLoadingState, loadingStateContext, skipFirstMaybe, asObservableFromGetter, asyncPusherCache, scanCount } from '@dereekb/rxjs';
 import * as i1$2 from '@ngx-formly/core';
@@ -1933,7 +1933,7 @@ class DbxPickableListFieldItemListComponent extends AbstractDbxSelectionListWrap
     }
 }
 DbxPickableListFieldItemListComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxPickableListFieldItemListComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-DbxPickableListFieldItemListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.12", type: DbxPickableListFieldItemListComponent, selector: "dbx-form-pickable-item-field-item-list", usesInheritance: true, ngImport: i0, template: "\n<dbx-list [state$]=\"state$\" [config]=\"config$ | async\" [disabled]=\"disabled\" [selectionMode]=\"selectionMode\">\n  <ng-content top select=\"[top]\"></ng-content>\n  <ng-content bottom select=\"[bottom]\"></ng-content>\n  <ng-content empty select=\"[empty]\"></ng-content>\n</dbx-list>\n", isInline: true, dependencies: [{ kind: "component", type: i2$1.DbxListComponent, selector: "dbx-list", inputs: ["padded", "state$", "config", "disabled", "selectionMode"], outputs: ["contentScrolled"] }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }] });
+DbxPickableListFieldItemListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.12", type: DbxPickableListFieldItemListComponent, selector: "dbx-form-pickable-item-field-item-list", usesInheritance: true, ngImport: i0, template: "\n<dbx-list [state$]=\"state$\" [config]=\"config$ | async\" [disabled]=\"disabled\" [selectionMode]=\"selectionMode\">\n  <ng-content top select=\"[top]\"></ng-content>\n  <ng-content bottom select=\"[bottom]\"></ng-content>\n  <ng-content empty select=\"[empty]\"></ng-content>\n  <ng-content emptyLoading select=\"[emptyLoading]\"></ng-content>\n</dbx-list>\n", isInline: true, dependencies: [{ kind: "component", type: i2$1.DbxListComponent, selector: "dbx-list", inputs: ["padded", "state$", "config", "disabled", "selectionMode"], outputs: ["contentScrolled"] }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: DbxPickableListFieldItemListComponent, decorators: [{
             type: Component,
             args: [{
@@ -4321,6 +4321,7 @@ class DbxFixedDateRangeFieldComponent extends FieldType$1 {
     }
     dateRangeSelectionForMode(mode) {
         const result = combineLatest([this.dateRangeInput$, this.limitDateTimeInstance$]).pipe(switchMap(([dateRangeInput, limitInstance]) => {
+            const hasDateRangeConfiguration = Boolean(dateRangeInput);
             const minMaxClamp = (dateRange) => limitInstance.clampDateRange(dateRange);
             if (mode === 'single') {
                 // only use the start date.
@@ -4333,6 +4334,7 @@ class DbxFixedDateRangeFieldComponent extends FieldType$1 {
                 // take the first date, then wait unless the date is outside of the range.
                 return this.selectedDateRange$.pipe(scan((acc, nextDateRange) => {
                     let result;
+                    let pickType = 'start';
                     if (nextDateRange && nextDateRange.start != null) {
                         const { start: startOrNextDate, end } = nextDateRange;
                         const potentialBoundary = dateRange({ ...dateRangeInput, date: startOrNextDate });
@@ -4348,7 +4350,43 @@ class DbxFixedDateRangeFieldComponent extends FieldType$1 {
                         else {
                             let range = undefined;
                             let boundary = potentialBoundary;
-                            if (acc.boundary && isDateInDateRange(startOrNextDate, acc.boundary)) {
+                            if (mode === 'normal') {
+                                if (!hasDateRangeConfiguration) {
+                                    // if there is no configured range/boundary, then just set the pick type based on the last type
+                                    boundary = undefined;
+                                    pickType = acc.lastPickType === 'start' ? 'end' : 'start';
+                                }
+                                else {
+                                    // if the pick is outside the boundary, then consider it a start pick type.
+                                    pickType = acc.lastPickType === 'start' && acc.boundary && isDateInDateRange(startOrNextDate, acc.boundary) ? 'end' : 'start';
+                                }
+                                // assert the start exists from the previous click, otherwise clear it.
+                                if (pickType === 'end') {
+                                    const lastStart = acc.lastDateRange?.start;
+                                    if (!lastStart || !isAfter(startOrNextDate, lastStart)) {
+                                        pickType = 'start';
+                                    }
+                                }
+                                // react based on how this
+                                switch (pickType) {
+                                    case 'end':
+                                        // if we're picking the end then set the range.
+                                        range = {
+                                            start: acc.lastDateRange?.start,
+                                            end: startOrNextDate
+                                        };
+                                        boundary = range;
+                                        break;
+                                    case 'start':
+                                        // retain the boundary as potential boundary, and set our new range from the single date.
+                                        range = {
+                                            start: startOrNextDate,
+                                            end: startOrNextDate
+                                        };
+                                        break;
+                                }
+                            }
+                            else if (acc.boundary && isDateInDateRange(startOrNextDate, acc.boundary)) {
                                 // if in the date range, uses the pick as the last date.
                                 range = {
                                     start: acc.boundary.start,
@@ -4366,6 +4404,7 @@ class DbxFixedDateRangeFieldComponent extends FieldType$1 {
                                     }
                                 }
                                 else {
+                                    // retain same boundary
                                     boundary = acc.boundary;
                                 }
                             }
@@ -4386,6 +4425,7 @@ class DbxFixedDateRangeFieldComponent extends FieldType$1 {
                     }
                     if (result) {
                         result = {
+                            lastPickType: pickType,
                             lastDateRange: result.lastDateRange,
                             boundary: result.boundary ? minMaxClamp(result.boundary) : undefined,
                             range: result.range ? minMaxClamp(result.range) : undefined
@@ -4602,10 +4642,11 @@ class DbxFixedDateRangeFieldSelectionStrategy {
         return currentRange;
     }
     createPreview(activeDate, currentRange, event) {
-        if (activeDate != null && this.dbxFixedDateRangeFieldComponent.currentSelectionMode !== 'single') {
+        const { currentSelectionMode } = this.dbxFixedDateRangeFieldComponent;
+        if (activeDate != null && currentSelectionMode !== 'single') {
             const latestBoundary = this.dbxFixedDateRangeFieldComponent.latestBoundary;
             const date = this.dateFromAdapterDate(activeDate);
-            if (latestBoundary && isDateInDateRange(date, latestBoundary)) {
+            if (latestBoundary && (currentSelectionMode === 'normal' || isDateInDateRange(date, latestBoundary))) {
                 const exampleDateRange = this._createDateRange(latestBoundary);
                 return exampleDateRange;
             }