Merge branch '25_2' into 25_2_ng_nested_fix

Author: GoodDayForSurf

apps/demos/.testcaferc.json

@@ -1,6 +1,6 @@
 {
   "src": [
-    "./testing/**/*.test.js"
+    "./testing/**/*.test.ts"
   ],
   "screenshots": {
     "path": "./",

apps/demos/Demos/Calendar/Overview/Angular/app/app.component.ts

@@ -55,6 +55,10 @@ export class AppComponent {
     return day === 0 || day === 6;
   }
 
+  isHoliday(date: Date) {
+    return this.holidays.some((item) => date.getDate() === item[0] && date.getMonth() === item[1]);
+  }
+
   useCellTemplate({ value }) {
     this.cellTemplate = value ? 'custom' : 'cell';
   }
@@ -68,13 +72,7 @@ export class AppComponent {
       } else {
         if (this.isWeekend(date)) { cssClass = 'weekend'; }
 
-        // eslint-disable-next-line consistent-return
-        this.holidays.forEach((item) => {
-          if (date.getDate() === item[0] && date.getMonth() === item[1]) {
-            cssClass = 'holiday';
-            return false;
-          }
-        });
+        if (this.isHoliday(date)) { cssClass = 'holiday'; }
       }
     }
 

apps/demos/Demos/Calendar/Overview/React/CustomCell.tsx

@@ -5,13 +5,18 @@ export function isWeekend(date: Date) {
   return day === 0 || day === 6;
 }
 
+const holidays = [
+  [1, 0],
+  [4, 6],
+  [25, 11],
+];
+
+export function isHoliday(date: Date) {
+  return holidays.some((item) => date.getDate() === item[0] && date.getMonth() === item[1]);
+}
+
 function getCellCssClass({ date, view }) {
   let cssClass = '';
-  const holidays = [
-    [1, 0],
-    [4, 6],
-    [25, 11],
-  ];
 
   if (view === 'month') {
     if (!date) {
@@ -21,11 +26,9 @@ function getCellCssClass({ date, view }) {
         cssClass = 'weekend';
       }
 
-      holidays.forEach((item) => {
-        if (date.getDate() === item[0] && date.getMonth() === item[1]) {
-          cssClass = 'holiday';
-        }
-      });
+      if (isHoliday(date)) {
+        cssClass = 'holiday';
+      }
     }
   }
 

apps/demos/Demos/Calendar/Overview/ReactJs/CustomCell.js

@@ -4,25 +4,26 @@ export function isWeekend(date) {
   const day = date.getDay();
   return day === 0 || day === 6;
 }
+const holidays = [
+  [1, 0],
+  [4, 6],
+  [25, 11],
+];
+export function isHoliday(date) {
+  return holidays.some((item) => date.getDate() === item[0] && date.getMonth() === item[1]);
+}
 function getCellCssClass({ date, view }) {
   let cssClass = '';
-  const holidays = [
-    [1, 0],
-    [4, 6],
-    [25, 11],
-  ];
   if (view === 'month') {
     if (!date) {
       cssClass = 'week-number';
     } else {
       if (isWeekend(date)) {
         cssClass = 'weekend';
       }
-      holidays.forEach((item) => {
-        if (date.getDate() === item[0] && date.getMonth() === item[1]) {
-          cssClass = 'holiday';
-        }
-      });
+      if (isHoliday(date)) {
+        cssClass = 'holiday';
+      }
     }
   }
   return cssClass;

apps/demos/Demos/Calendar/Overview/Vue/App.vue

@@ -107,26 +107,25 @@ function isWeekend(date: Date) {
   const day = date.getDay();
   return day === 0 || day === 6;
 }
+const holidays = [[1, 0], [4, 6], [25, 11]];
+function isHoliday(date: Date) {
+  return holidays.some((item) => date.getDate() === item[0] && date.getMonth() === item[1]);
+}
 
 function useCellTemplate({ value }: DxCheckBoxTypes.ValueChangedEvent) {
   cellTemplate.value = value ? 'custom' : 'cell';
 }
 
 function getCellCssClass({ date, view }: { date: Date, view: string }) {
   let cssClass = '';
-  const holidays = [[1, 0], [4, 6], [25, 11]];
 
   if (view === 'month') {
     if (!date) {
       cssClass = 'week-number';
     } else {
       if (isWeekend(date)) { cssClass = 'weekend'; }
 
-      holidays.forEach((item) => {
-        if (date.getDate() === item[0] && date.getMonth() === item[1]) {
-          cssClass = 'holiday';
-        }
-      });
+      if (isHoliday(date)) { cssClass = 'holiday'; }
     }
   }
 

apps/demos/Demos/Calendar/Overview/jQuery/index.js

@@ -94,6 +94,9 @@ $(() => {
 
     return day === 0 || day === 6;
   }
+  function isHoliday(d) {
+    return holidays.some((item) => d.date.getDate() === item[0] && d.date.getMonth() === item[1]);
+  }
 
   function getCellTemplate(data) {
     let cssClass = '';
@@ -104,13 +107,7 @@ $(() => {
       } else {
         if (isWeekend(data.date)) { cssClass = 'weekend'; }
 
-        $.each(holidays, (_, item) => {
-          if (data.date.getDate() === item[0] && data.date.getMonth() === item[1]) {
-            cssClass = 'holiday';
-            return false;
-          }
-          return true;
-        });
+        if (isHoliday(data.date)) { cssClass = 'holiday'; }
       }
     }
 

apps/demos/Demos/Charts/Annotation/Angular/app/app.component.html

@@ -17,13 +17,13 @@
   <dxi-annotation
     type="text"
     text="WWDC 2017"
-    [argument]="wwdcDate"
+    [argument]="appleWWDCDate"
     description="The Apple Worldwide Developers Conference was held from June 5 to June 9, 2017 at the San Jose Convention Center in San Jose, California, which was the first time since 2002 that the conference took place in the city. Software announcements included iOS 11, watchOS 4, macOS High Sierra, and updates to tvOS. Hardware announcements included updates to iMac, MacBook and MacBook Pro, as well as the new iMac Pro, 10.5-inch iPad Pro and smart speaker HomePod. Fall Out Boy performed at the Bash held in Discovery Meadow on June 8"
   ></dxi-annotation>
   <dxi-annotation
     type="text"
     text="Apple TV+ announced"
-    [argument]="tvAnnounceDate"
+    [argument]="appleTVAnnouncementDate"
     description="Apple TV+ is an upcoming over-the-top ad-free subscription video on demand web television service announced by Apple Inc. in 2019 during their March 25 Apple Special Event held at Steve Jobs Theater."
   ></dxi-annotation>
   <dxi-annotation

apps/demos/Demos/Charts/Annotation/Angular/app/app.component.ts

@@ -25,11 +25,9 @@ if (window && window.config?.packageConfigPaths) {
 export class AppComponent {
   dataSource: Data[];
 
-  // eslint-disable-next-line spellcheck/spell-checker
-  wwdcDate = new Date(2017, 5, 5);
+  appleWWDCDate = new Date(2017, 5, 5);
 
-  // eslint-disable-next-line spellcheck/spell-checker
-  tvAnnounceDate = new Date(2019, 2, 25);
+  appleTVAnnouncementDate = new Date(2019, 2, 25);
 
   watchReleaseDate = new Date(2015, 3, 24);
 

apps/demos/Demos/Charts/CustomizePointsAndLabels/Angular/app/app.component.ts

@@ -38,10 +38,9 @@ export class AppComponent {
 
     return (value < this.lowAverage)
       ? { color: '#8c8cff', hoverStyle: { color: '#8c8cff' } }
-      : undefined;
+      : null;
   };
 
-  // eslint-disable-next-line consistent-return
   customizeLabel: DxChartTypes.Properties['customizeLabel'] = ({ value }) => {
     if (value > this.highAverage) {
       return {
@@ -50,6 +49,7 @@ export class AppComponent {
         customizeText: this.customizeText,
       };
     }
+    return null;
   };
 
   customizeText: DxChartTypes.ValueAxisLabel['customizeText'] = ({ valueText }) => `${valueText}&#176F`;

apps/demos/Demos/Charts/ExportCustomMarkup/Vue/Form.vue

@@ -1,5 +1,3 @@
-<!-- eslint-disable vue/max-len -->
-
 <template>
   <div class="custom_markup_container">
     <svg
@@ -26,7 +24,11 @@
       />
       <text
         transform="translate(30,89)"
-        style="fill: #fff; font-family: 'Segoe UI', 'Helvetica Neue', 'Trebuchet MS', Verdana, sans-serif; font-size: 36px; font-weight: bold;"
+        :style="{ fill: '#fff',
+                  fontFamily: fontFamily,
+                  fontSize: '36px',
+                  fontWeight: 'bold',
+        }"
       >
         <tspan
           x="0"
@@ -43,7 +45,11 @@
       </text>
       <text
         transform="translate(32,199)"
-        style="opacity: 0.8; fill: #fff; font-family: 'Segoe UI', 'Helvetica Neue', 'Trebuchet MS', Verdana, sans-serif; font-size: 14px;"
+        :style="{ opacity: '0.8',
+                  fill: '#fff',
+                  fontFamily: fontFamily,
+                  fontSize: '14px'
+        }"
       >
         <tspan
           x="0"
@@ -59,6 +65,7 @@
 </template>
 <script setup lang="ts">
 
+const fontFamily = "'Segoe UI', 'Helvetica Neue', 'Trebuchet MS', Verdana, sans-serif";
 defineExpose({
   getMarkup() {
     // @ts-ignore