@ng-atomic/common 20.78.0 → 20.84.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -81,8 +81,12 @@ const ACTIVE_CONTROL_DEACTIVATE_ATTR = 'data-active-control-deactivate';
81
81
  function keepsActiveOnMousedown(target) {
82
82
  return target instanceof Element && target.closest(`[${ACTIVE_CONTROL_KEEP_ATTR}]`) !== null;
83
83
  }
84
- function forcesDeactivateOnClick(target) {
85
- return target instanceof Element && target.closest(`[${ACTIVE_CONTROL_DEACTIVATE_ATTR}]`) !== null;
84
+ function forcesDeactivateOnClick(target, focusedAtStart) {
85
+ const region = target instanceof Element ? target.closest(`[${ACTIVE_CONTROL_DEACTIVATE_ATTR}]`) : null;
86
+ if (!region)
87
+ return false;
88
+ const editing = focusedAtStart !== null && focusedAtStart !== focusedAtStart.ownerDocument.body && region.contains(focusedAtStart);
89
+ return !editing;
86
90
  }
87
91
  function keepsActiveByModifier(event) {
88
92
  return event.altKey;
@@ -106,9 +110,11 @@ class ActiveControlEventHandlers {
106
110
  const CLICK_MOVE_THRESHOLD_PX = 5;
107
111
  let justActivated = false;
108
112
  let gestureStart = null;
113
+ let focusedAtStart = null;
109
114
  const touchOrigin = createTouchOriginTracker(this.hostElement, (t, type, h, o) => this.addEventListener(t, type, h, o));
110
115
  const gestureStartHandler = (e) => {
111
116
  justActivated = false;
117
+ focusedAtStart = this.hostElement.ownerDocument.activeElement;
112
118
  gestureStart = this.hostElement.contains(e.target)
113
119
  ? { x: e.screenX, y: e.screenY }
114
120
  : null;
@@ -158,7 +164,7 @@ class ActiveControlEventHandlers {
158
164
  if (moved) {
159
165
  return;
160
166
  }
161
- if (!forcesDeactivateOnClick(e.target) && isClickConsumedByInnerWidget({ hostElement: this.hostElement, focusTargetSelector: this.options.focusTargetSelector }, e.target)) {
167
+ if (!forcesDeactivateOnClick(e.target, focusedAtStart) && isClickConsumedByInnerWidget({ hostElement: this.hostElement, focusTargetSelector: this.options.focusTargetSelector }, e.target)) {
162
168
  return;
163
169
  }
164
170
  if (this.options.disableTouchDeactivate && touchOrigin.isTouchOriginated()) {
@@ -22,20 +22,14 @@ class NgAtomicColumnMoleculeStore extends InjectableComponent {
22
22
  this.editable = input(_computed(() => this.#config().editable), ...(ngDevMode ? [{ debugName: "editable" }] : /* istanbul ignore next */ []));
23
23
  this.sticky = computed(() => this.column().sticky, ...(ngDevMode ? [{ debugName: "sticky" }] : /* istanbul ignore next */ []));
24
24
  this.stickyEnd = computed(() => this.column().stickyEnd, ...(ngDevMode ? [{ debugName: "stickyEnd" }] : /* istanbul ignore next */ []));
25
- this.stickyLeft = computed(() => this.column().stickyLeft, ...(ngDevMode ? [{ debugName: "stickyLeft" }] : /* istanbul ignore next */ []));
26
25
  this.sort = computed(() => this.column().sort, ...(ngDevMode ? [{ debugName: "sort" }] : /* istanbul ignore next */ []));
27
26
  this.name = computed(() => this.column().name, ...(ngDevMode ? [{ debugName: "name" }] : /* istanbul ignore next */ []));
28
27
  this.width = computed(() => this.column().width, ...(ngDevMode ? [{ debugName: "width" }] : /* istanbul ignore next */ []));
29
- this.columnStyle = computed(() => {
30
- const stickyLeft = `${this.stickyLeft()}px`;
31
- const left = this.column().sticky ? stickyLeft : 'auto';
32
- return ({
33
- width: `${this.width()}px`,
34
- minWidth: `${this.width()}px`,
35
- maxWidth: `${this.width()}px`,
36
- left,
37
- });
38
- }, ...(ngDevMode ? [{ debugName: "columnStyle" }] : /* istanbul ignore next */ []));
28
+ this.columnStyle = computed(() => ({
29
+ width: `${this.width()}px`,
30
+ minWidth: `${this.width()}px`,
31
+ maxWidth: `${this.width()}px`,
32
+ }), ...(ngDevMode ? [{ debugName: "columnStyle" }] : /* istanbul ignore next */ []));
39
33
  }
40
34
  static { this._ActionId = ActionId; }
41
35
  static { this._Config = makeConfig(() => {
@@ -1,7 +1,8 @@
1
1
  import * as i0 from '@angular/core';
2
- import { Injectable, inject } from '@angular/core';
3
- import * as i1 from '@angular/router';
4
- import { NavigationStart, Router } from '@angular/router';
2
+ import { inject, Injectable } from '@angular/core';
3
+ import { Location } from '@angular/common';
4
+ import { Router, NavigationEnd } from '@angular/router';
5
+ import { filter, take } from 'rxjs';
5
6
  import { LoadingService } from '@ng-atomic/common/services/loading';
6
7
  import { SideAppService } from '@ng-atomic/common/services/side-app';
7
8
  import { SideNavModeService } from '@ng-atomic/common/services/side-nav-mode';
@@ -12,28 +13,31 @@ import { MatDialog } from '@angular/material/dialog';
12
13
  import { SheetService } from '@ng-atomic/common/services/sheets';
13
14
 
14
15
  class HistoryInjectorService {
15
- constructor(router) {
16
- this.router = router;
17
- this.isInitialNavigation = true;
18
- this.router.events.subscribe((event) => {
19
- if (event instanceof NavigationStart && this.isInitialNavigation) {
20
- this.isInitialNavigation = false;
21
- this.injectParentRoutes(event.url);
16
+ constructor() {
17
+ this.router = inject(Router);
18
+ this.location = inject(Location);
19
+ if (this.router.navigated) {
20
+ if (!this.router.lastSuccessfulNavigation()?.previousNavigation) {
21
+ this.injectParentRoutes(this.router.url);
22
22
  }
23
- });
23
+ return;
24
+ }
25
+ this.router.events.pipe(filter((event) => event instanceof NavigationEnd), take(1)).subscribe(event => this.injectParentRoutes(event.urlAfterRedirects));
24
26
  }
25
- async injectParentRoutes(currentUrl) {
27
+ injectParentRoutes(currentUrl) {
26
28
  const urlTree = this.router.parseUrl(currentUrl);
27
29
  const segments = this.getFilteredSegments(urlTree);
28
- console.debug('[HistoryInjector] Filtered segments:', segments);
29
- if (segments.length > 1) {
30
- for (let i = 1; i < segments.length; i++) {
31
- const parentUrl = '/' + segments.slice(0, i).map(segment => segment.path).join('/');
32
- console.debug('[HistoryInjector] Adding parent URL to history:', parentUrl);
33
- await this.router.navigateByUrl(parentUrl);
34
- }
35
- await this.router.navigateByUrl(currentUrl);
30
+ if (segments.length <= 1)
31
+ return;
32
+ for (let i = 1; i < segments.length; i++) {
33
+ const parentUrl = '/' + segments.slice(0, i).map(segment => segment.path).join('/');
34
+ console.debug('[HistoryInjector] Adding parent URL to history:', parentUrl);
35
+ if (i === 1)
36
+ this.location.replaceState(parentUrl);
37
+ else
38
+ this.location.go(parentUrl);
36
39
  }
40
+ this.location.go(currentUrl);
37
41
  }
38
42
  getFilteredSegments(urlTree) {
39
43
  const segments = urlTree.root.children['primary']?.segments || [];
@@ -42,7 +46,7 @@ class HistoryInjectorService {
42
46
  return skip !== 'true';
43
47
  });
44
48
  }
45
- static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HistoryInjectorService, deps: [{ token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
49
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HistoryInjectorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
46
50
  static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HistoryInjectorService, providedIn: 'root' }); }
47
51
  }
48
52
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HistoryInjectorService, decorators: [{
@@ -50,7 +54,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImpo
50
54
  args: [{
51
55
  providedIn: 'root',
52
56
  }]
53
- }], ctorParameters: () => [{ type: i1.Router }] });
57
+ }], ctorParameters: () => [] });
54
58
  class AppService {
55
59
  constructor() {
56
60
  this.dialog = inject(MatDialog);
@@ -3,7 +3,7 @@ import { inject, Injectable } from '@angular/core';
3
3
  import { toSignal, takeUntilDestroyed } from '@angular/core/rxjs-interop';
4
4
  import { Auth, authState, user, getRedirectResult, TwitterAuthProvider, signInWithPopup, GoogleAuthProvider, signInWithRedirect, onAuthStateChanged, signInWithEmailAndPassword, createUserWithEmailAndPassword, signInWithCustomToken, signOut } from '@angular/fire/auth';
5
5
  import { get } from 'lodash-es';
6
- import { ReplaySubject, switchMap, of, distinctUntilChanged, shareReplay, map } from 'rxjs';
6
+ import { ReplaySubject, switchMap, of, distinctUntilChanged, map, shareReplay } from 'rxjs';
7
7
 
8
8
  const redirectError$ = new ReplaySubject(1);
9
9
  class AuthService {
@@ -14,7 +14,7 @@ class AuthService {
14
14
  this.auth$ = authState(this.#auth);
15
15
  this.auth = toSignal(this.auth$);
16
16
  this.#idTokenUser$ = user(this.#auth);
17
- this.accessToken$ = this.#idTokenUser$.pipe(switchMap(auth => auth ? auth.getIdToken() : of(null)), distinctUntilChanged(), shareReplay(1), takeUntilDestroyed());
17
+ this.accessToken$ = this.#idTokenUser$.pipe(switchMap(auth => auth ? auth.getIdToken() : of(null)), distinctUntilChanged(), takeUntilDestroyed());
18
18
  this.accessToken = toSignal(this.accessToken$);
19
19
  this.userId$ = this.auth$.pipe(map(auth => auth?.uid ?? null), distinctUntilChanged(), shareReplay(1), takeUntilDestroyed());
20
20
  this.customClaims$ = this.#idTokenUser$.pipe(switchMap(auth => auth ? auth.getIdTokenResult() : of(null)), map(token => token?.claims ?? {}), distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)), shareReplay(1), takeUntilDestroyed());
@@ -1,5 +1,5 @@
1
1
  import * as i0 from '@angular/core';
2
- import { signal, Injectable, inject, computed, effect, InjectionToken, ElementRef, input, Directive, Renderer2, output, HostListener, Component, ViewContainerRef } from '@angular/core';
2
+ import { signal, Injectable, inject, computed, InjectionToken, effect, ElementRef, input, Directive, Renderer2, output, HostListener, Component, ViewContainerRef } from '@angular/core';
3
3
  import { isEqual } from 'lodash-es';
4
4
  import { Clipboard } from '@angular/cdk/clipboard';
5
5
  import { SnackBarService } from '@ng-atomic/common/services/snack-bar';
@@ -110,11 +110,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImpo
110
110
  type: Injectable
111
111
  }] });
112
112
 
113
+ const SPREADSHEET_CELL_SELECTION = new InjectionToken('SPREADSHEET_CELL_SELECTION', {
114
+ providedIn: 'root',
115
+ factory: () => false,
116
+ });
113
117
  class SelectionService {
114
118
  constructor() {
115
119
  this.data = inject(SpreadSheetDataService);
116
- this.selection = signal({ start: { row: 1, col: 0 }, end: null }, ...(ngDevMode ? [{ debugName: "selection" }] : /* istanbul ignore next */ []));
117
- this.selectionStart = computed(() => this.selection().start, { ...(ngDevMode ? { debugName: "selectionStart" } : /* istanbul ignore next */ {}), equal: isEqual });
120
+ this.enabled = inject(SPREADSHEET_CELL_SELECTION);
121
+ this.selection = signal(null, ...(ngDevMode ? [{ debugName: "selection" }] : /* istanbul ignore next */ []));
122
+ this.selectionStart = computed(() => this.selection()?.start ?? null, { ...(ngDevMode ? { debugName: "selectionStart" } : /* istanbul ignore next */ {}), equal: isEqual });
118
123
  this.isMouseDown = signal(false, ...(ngDevMode ? [{ debugName: "isMouseDown" }] : /* istanbul ignore next */ []));
119
124
  this.grid = inject(GridService);
120
125
  this.cellElMap = new Map();
@@ -137,9 +142,12 @@ class SelectionService {
137
142
  return row >= minRow && row <= maxRow && col >= minCol && col <= maxCol;
138
143
  }
139
144
  isCursorPosition(position) {
140
- return isEqual(this.selection().start, position);
145
+ const selection = this.selection();
146
+ return !!selection && isEqual(selection.start, position);
141
147
  }
142
148
  handleMouseDown(position, event) {
149
+ if (!this.enabled)
150
+ return;
143
151
  this.isMouseDown.set(true);
144
152
  if (!event?.shiftKey) {
145
153
  this.startSelection(position);
@@ -164,26 +172,32 @@ class SelectionService {
164
172
  }
165
173
  }
166
174
  clearSelection() {
167
- this.selection.update((selection) => ({ ...selection, start: selection.start, end: null }));
175
+ this.selection.update((selection) => selection && { start: selection.start, end: null });
168
176
  }
169
177
  setStartPosition(position) {
170
- this.selection.update((selection) => ({ ...selection, start: position, end: null }));
178
+ if (!this.enabled)
179
+ return;
180
+ this.selection.set({ start: position, end: null });
171
181
  }
172
182
  getSelection() {
173
183
  return this.selection();
174
184
  }
175
185
  getSelectionEndOrStart() {
176
- return (this.selection()?.end || this.selection()?.start);
186
+ return this.selection()?.end ?? this.selection()?.start ?? null;
177
187
  }
178
188
  updateSelectionEnd(position) {
179
- this.selection.update((selection) => ({ ...selection, end: position }));
189
+ if (!this.enabled)
190
+ return;
191
+ this.selection.update((selection) => selection ? { ...selection, end: position } : { start: position, end: null });
180
192
  }
181
193
  startSelection(position) {
194
+ if (!this.enabled)
195
+ return;
182
196
  this.selection.set({ start: position, end: null });
183
197
  }
184
198
  updateSelection(position) {
185
199
  if (this.selection()) {
186
- this.selection.update((selection) => ({ ...selection, end: position }));
200
+ this.selection.update((selection) => selection && { ...selection, end: position });
187
201
  }
188
202
  }
189
203
  clearSelectedRange(selection) {
@@ -462,8 +476,11 @@ class SpreadSheetService {
462
476
  }
463
477
  }
464
478
  handleKeyDownOnSelecting(event) {
479
+ const current = this.selection.getSelection();
480
+ if (!current)
481
+ return;
465
482
  if (event.key === 'Tab') {
466
- const selectedCell = this.selection.getSelection().start;
483
+ const selectedCell = current.start;
467
484
  event.preventDefault();
468
485
  event.stopPropagation();
469
486
  if (event.shiftKey) {
@@ -475,7 +492,7 @@ class SpreadSheetService {
475
492
  return;
476
493
  }
477
494
  else if (event.key === 'Enter') {
478
- const selectedCell = this.selection.getSelection().start;
495
+ const selectedCell = current.start;
479
496
  if (selectedCell) {
480
497
  this.editor.startEditing(selectedCell);
481
498
  event.preventDefault();
@@ -489,7 +506,7 @@ class SpreadSheetService {
489
506
  else if (event.key === 'v') {
490
507
  if (!this.config.paste)
491
508
  return;
492
- const target = this.selection.getSelection().start;
509
+ const target = current.start;
493
510
  if (target) {
494
511
  this.clipboard.paste(target.row, target.col);
495
512
  }
@@ -498,18 +515,15 @@ class SpreadSheetService {
498
515
  return;
499
516
  }
500
517
  else if (event.key === 'Delete' || event.key === 'Backspace') {
501
- const selection = this.selection.getSelection();
502
- if (selection) {
503
- this.selection.clearSelectedRange(selection);
504
- event.preventDefault();
505
- return;
506
- }
518
+ this.selection.clearSelectedRange(current);
519
+ event.preventDefault();
520
+ return;
507
521
  }
508
522
  else {
509
- const selection = this.selection.getSelection().start;
523
+ const selection = current.start;
510
524
  let newPosition;
511
525
  if (event.shiftKey) {
512
- const selectionEnd = this.selection.getSelectionEndOrStart();
526
+ const selectionEnd = this.selection.getSelectionEndOrStart() ?? selection;
513
527
  switch (event.key) {
514
528
  case 'ArrowRight':
515
529
  newPosition = this.navigation.moveRight(selectionEnd);
@@ -953,4 +967,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImpo
953
967
  * Generated bundle index. Do not edit.
954
968
  */
955
969
 
956
- export { AutoFillService, COLUMN_PROTECTOR, ClipboardService, EditorService, GridDataTableAutofill, GridService, NavigationService, ProtectionService, SelectionService, SpreadSheetCell, SpreadSheetCellAutofill, SpreadSheetCellInput, SpreadSheetDataService, SpreadSheetService, provideCellProtector, provideSpreadSheetService };
970
+ export { AutoFillService, COLUMN_PROTECTOR, ClipboardService, EditorService, GridDataTableAutofill, GridService, NavigationService, ProtectionService, SPREADSHEET_CELL_SELECTION, SelectionService, SpreadSheetCell, SpreadSheetCellAutofill, SpreadSheetCellInput, SpreadSheetDataService, SpreadSheetService, provideCellProtector, provideSpreadSheetService };
@@ -16,7 +16,7 @@ import LocalizedFormat from 'dayjs/plugin/localizedFormat';
16
16
  import customParseFormat from 'dayjs/plugin/customParseFormat';
17
17
  import 'dayjs/locale/ja';
18
18
  import { DateFnsAdapter } from '@angular/material-date-fns-adapter';
19
- import { enUS } from 'date-fns/locale';
19
+ import { enUS, ja } from 'date-fns/locale';
20
20
 
21
21
  const comma = (n) => n === null ? '0' : n.toLocaleString();
22
22
  const commaStr = (n, unit = '円') => n < 0 ? `-${comma(abs(n))}${unit}` : `${comma(n)}${unit}`;
@@ -473,6 +473,25 @@ function provideDayjsDateAdapter() {
473
473
  ];
474
474
  }
475
475
 
476
+ const MAT_DATE_FNS_JA_FORMATS = {
477
+ parse: {
478
+ dateInput: ['yyyy/MM/dd', 'yyyy/M/d', 'yyyy-MM-dd', 'yyyy-M-d'],
479
+ },
480
+ display: {
481
+ dateInput: 'yyyy/MM/dd',
482
+ monthYearLabel: 'yyyy年M月',
483
+ dateA11yLabel: 'PPP',
484
+ monthYearA11yLabel: 'yyyy年M月',
485
+ },
486
+ };
487
+ function provideJaDateAdapter() {
488
+ return [
489
+ { provide: MAT_DATE_LOCALE, useValue: ja },
490
+ { provide: DateAdapter, useClass: DateFnsAdapter },
491
+ { provide: MAT_DATE_FORMATS, useValue: MAT_DATE_FNS_JA_FORMATS },
492
+ ];
493
+ }
494
+
476
495
  class Page {
477
496
  static from(event = {}) {
478
497
  return Object.assign(new Page(), {
@@ -603,4 +622,4 @@ function formatSeconds(seconds) {
603
622
  * Generated bundle index. Do not edit.
604
623
  */
605
624
 
606
- export { DATE_FORMAT, DayjsDateAdapter, DayjsDateModule, EXPRESSION_TRANSFORMER, MAT_DATE_FNS_DATE_FORMATS, MAT_DAYJS_DATE_ADAPTER_OPTIONS, MAT_DAYJS_DATE_ADAPTER_OPTIONS_FACTORY, MAT_DAYJS_DATE_FORMATS, MAT_DAYJS_DATE_FORMATS_FOR_JP, MAT_DAYJS_JP_PROVIDERS, Page, ResolverManager, abs, comma, commaStr, compareById, compareByIdFactory, computedRawValue, defaultExpressionTransformer, diff, formatSeconds, get, getInvalid, getInvalid$, getRawValue, getRawValue$, getResolver, getValue, getValue$, injectActivatedComponents, injectChildRoute, injectChildRoute$, injectChildRouteParam, injectChildRouteParam$, injectHasNext, injectHasNext$, injectNavigationExtras, injectParentExpressionTransformer, injectPrimaryPaths, injectPrimaryPaths$, injectResolver$, injectRouteData, injectRouteData$, injectRouteDataSnapshot, injectRouteNavigated, injectRouteNavigated$, injectRouteParam, injectRouteParam$, injectRouteParamMap, injectRouteParamMap$, injectRouteParams, injectRouteParams$, injectRouteQueryParam, injectRouteQueryParam$, injectRouteSkip, injectRouteSkip$, injectRouterParam, injectRouterParam$, injectRouterQueryParam, injectRouterQueryParam$, injectUnflattenRouteParam, injectUnflattenRouteParam$, injectUnflattenRouteParams, injectUnflattenRouteParams$, isDateStr, isDateTimeStr, isIsoString, provideDayjsDateAdapter, provideExpressionTransformer, provideResolver, removeComma, skippedResolver, smartExpTransformer, timestampToDayjs, toObject, walkActivatedRouteSnapshot, wrapRoutes, yenTransform };
625
+ export { DATE_FORMAT, DayjsDateAdapter, DayjsDateModule, EXPRESSION_TRANSFORMER, MAT_DATE_FNS_DATE_FORMATS, MAT_DATE_FNS_JA_FORMATS, MAT_DAYJS_DATE_ADAPTER_OPTIONS, MAT_DAYJS_DATE_ADAPTER_OPTIONS_FACTORY, MAT_DAYJS_DATE_FORMATS, MAT_DAYJS_DATE_FORMATS_FOR_JP, MAT_DAYJS_JP_PROVIDERS, Page, ResolverManager, abs, comma, commaStr, compareById, compareByIdFactory, computedRawValue, defaultExpressionTransformer, diff, formatSeconds, get, getInvalid, getInvalid$, getRawValue, getRawValue$, getResolver, getValue, getValue$, injectActivatedComponents, injectChildRoute, injectChildRoute$, injectChildRouteParam, injectChildRouteParam$, injectHasNext, injectHasNext$, injectNavigationExtras, injectParentExpressionTransformer, injectPrimaryPaths, injectPrimaryPaths$, injectResolver$, injectRouteData, injectRouteData$, injectRouteDataSnapshot, injectRouteNavigated, injectRouteNavigated$, injectRouteParam, injectRouteParam$, injectRouteParamMap, injectRouteParamMap$, injectRouteParams, injectRouteParams$, injectRouteQueryParam, injectRouteQueryParam$, injectRouteSkip, injectRouteSkip$, injectRouterParam, injectRouterParam$, injectRouterQueryParam, injectRouterQueryParam$, injectUnflattenRouteParam, injectUnflattenRouteParam$, injectUnflattenRouteParams, injectUnflattenRouteParams$, isDateStr, isDateTimeStr, isIsoString, provideDayjsDateAdapter, provideExpressionTransformer, provideJaDateAdapter, provideResolver, removeComma, skippedResolver, smartExpTransformer, timestampToDayjs, toObject, walkActivatedRouteSnapshot, wrapRoutes, yenTransform };
@@ -215,8 +215,12 @@ const ACTIVE_CONTROL_DEACTIVATE_ATTR = 'data-active-control-deactivate';
215
215
  function keepsActiveOnMousedown(target) {
216
216
  return target instanceof Element && target.closest(`[${ACTIVE_CONTROL_KEEP_ATTR}]`) !== null;
217
217
  }
218
- function forcesDeactivateOnClick(target) {
219
- return target instanceof Element && target.closest(`[${ACTIVE_CONTROL_DEACTIVATE_ATTR}]`) !== null;
218
+ function forcesDeactivateOnClick(target, focusedAtStart) {
219
+ const region = target instanceof Element ? target.closest(`[${ACTIVE_CONTROL_DEACTIVATE_ATTR}]`) : null;
220
+ if (!region)
221
+ return false;
222
+ const editing = focusedAtStart !== null && focusedAtStart !== focusedAtStart.ownerDocument.body && region.contains(focusedAtStart);
223
+ return !editing;
220
224
  }
221
225
  function keepsActiveByModifier(event) {
222
226
  return event.altKey;
@@ -240,9 +244,11 @@ class ActiveControlEventHandlers {
240
244
  const CLICK_MOVE_THRESHOLD_PX = 5;
241
245
  let justActivated = false;
242
246
  let gestureStart = null;
247
+ let focusedAtStart = null;
243
248
  const touchOrigin = createTouchOriginTracker(this.hostElement, (t, type, h, o) => this.addEventListener(t, type, h, o));
244
249
  const gestureStartHandler = (e) => {
245
250
  justActivated = false;
251
+ focusedAtStart = this.hostElement.ownerDocument.activeElement;
246
252
  gestureStart = this.hostElement.contains(e.target)
247
253
  ? { x: e.screenX, y: e.screenY }
248
254
  : null;
@@ -292,7 +298,7 @@ class ActiveControlEventHandlers {
292
298
  if (moved) {
293
299
  return;
294
300
  }
295
- if (!forcesDeactivateOnClick(e.target) && isClickConsumedByInnerWidget({ hostElement: this.hostElement, focusTargetSelector: this.options.focusTargetSelector }, e.target)) {
301
+ if (!forcesDeactivateOnClick(e.target, focusedAtStart) && isClickConsumedByInnerWidget({ hostElement: this.hostElement, focusTargetSelector: this.options.focusTargetSelector }, e.target)) {
296
302
  return;
297
303
  }
298
304
  if (this.options.disableTouchDeactivate && touchOrigin.isTouchOriginated()) {
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "@ng-atomic/common",
3
- "version": "20.78.0",
3
+ "version": "20.84.0",
4
4
  "license": "MIT",
5
5
  "peerDependencies": {
6
- "@nx-ddd/core": "20.78.0",
7
- "@nx-ddd/common": "20.78.0"
6
+ "@nx-ddd/core": "20.84.0",
7
+ "@nx-ddd/common": "20.84.0"
8
8
  },
9
9
  "dependencies": {
10
10
  "tslib": "^2.3.0"
@@ -39,7 +39,6 @@ declare abstract class NgAtomicColumnMoleculeStore extends InjectableComponent {
39
39
  readonly editable: _angular_core.InputSignal<boolean>;
40
40
  readonly sticky: _angular_core.Signal<boolean | undefined>;
41
41
  readonly stickyEnd: _angular_core.Signal<boolean | undefined>;
42
- readonly stickyLeft: _angular_core.Signal<number | undefined>;
43
42
  readonly sort: _angular_core.Signal<boolean | undefined>;
44
43
  readonly name: _angular_core.Signal<string | undefined>;
45
44
  readonly width: _angular_core.Signal<number>;
@@ -47,7 +46,6 @@ declare abstract class NgAtomicColumnMoleculeStore extends InjectableComponent {
47
46
  width: string;
48
47
  minWidth: string;
49
48
  maxWidth: string;
50
- left: string;
51
49
  }>;
52
50
  static ɵfac: _angular_core.ɵɵFactoryDeclaration<NgAtomicColumnMoleculeStore, never>;
53
51
  static ɵdir: _angular_core.ɵɵDirectiveDeclaration<NgAtomicColumnMoleculeStore, never, never, { "column": { "alias": "column"; "required": true; "isSignal": true; }; "index": { "alias": "index"; "required": true; "isSignal": true; }; "clickCopy": { "alias": "clickCopy"; "required": false; "isSignal": true; }; "editable": { "alias": "editable"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
@@ -41,7 +41,6 @@ interface BaseColumn {
41
41
  sort?: boolean;
42
42
  sticky?: boolean;
43
43
  stickyEnd?: boolean;
44
- stickyLeft?: number;
45
44
  }
46
45
  interface ActionsColumn extends BaseColumn {
47
46
  type: 'actions';
@@ -10,9 +10,9 @@ import { SheetService } from '@ng-atomic/common/services/sheets';
10
10
  import * as i0 from '@angular/core';
11
11
 
12
12
  declare class HistoryInjectorService {
13
- private router;
14
- private isInitialNavigation;
15
- constructor(router: Router);
13
+ private readonly router;
14
+ private readonly location;
15
+ constructor();
16
16
  private injectParentRoutes;
17
17
  private getFilteredSegments;
18
18
  static ɵfac: i0.ɵɵFactoryDeclaration<HistoryInjectorService, never>;
@@ -55,8 +55,10 @@ declare class NavigationService {
55
55
  static ɵprov: i0.ɵɵInjectableDeclaration<NavigationService>;
56
56
  }
57
57
 
58
+ declare const SPREADSHEET_CELL_SELECTION: InjectionToken<boolean>;
58
59
  declare class SelectionService {
59
60
  protected readonly data: SpreadSheetDataService;
61
+ readonly enabled: boolean;
60
62
  private readonly selection;
61
63
  private readonly selectionStart;
62
64
  private readonly isMouseDown;
@@ -72,7 +74,7 @@ declare class SelectionService {
72
74
  clearSelection(): void;
73
75
  setStartPosition(position: Position$1): void;
74
76
  getSelection(): Selection | null;
75
- getSelectionEndOrStart(): Position$1;
77
+ getSelectionEndOrStart(): Position$1 | null;
76
78
  updateSelectionEnd(position: Position$1): void;
77
79
  private startSelection;
78
80
  private updateSelection;
@@ -299,5 +301,5 @@ declare class SpreadSheetCellAutofill {
299
301
  static ɵdir: i0.ɵɵDirectiveDeclaration<SpreadSheetCellAutofill, "[gridDataCellAutofill]", never, { "position": { "alias": "gridDataCellAutofill"; "required": false; "isSignal": true; }; "enabled": { "alias": "gridDataCellAutofillEnabled"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
300
302
  }
301
303
 
302
- export { AutoFillService, COLUMN_PROTECTOR, ClipboardService, EditorService, GridDataTableAutofill, GridService, NavigationService, ProtectionService, SelectionService, SpreadSheetCell, SpreadSheetCellAutofill, SpreadSheetCellInput, SpreadSheetDataService, SpreadSheetService, provideCellProtector, provideSpreadSheetService };
304
+ export { AutoFillService, COLUMN_PROTECTOR, ClipboardService, EditorService, GridDataTableAutofill, GridService, NavigationService, ProtectionService, SPREADSHEET_CELL_SELECTION, SelectionService, SpreadSheetCell, SpreadSheetCellAutofill, SpreadSheetCellInput, SpreadSheetDataService, SpreadSheetService, provideCellProtector, provideSpreadSheetService };
303
305
  export type { AutofillContext, Cell, CellContext$1 as CellContext, CellProtector, Position$1 as Position, Range$1 as Range, Selection };
@@ -183,6 +183,9 @@ declare class DayjsDateModule {
183
183
  }
184
184
  declare function provideDayjsDateAdapter(): Provider[];
185
185
 
186
+ declare const MAT_DATE_FNS_JA_FORMATS: MatDateFormats;
187
+ declare function provideJaDateAdapter(): Provider[];
188
+
186
189
  interface Page extends PageEvent {
187
190
  sortKey: string;
188
191
  sortOrder: 'asc' | 'desc';
@@ -213,5 +216,5 @@ declare const toObject: (obj: object) => object;
213
216
 
214
217
  declare function formatSeconds(seconds: number): string;
215
218
 
216
- export { DATE_FORMAT, DayjsDateAdapter, DayjsDateModule, EXPRESSION_TRANSFORMER, MAT_DATE_FNS_DATE_FORMATS, MAT_DAYJS_DATE_ADAPTER_OPTIONS, MAT_DAYJS_DATE_ADAPTER_OPTIONS_FACTORY, MAT_DAYJS_DATE_FORMATS, MAT_DAYJS_DATE_FORMATS_FOR_JP, MAT_DAYJS_JP_PROVIDERS, Page, ResolverManager, abs, comma, commaStr, compareById, compareByIdFactory, computedRawValue, defaultExpressionTransformer, diff, formatSeconds, get, getInvalid, getInvalid$, getRawValue, getRawValue$, getResolver, getValue, getValue$, injectActivatedComponents, injectChildRoute, injectChildRoute$, injectChildRouteParam, injectChildRouteParam$, injectHasNext, injectHasNext$, injectNavigationExtras, injectParentExpressionTransformer, injectPrimaryPaths, injectPrimaryPaths$, injectResolver$, injectRouteData, injectRouteData$, injectRouteDataSnapshot, injectRouteNavigated, injectRouteNavigated$, injectRouteParam, injectRouteParam$, injectRouteParamMap, injectRouteParamMap$, injectRouteParams, injectRouteParams$, injectRouteQueryParam, injectRouteQueryParam$, injectRouteSkip, injectRouteSkip$, injectRouterParam, injectRouterParam$, injectRouterQueryParam, injectRouterQueryParam$, injectUnflattenRouteParam, injectUnflattenRouteParam$, injectUnflattenRouteParams, injectUnflattenRouteParams$, isDateStr, isDateTimeStr, isIsoString, provideDayjsDateAdapter, provideExpressionTransformer, provideResolver, removeComma, skippedResolver, smartExpTransformer, timestampToDayjs, toObject, walkActivatedRouteSnapshot, wrapRoutes, yenTransform };
219
+ export { DATE_FORMAT, DayjsDateAdapter, DayjsDateModule, EXPRESSION_TRANSFORMER, MAT_DATE_FNS_DATE_FORMATS, MAT_DATE_FNS_JA_FORMATS, MAT_DAYJS_DATE_ADAPTER_OPTIONS, MAT_DAYJS_DATE_ADAPTER_OPTIONS_FACTORY, MAT_DAYJS_DATE_FORMATS, MAT_DAYJS_DATE_FORMATS_FOR_JP, MAT_DAYJS_JP_PROVIDERS, Page, ResolverManager, abs, comma, commaStr, compareById, compareByIdFactory, computedRawValue, defaultExpressionTransformer, diff, formatSeconds, get, getInvalid, getInvalid$, getRawValue, getRawValue$, getResolver, getValue, getValue$, injectActivatedComponents, injectChildRoute, injectChildRoute$, injectChildRouteParam, injectChildRouteParam$, injectHasNext, injectHasNext$, injectNavigationExtras, injectParentExpressionTransformer, injectPrimaryPaths, injectPrimaryPaths$, injectResolver$, injectRouteData, injectRouteData$, injectRouteDataSnapshot, injectRouteNavigated, injectRouteNavigated$, injectRouteParam, injectRouteParam$, injectRouteParamMap, injectRouteParamMap$, injectRouteParams, injectRouteParams$, injectRouteQueryParam, injectRouteQueryParam$, injectRouteSkip, injectRouteSkip$, injectRouterParam, injectRouterParam$, injectRouterQueryParam, injectRouterQueryParam$, injectUnflattenRouteParam, injectUnflattenRouteParam$, injectUnflattenRouteParams, injectUnflattenRouteParams$, isDateStr, isDateTimeStr, isIsoString, provideDayjsDateAdapter, provideExpressionTransformer, provideJaDateAdapter, provideResolver, removeComma, skippedResolver, smartExpTransformer, timestampToDayjs, toObject, walkActivatedRouteSnapshot, wrapRoutes, yenTransform };
217
220
  export type { DayJsDateAdapterOptions, ExpressionTransformer, HasId, NestedGetType, PathKeys, Resolver, Timestamp };