fix(core): Calendar properly react to markers change (#6258)

taiga-family · Dec 18, 2023 · fcea78d · fcea78d
1 parent 2a686ee
commit fcea78d
Show file tree

Hide file tree

Showing 8 changed files with 584 additions and 770 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/projects/addon-preview/package.json b/projects/addon-preview/package.json
@@ -15,7 +15,7 @@
     "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
-        "@ng-web-apis/mutation-observer": "3.0.6",
+        "@ng-web-apis/mutation-observer": "3.1.0",
         "@taiga-ui/cdk": ">=3.59.0",
         "@taiga-ui/core": ">=3.59.0",
         "@taiga-ui/i18n": ">=3.59.0",

diff --git a/projects/addon-table/package.json b/projects/addon-table/package.json
@@ -15,7 +15,7 @@
     "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
-        "@ng-web-apis/intersection-observer": "3.1.6",
+        "@ng-web-apis/intersection-observer": "3.2.0",
         "@taiga-ui/cdk": ">=3.59.0",
         "@taiga-ui/core": ">=3.59.0",
         "@taiga-ui/i18n": ">=3.59.0",

diff --git a/projects/cdk/package.json b/projects/cdk/package.json
@@ -16,7 +16,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@ng-web-apis/common": "3.0.6",
-        "@ng-web-apis/mutation-observer": "3.0.6",
+        "@ng-web-apis/mutation-observer": "3.1.0",
         "@ng-web-apis/resize-observer": "3.0.6",
         "@tinkoff/ng-event-plugins": "3.1.0",
         "@tinkoff/ng-polymorpheus": "4.3.0",

diff --git a/projects/core/components/primitive-calendar/primitive-calendar.component.ts b/projects/core/components/primitive-calendar/primitive-calendar.component.ts
@@ -79,12 +79,13 @@ export class TuiPrimitiveCalendarComponent {
         day: TuiDay,
         today: boolean,
         inRange: boolean,
+        markerHandler: TuiMarkerHandler,
     ): [string, string] | [string] | null => {
         if (today || inRange) {
             return null;
         }
 
-        const markers = this.markerHandler(day);
+        const markers = markerHandler(day);
 
         return markers.length === 0 ? null : markers;
     };

diff --git a/projects/core/components/primitive-calendar/primitive-calendar.template.html b/projects/core/components/primitive-calendar/primitive-calendar.template.html
@@ -37,7 +37,14 @@
                     >
                         {{ item.day }}
                         <div
-                            *ngIf="item | tuiMapper: toMarkers : itemIsToday(item) : !!getItemRange(item) as markers"
+                            *ngIf="
+                                item
+                                    | tuiMapper
+                                        : toMarkers
+                                        : itemIsToday(item)
+                                        : !!getItemRange(item)
+                                        : markerHandler as markers
+                            "
                             class="t-dots"
                         >
                             <div

diff --git a/projects/core/package.json b/projects/core/package.json
@@ -25,7 +25,7 @@
         "@angular/platform-browser": ">=12.0.0",
         "@angular/router": ">=12.0.0",
         "@ng-web-apis/common": "3.0.6",
-        "@ng-web-apis/mutation-observer": "3.0.6",
+        "@ng-web-apis/mutation-observer": "3.1.0",
         "@taiga-ui/cdk": ">=3.59.0",
         "@taiga-ui/i18n": ">=3.59.0",
         "@tinkoff/ng-event-plugins": "3.1.0",

diff --git a/projects/kit/package.json b/projects/kit/package.json
@@ -16,7 +16,7 @@
         "@maskito/angular": "1.9.0",
         "@maskito/core": "1.9.0",
         "@maskito/kit": "1.9.0",
-        "@ng-web-apis/intersection-observer": "3.1.6",
+        "@ng-web-apis/intersection-observer": "3.2.0",
         "text-mask-core": "5.1.2"
     },
     "peerDependencies": {
@@ -25,7 +25,7 @@
         "@angular/forms": ">=12.0.0",
         "@angular/router": ">=12.0.0",
         "@ng-web-apis/common": "3.0.6",
-        "@ng-web-apis/mutation-observer": "3.0.6",
+        "@ng-web-apis/mutation-observer": "3.1.0",
         "@ng-web-apis/resize-observer": "3.0.6",
         "@taiga-ui/cdk": ">=3.59.0",
         "@taiga-ui/core": ">=3.59.0",